Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
2 changed files with 5 additions and 2 deletions
Showing only changes of commit 6ce6af3abe - Show all commits

View File

@ -19,7 +19,8 @@ class DB {
start INTEGER, start INTEGER,
stop INTEGER, stop INTEGER,
len INTEGER, len INTEGER,
counter INTEGER counter INTEGER,
sequence INTEGER
);` );`
db.run(query) db.run(query)
} }

View File

@ -105,7 +105,8 @@ intval._setState = function (data) {
time : 0, time : 0,
primed : false //is ready to stop frame primed : false //is ready to stop frame
}, },
counter : 0 counter : 0,
sequence : false
} }
intval._storeState() intval._storeState()
} }
@ -200,6 +201,7 @@ intval._stop = function () {
entry.dir = intval._state.frame.current.dir ? 1 : 0 entry.dir = intval._state.frame.current.dir ? 1 : 0
entry.exposure = intval._state.frame.current.exposure entry.exposure = intval._state.frame.current.exposure
entry.counter = intval._state.counter entry.counter = intval._state.counter
entry.sequence = intbal._state.sequence ? 1 : 0
db.insert(entry) db.insert(entry)