Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-10 05:59:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use correct array buf for js byte keyboard

Browse Source
This commit is contained in:
Willy-JL
2024-03-07 06:20:14 +00:00
parent 0405849ca6
commit 03f780f43c
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/system/js_app/examples/apps/Scripts/keyboard.js
View File

@@ -4,4 +4,16 @@ keyboard.setHeader("Example Text Input");
// Default text is optional
let text = keyboard.text(100, "Default text", true);
print("Got text:", text);
print("Got text:", text);
keyboard.setHeader("Example Byte Input");
// Default data is optional
let data = keyboard.byte(6, Uint8Array([1, 2, 3, 4, 5, 6]));
data = Uint8Array(data);
let result = "0x";
for (let i = 0; i < data.byteLength; i++) {
if (data[i] < 0x10) result += "0";
result += to_hex_string(data[i]);
}
print("Got data:", result);

23
applications/system/js_app/modules/js_keyboard.c
View File

@@ -38,13 +38,13 @@ static bool get_str_arg(struct mjs* mjs, size_t index, const char** value, bool
return true;
}
static bool get_int_arg(struct mjs* mjs, size_t index, int* value, bool error) {
static bool get_int_arg(struct mjs* mjs, size_t index, size_t* value, bool error) {
mjs_val_t int_obj = mjs_arg(mjs, index);
if(!mjs_is_number(int_obj)) {
if(error) ret_bad_args(mjs, "Argument must be a number");
return false;
}
*value = (int)mjs_get_int(mjs, int_obj);
*value = mjs_get_int(mjs, int_obj);
return true;
}
@@ -80,7 +80,7 @@ static void js_keyboard_set_header(struct mjs* mjs) {
static void js_keyboard_text(struct mjs* mjs) {
JsKeyboardInst* keyboard = get_this_ctx(mjs);
int input_length;
size_t input_length;
if(!get_int_arg(mjs, 0, &input_length, true)) return;
char* buffer = malloc(input_length);
@@ -112,14 +112,19 @@ static void js_keyboard_text(struct mjs* mjs) {
static void js_keyboard_byte(struct mjs* mjs) {
JsKeyboardInst* keyboard = get_this_ctx(mjs);
int input_length;
size_t input_length;
if(!get_int_arg(mjs, 0, &input_length, true)) return;
uint8_t* buffer = malloc(input_length);
// const char* default_data;
// if(get_str_arg(mjs, 1, &default_data, false)) {
// strlcpy(buffer, default_data, input_length);
// }
mjs_val_t default_data_arg = mjs_arg(mjs, 1);
if(mjs_is_typed_array(default_data_arg)) {
if(mjs_is_data_view(default_data_arg)) {
default_data_arg = mjs_dataview_get_buf(mjs, default_data_arg);
}
size_t default_data_len = 0;
char* default_data = mjs_array_buf_get_ptr(mjs, default_data_arg, &default_data_len);
memcpy(buffer, (uint8_t*)default_data, MIN((size_t)input_length, default_data_len));
}
view_dispatcher_attach_to_gui(
keyboard->view_dispatcher, furi_record_open(RECORD_GUI), ViewDispatcherTypeFullscreen);
@@ -135,7 +140,7 @@ static void js_keyboard_byte(struct mjs* mjs) {
byte_input_set_result_callback(keyboard->byte_input, NULL, NULL, NULL, NULL, 0);
byte_input_set_header_text(keyboard->byte_input, "");
mjs_return(mjs, mjs_mk_string(mjs, (char*)buffer, ~0, true));
mjs_return(mjs, mjs_mk_array_buf(mjs, (char*)buffer, input_length));
free(buffer);
}