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

View File

@ -307,7 +307,7 @@ null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"
var speed; var speed;
var corrected; var corrected;
var str; var str;
if ((typeof exposure !== 'undefined' && exposure !== 0) || exposure > BOLEX.expected) { if ((typeof exposure !== 'undefined' && exposure !== 0) || exposure >= BOLEX.expected) {
//if exposure is explicitly set //if exposure is explicitly set
fraction = exposure / 1000; fraction = exposure / 1000;
speed = fraction; speed = fraction;

View File

@ -258,7 +258,7 @@ intval.setDir = function (val = true) {
intval.setExposure = function (val = 0) { intval.setExposure = function (val = 0) {
intval._state.frame.exposure = val intval._state.frame.exposure = val
log.info('setTime', { exposure : val }) log.info('setExposure', { exposure : val })
} }
intval.setDelay = function (val = 0) { intval.setDelay = function (val = 0) {