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

View File

@ -441,7 +441,10 @@
console.log(`setDir to ${res.dir}`); console.log(`setDir to ${res.dir}`);
}; };
web.getState = function () { web.getState = function () {
fetch('/status') const opts = {
method : 'GET'
}
fetch('/status', opts)
.then(res => { .then(res => {
let r = res.json(); let r = res.json();
console.dir(r); console.dir(r);
@ -454,6 +457,8 @@
}); });
}; };
web.getStateSuccess = function (res) { web.getStateSuccess = function (res) {
console.dir(res)
return;
var exposure; var exposure;
var scale; var scale;
if (res.frame.dir !== true) { if (res.frame.dir !== true) {