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

JS: Fix weird string corruptions and usages

Browse Source
This commit is contained in:
Willy-JL
2024-03-17 20:48:00 +00:00
parent 6b21783d76
commit c2deba8e2c
4 changed files with 58 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
applications/system/js_app/modules/js_subghz/js_subghz.c
View File

@@ -41,17 +41,6 @@ static FuriHalSubGhzPreset js_subghz_get_preset_name(const char* preset_name) {
return preset;
}
static int32_t get_int_arg(struct mjs* mjs, size_t index, int32_t* value) {
mjs_val_t int_obj = mjs_arg(mjs, index);
if(!mjs_is_number(int_obj)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a number");
mjs_return(mjs, MJS_UNDEFINED);
return false;
}
*value = mjs_get_int(mjs, int_obj);
return true;
}
static void js_subghz_set_rx(struct mjs* mjs) {
mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
@@ -137,8 +126,13 @@ static void js_subghz_set_frequency(struct mjs* mjs) {
return;
}
int32_t frequency;
if(!get_int_arg(mjs, 0, &frequency)) return;
mjs_val_t frequency_arg = mjs_arg(mjs, 0);
if(!mjs_is_number(frequency_arg)) {
mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Frequency must be a number");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
int32_t frequency = mjs_get_int32(mjs, frequency_arg);
if(!subghz_devices_is_frequency_valid(js_subghz->radio_device, frequency)) {
mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Invalid frequency");