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 2 additions and 2 deletions
Showing only changes of commit 320d3fe02f - Show all commits

View File

@ -345,7 +345,7 @@ intval.setCounter = function (val = 0) {
* @param {?integer} [exposure="null"] (optional) Exposure time, 0 = minimum * @param {?integer} [exposure="null"] (optional) Exposure time, 0 = minimum
* *
*/ */
intval.frame = function (dir = null, expsure = null, cb = () => {}) { intval.frame = function (dir = null, exposure = null, cb = () => {}) {
if (dir === true || (dir === null && intval._state.frame.dir === true) ) { if (dir === true || (dir === null && intval._state.frame.dir === true) ) {
dir = true dir = true
} else { } else {
@ -402,7 +402,7 @@ intval.frame = function (dir = null, expsure = null, cb = () => {}) {
} }
intval._state.frame.current = { intval._state.frame.current = {
dir: dir, dir: dir,
exposure: time exposure: exposure
} }
} }
/** /**