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 7 additions and 6 deletions
Showing only changes of commit 9e13e0fb96 - Show all commits

View File

@ -162,12 +162,6 @@ var setState = function (res) {
exposure = shutter(STATE.exposure);
exposureScale = scaleAuto(STATE.exposure);
if (res.sequence === true) {
STATE.sequence = true;
mobile.ble.active = true;
document.getElementById('seq').classList.add('focus');
}
document.getElementById('str').value = exposure.str;
document.getElementById('scale').value = exposureScale;
setExposureScale();
@ -176,6 +170,13 @@ var setState = function (res) {
delayScale = scaleAuto(STATE.delay);
document.getElementById('delayScale').value = delayScale;
setDelayScale();
if (res.sequence == true) {
console.log(res.sequence);
STATE.sequence = true;
mobile.ble.active = true;
document.getElementById('seq').classList.add('focus');
}
};
var appPage = function () {
unsetPages();