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 1 deletions
Showing only changes of commit fc4b180aa8 - Show all commits

View File

@ -170,13 +170,14 @@ mobile.frame = function () {
mobile.frameSuccess = function () { mobile.frameSuccess = function () {
console.log('Frame finished, getting state.');
if (STATE.exposure < 5000) { if (STATE.exposure < 5000) {
console.log('Frame finished, getting state.');
mobile.ble.active = false; mobile.ble.active = false;
document.getElementById('frame').classList.remove('focus'); document.getElementById('frame').classList.remove('focus');
mobile.getState(); mobile.getState();
} else { } else {
setTimeout(() => { setTimeout(() => {
console.log('Frame finished, getting state.');
mobile.ble.active = false; mobile.ble.active = false;
document.getElementById('frame').classList.remove('focus'); document.getElementById('frame').classList.remove('focus');
mobile.getState(); mobile.getState();