Storage: If using internal+external, automatically put .bootcde and any libs in internal (as well as .js and .boot0)

Remove auto-build for iflash variant as it's not 100% working and will just confuse normal users
This commit is contained in:
Gordon Williams 2024-06-04 09:41:23 +01:00
parent 9898ae3a57
commit 957eafffb8
3 changed files with 5 additions and 3 deletions

View File

@ -74,7 +74,7 @@ jobs:
strategy:
# devices to build for
matrix:
board: [PUCKJS, PIXLJS, JOLTJS, MDBT42Q, BANGLEJS, BANGLEJS2, PUCKJS_MINIMAL, BANGLEJS2_IFLASH]
board: [PUCKJS, PIXLJS, JOLTJS, MDBT42Q, BANGLEJS, BANGLEJS2, PUCKJS_MINIMAL]
# try and build for all devices even if one fails
fail-fast: false
steps:

View File

@ -1,4 +1,6 @@
: Fix XON/OFF thresholds to be based off the correct buffer size
Bangle.js2: Added BANGLE2_IFLASH target for firmware using internal flash for js files (currently only partially working)
Storage: If using internal+external, automatically put .bootcde and any libs in internal (as well as .js and .boot0)
2v22 : Graphics: Ensure floodFill sets modified area correctly
nRF52: Lower expected BLE XTAL accuracy to 50ppm (can improve BLE stability on some Bangle.js 2)

View File

@ -662,10 +662,10 @@ char jsfStripDriveFromName(JsfFileName *name, bool explicitOnly){
return drive;
}
#ifdef JSF_BANK2_START_ADDRESS
if (explicitOnly) return 0; // if explicitOnly==false, ensure *.js and .boot0 files go in C:
if (explicitOnly) return 0; // if explicitOnly==false, ensure *.js .boot0 .bootcde and library files (with no dots) go in C:
int l = 0;
while (name->c[l] && l<sizeof(JsfFileName)) l++;
if (strcmp(name,".boot0")==0 ||
if (strcmp(name,".boot0")==0 || strcmp(name,".bootcde")==0 || strchr(name,'.')==0 ||
(name->c[l-3]=='.' && name->c[l-2]=='j' && name->c[l-1]=='s')) {
return 'C';
}