bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor bootloader/setting tweaks now we know we fixed the underlying firmware issue with HID

master
Gordon Williams 2019-11-12 17:54:41 +00:00
parent 00cba8c9ac
commit 59ce46a482
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/bootloader.js
View File

@ -73,7 +73,7 @@ if (startapp) {
setWatch(function() { // run
if (!apps[selected].src) return;
clearWatch();
g.clear();
g.clear(1);
g.setFont("6x8",2);
g.setFontAlign(0,0);
g.drawString("Loading...",120,120);
@ -84,6 +84,10 @@ if (startapp) {
// re-add the menu button if we're going to the clock
if (apps[selected].type=="clock") {
setWatch(displayMenu, BTN2, {repeat:false,edge:"falling"});
WIDGETPOS={tl:32,tr:g.getWidth()-32,bl:32,br:g.getWidth()-32};
WIDGETS={};
require("Storage").list().filter(a=>a[0]=='=').forEach(widget=>eval(require("Storage").read(widget)));
setTimeout(drawWidgets,100);
} else {
delete WIDGETS;
delete WIDGETPOS;
@ -95,7 +99,7 @@ if (startapp) {
var WIDGETPOS={tl:32,tr:g.getWidth()-32,bl:32,br:g.getWidth()-32};
var WIDGETS={};
function drawWidgets() {
Object.keys(WIDGETS).forEach(k=>WIDGETS[k].draw());
for (var w of WIDGETS) w.draw();
}
var clockApps = require("Storage").list().filter(a=>a[0]=='+').map(app=>{
try { return require("Storage").readJSON(app); }

12
apps/settings-init.js
View File

@ -13,12 +13,12 @@ Bangle.HID = E.toUint8Array(atob("BQEJBqEBhQIFBxngKecVACUBdQGVCIEClQF1CIEBlQV1AQ
} else
delete Bangle.HID;
}
setTimeout(function() {
NRF.setServices({}, adv);
// we just reset, so BLE should be on
if (!s.ble) NRF.sleep(); // disable advertising if BLE should be off
},10);
NRF.setServices({}, adv);
// we just reset, so BLE should be on
try { // disable advertising if BLE should be off
if (!s.ble) NRF.sleep();
else NRF.wake();
} catch(e) {}
if (!s.vibrate) Bangle.buzz=Promise.resolve;
if (!s.beep) Bangle.beep=Promise.resolve;
Bangle.setLCDTimeout(s.timeout);