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 b114ef8b0e - Show all commits

View File

@ -24,8 +24,8 @@ mobile.ble.scan = function () {
ble.scan([], 5, mobile.ble.onDiscover, mobile.ble.onError);
mobile.ble.devices = [];
setTimeout(() => {
if (!mobile.ble.connected) {
spinnerHide();
if (!mobile.ble.connected) {
alert('No INTVAL devices found.');
settingsPage();
}
@ -128,6 +128,7 @@ mobile.init = function () {
}
spinnerInit();
mobile.ble.scan();
};
mobile.getState = function () {