FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

boot 0.39: Fix passkey support (fix https://github.com/espruino/Espruino/issues/2035

pull/1093/head
Gordon Williams 2021-12-15 11:48:03 +00:00
parent a12b003d90
commit bb10a5a3dd
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps.json
View File

@ -16,7 +16,7 @@
{ {
"id": "boot", "id": "boot",
"name": "Bootloader", "name": "Bootloader",
"version": "0.38", "version": "0.39",
"description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings", "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings",
"icon": "bootloader.png", "icon": "bootloader.png",
"type": "bootloader", "type": "bootloader",
@ -167,7 +167,7 @@
{ {
"id": "setting", "id": "setting",
"name": "Settings", "name": "Settings",
"version": "0.36", "version": "0.37",
"description": "A menu for setting up Bangle.js", "description": "A menu for setting up Bangle.js",
"icon": "settings.png", "icon": "settings.png",
"tags": "tool,system", "tags": "tool,system",

1
apps/boot/ChangeLog
View File

@ -42,3 +42,4 @@
0.36: Add comments to .boot0 to make debugging a bit easier 0.36: Add comments to .boot0 to make debugging a bit easier
0.37: Remove Quiet Mode settings: now handled by Quiet Mode Schedule app 0.37: Remove Quiet Mode settings: now handled by Quiet Mode Schedule app
0.38: Option to log to file if settings.log==2 0.38: Option to log to file if settings.log==2
0.39: Fix passkey support (fix https://github.com/espruino/Espruino/issues/2035)

2
apps/boot/bootupdate.js
View File

@ -88,7 +88,7 @@ if (global.save) boot += `global.save = function() { throw new Error("You can't
// Apply any settings-specific stuff // Apply any settings-specific stuff
if (s.options) boot+=`Bangle.setOptions(${E.toJS(s.options)});\n`; if (s.options) boot+=`Bangle.setOptions(${E.toJS(s.options)});\n`;
if (s.brightness && s.brightness!=1) boot+=`Bangle.setLCDBrightness(${s.brightness});\n`; if (s.brightness && s.brightness!=1) boot+=`Bangle.setLCDBrightness(${s.brightness});\n`;
if (s.passkey!==undefined && s.passkey.length==6) boot+=`NRF.setSecurity({passkey:${s.passkey}, mitm:1, display:1});\n`; if (s.passkey!==undefined && s.passkey.length==6) boot+=`NRF.setSecurity({passkey:${E.toJS(s.passkey.toString())}, mitm:1, display:1});\n`;
if (s.whitelist) boot+=`NRF.on('connect', function(addr) { if (!(require('Storage').readJSON('setting.json',1)||{}).whitelist.includes(addr)) NRF.disconnect(); });\n`; if (s.whitelist) boot+=`NRF.on('connect', function(addr) { if (!(require('Storage').readJSON('setting.json',1)||{}).whitelist.includes(addr)) NRF.disconnect(); });\n`;
// Pre-2v10 firmwares without a theme/setUI // Pre-2v10 firmwares without a theme/setUI
delete g.theme; // deleting stops us getting confused by our own decl. builtins can't be deleted delete g.theme; // deleting stops us getting confused by our own decl. builtins can't be deleted

1
apps/setting/ChangeLog
View File

@ -39,3 +39,4 @@
0.34: Remove Quiet Mode LCD settings: now handled by Quiet Mode Schedule app 0.34: Remove Quiet Mode LCD settings: now handled by Quiet Mode Schedule app
0.35: Change App/Widget settings to 'App Settings' so it fits on Bangle screen 0.35: Change App/Widget settings to 'App Settings' so it fits on Bangle screen
0.36: Added 'Utils' menu with helpful utilities for restoring Bangle.js 0.36: Added 'Utils' menu with helpful utilities for restoring Bangle.js
0.37: Going into passkey menu now saves settings with passkey

4
apps/setting/settings.js
View File

@ -276,8 +276,10 @@ function showPasskeyMenu() {
showBLEMenu(); showBLEMenu();
} }
}; };
if (!settings.passkey || settings.passkey.length!=6) if (!settings.passkey || settings.passkey.length!=6) {
settings.passkey = "123456"; settings.passkey = "123456";
updateSettings();
}
for (var i=0;i<6;i++) (function(i){ for (var i=0;i<6;i++) (function(i){
menu[`Digit ${i+1}`] = { menu[`Digit ${i+1}`] = {
value : 0|settings.passkey[i], value : 0|settings.passkey[i],