16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
Conversation 0 Commits 416 Files Changed 85 +4 -1
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2545df2c38 - Show all commits

2
app/www/index.html
View File

@ -49,7 +49,7 @@
</select> </select>
</div> </div>
<div> <div>
<button id="seq">START SEQUENCE</button> <button id="seq" onclick="sequence();">START SEQUENCE</button>
</div> </div>
<div> <div>
<button id="frame" onclick="frame();">1 FRAME</button> <button id="frame" onclick="frame();">1 FRAME</button>

1
app/www/static/js/intval.core.js
View File

@ -21,6 +21,7 @@ window.setDir = null;
window.setExposure = null; window.setExposure = null;
window.setDelay = null; window.setDelay = null;
window.setCounter = null; window.setCounter = null;
window.sequence = null;
//ms //ms
var shutter = function (exposure) { var shutter = function (exposure) {

1
app/www/static/js/intval.mobile.js
View File

@ -112,6 +112,7 @@ mobile.init = function () {
window.setExposure = mobile.setExposure; window.setExposure = mobile.setExposure;
window.setDelay = mobile.setDelay; window.setDelay = mobile.setDelay;
window.setCounter = mobile.setCounter; window.setCounter = mobile.setCounter;
window.sequence = mobile.sequence;
//show ble-specific fields in settings //show ble-specific fields in settings
for (let i of bleInputs) { for (let i of bleInputs) {

1
app/www/static/js/intval.web.js
View File

@ -165,5 +165,6 @@ web.init = function () {
window.setDelay = web.setDelay; window.setDelay = web.setDelay;
window.setExposure = web.setExposure; window.setExposure = web.setExposure;
window.setCounter = web.setCounter; window.setCounter = web.setCounter;
window.sequence = web.sequence;
console.log('started web') console.log('started web')
}; };