Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 53 additions and 35 deletions
Showing only changes of commit 96bd6050d3 - Show all commits

View File

@ -2,10 +2,17 @@
<html>
<head>
<title>intval 3</title>
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="format-detection" content="telephone=no">
<meta name = "viewport" content = "width = 320, initial-scale = 2.3, user-scalable = no">
<style>
html,body{
background: #212121;
}
*{
color: #fff;
font-family: 'Arial Neue', Helvetical, Arial, sans-serif;
}
/* The switch - the box around the slider */
.switch {
position: relative;
@ -72,6 +79,7 @@
-webkit-appearance: none;
background: transparent;
box-shadow: none;
margin: 5px 0;
}
button{
border: 1px solid #fff;
@ -81,23 +89,32 @@
background: transparent;
-webkit-appearance: none;
box-shadow: none;
outline: none;
margin: 5px 0;
}
button:focus{
background-color: #20ce45;
border-color: #20ce45;
color: #212121;
}
</style>
</head>
<body>
<div>
<div>Direction</div>
<label class="switch" onclick="setDir();">
<input type="checkbox" id="dir">
<span class="slider round"></span>
</label>
</div>
<div>
<div>Exposure (ms)</div>
<input type="number" id="exposure" value="630" min="630" step="1" />
</div>
<div>
<div>Delay (ms)</div>
<input type="number" id="delay" value="0" min="0" step="1" />
</div>
<div>
<button id="seq">Sequence</button>
</div>
@ -128,6 +145,7 @@ web.frame = function () {
}
web.frameSuccess = function (res) {
'use strict';
$('#frame').blur();
console.dir(res);
};
web.setDir = function () {
@ -135,13 +153,13 @@ web.setDir = function () {
};
web.setDirSuccess = function (res) {
'use strict';
console.dir(res)
console.dir(res);
};
web.init = function () {
'use strict';
frame = web.frame
setDir = web.setDir
setExposure = web.setExposure
frame = web.frame;
setDir = web.setDir;
setExposure = web.setExposure;
};
web.init();
</script>