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

Merge branch 'espruino:master' into master

master
jeonlab 2024-05-22 20:55:29 -05:00 committed by GitHub
parent 2e241d8505 d1fc9abf27
commit 26ebfa9bf5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/fwupdate/custom.html
View File

@ -12,7 +12,7 @@
<a href="https://www.espruino.com/Bangle.js#firmware-updates" target="_blank">see the Bangle.js 1 instructions</a></b></p> <a href="https://www.espruino.com/Bangle.js#firmware-updates" target="_blank">see the Bangle.js 1 instructions</a></b></p>
</div> </div>
<ul> <ul>
<p>Your current firmware version is <span id="fw-version" style="font-weight:bold">unknown</span> and DFU is <span id="boot-version" style="font-weight:bold">unknown</span>. <p>Your current firmware version is <span id="fw-version" style="font-weight:bold">unknown</span> and DFU is <span id="boot-version" style="font-weight:bold">unknown</span>.
The DFU (bootloader) rarely changes, so it does not have to be the same version as your main firmware.</p> The DFU (bootloader) rarely changes, so it does not have to be the same version as your main firmware.</p>
</ul> </ul>
<div id="fw-ok" style="display:none"> <div id="fw-ok" style="display:none">
@ -104,8 +104,9 @@ function onInit(device) {
var ok = true; var ok = true;
if (crcs[0] == 1787004733) version = "2v20"; // check 6 page CRCs - the 7th page isn't used in 2v20+ if (crcs[0] == 1787004733) version = "2v20"; // check 6 page CRCs - the 7th page isn't used in 2v20+
else if (crcs[0] == 3816337552) version = "2v21"; else if (crcs[0] == 3816337552) version = "2v21";
else if (crcs[0] == 3329616485) version = "2v22";
else { // for other versions all 7 pages are used, check those else { // for other versions all 7 pages are used, check those
var crc = crcs[1]; var crc = crcs[1];
if (crc==1339551013) { version = "2v10.219"; ok = false; } if (crc==1339551013) { version = "2v10.219"; ok = false; }
if (crc==1207580954) { version = "2v10.236"; ok = false; } if (crc==1207580954) { version = "2v10.236"; ok = false; }
if (crc==3435933210) version = "2v11.52"; if (crc==3435933210) version = "2v11.52";
@ -117,7 +118,7 @@ function onInit(device) {
if (crc==2886730689) version = "2v16"; if (crc==2886730689) version = "2v16";
if (crc==156320890) version = "2v17"; if (crc==156320890) version = "2v17";
if (crc==4012421318) version = "2v18"; if (crc==4012421318) version = "2v18";
if (crc==1856454048) version = "2v19"; if (crc==1856454048) version = "2v19";
} }
if (!ok) { if (!ok) {
version += `(&#9888; update required)`; version += `(&#9888; update required)`;

2
core

@ -1 +1 @@
Subproject commit 2938c27bee9430bca03066f199724747f220cda0 Subproject commit 1b613f497e993b6ef33dfe3d7aa14416d7cdaa23