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 +24 -5
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8787c0fac - Show all commits

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

@ -171,9 +171,17 @@ mobile.frame = function () {
mobile.frameSuccess = function () { mobile.frameSuccess = function () {
console.log('Frame finished, getting state.'); console.log('Frame finished, getting state.');
mobile.ble.active = false; if (STATE.exposure < 5000) {
document.getElementById('frame').classList.remove('focus'); mobile.ble.active = false;
mobile.getState(); document.getElementById('frame').classList.remove('focus');
mobile.getState();
} else {
setTimeout(() => {
mobile.ble.active = false;
document.getElementById('frame').classList.remove('focus');
mobile.getState();
}, STATE.exposure + 500)
}
} }
mobile.setDir = function () { mobile.setDir = function () {
const opts = { const opts = {

15
index.js
View File

@ -363,9 +363,16 @@ function bFrame (obj, cb) {
} }
} }
log.info('frame', { method : 'ble', dir : dir, exposure : exposure }) log.info('frame', { method : 'ble', dir : dir, exposure : exposure })
intval.frame(dir, exposure, (len) => {
if (exposure < 5000) {
intval.frame(dir, exposure, (len) => {
return cb()
})
} else {
intval.frame(dir, exposure, (len) => {})
return cb() return cb()
}) }
//setTimeout(cb, exposure === 0 ? 630 : exposure) //setTimeout(cb, exposure === 0 ? 630 : exposure)
} }
@ -485,6 +492,10 @@ function bSequence (obj, cb) {
} }
} }
function bSequenceStop (obj, cb) {
}
function bReset (obj, cb) { function bReset (obj, cb) {
intval.reset() intval.reset()
setTimeout(cb, 10) setTimeout(cb, 10)