Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-29 04:09:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

JS: Fix default layout handling

Browse Source
This commit is contained in:
Willy-JL
2024-04-06 00:29:23 +01:00
parent b831161a8f
commit b8295a2dac
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
applications/system/js_app/modules/js_badusb.c
View File

@@ -133,17 +133,20 @@ static bool setup_parse_params(
if(mjs_is_string(layout_obj)) {
size_t str_len = 0;
const char* str_temp = mjs_get_string(mjs, &layout_obj, &str_len);
File* file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
size_t size = sizeof(badusb->layout);
if((str_len == 0) || (str_temp == NULL) ||
!storage_file_open(file, str_temp, FSAM_READ, FSOM_OPEN_EXISTING) ||
storage_file_read(file, badusb->layout, size) != size) {
memcpy(badusb->layout, hid_asciimap, MIN(sizeof(hid_asciimap), size));
if((str_len == 0) || (str_temp == NULL)) {
return false;
}
File* file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
bool layout_loaded = storage_file_open(file, str_temp, FSAM_READ, FSOM_OPEN_EXISTING) &&
storage_file_read(file, badusb->layout, sizeof(badusb->layout)) ==
sizeof(badusb->layout);
storage_file_free(file);
furi_record_close(RECORD_STORAGE);
if(!layout_loaded) {
return false;
}
} else {
memcpy(badusb->layout, hid_asciimap, MIN(sizeof(hid_asciimap), sizeof(badusb->layout)));
}
return true;