From 2f2f6f0b0d7bcd8d0eb64c1d4edccb6e188cc560 Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Fri, 11 Mar 2022 11:39:29 +0000 Subject: [PATCH] 0.43: Fix Gadgetbridge handling with Programmable:off --- apps/boot/ChangeLog | 1 + apps/boot/bootupdate.js | 2 +- apps/boot/metadata.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog index 4c3d3b930..e75c9cc7b 100644 --- a/apps/boot/ChangeLog +++ b/apps/boot/ChangeLog @@ -46,3 +46,4 @@ 0.40: Bootloader now rebuilds for new firmware versions 0.41: Add Keyboard and Mouse Bluetooth HID option 0.42: Sort *.boot.js files lexically and by optional numeric priority, e.g. appname..boot.js +0.43: Fix Gadgetbridge handling with Programmable:off diff --git a/apps/boot/bootupdate.js b/apps/boot/bootupdate.js index 63424bfbf..e5a8cff51 100644 --- a/apps/boot/bootupdate.js +++ b/apps/boot/bootupdate.js @@ -38,7 +38,7 @@ LoopbackA.setConsole(true);\n`; boot += ` Bluetooth.line=""; Bluetooth.on('data',function(d) { - var l = (Bluetooth.line + d).split("\n"); + var l = (Bluetooth.line + d).split(/[\\n\\r]/); Bluetooth.line = l.pop(); l.forEach(n=>Bluetooth.emit("line",n)); }); diff --git a/apps/boot/metadata.json b/apps/boot/metadata.json index 4cbfd9c59..edddc6b41 100644 --- a/apps/boot/metadata.json +++ b/apps/boot/metadata.json @@ -1,7 +1,7 @@ { "id": "boot", "name": "Bootloader", - "version": "0.42", + "version": "0.43", "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings", "icon": "bootloader.png", "type": "bootloader",