Skip to content

Commit

Permalink
style: format
Browse files Browse the repository at this point in the history
  • Loading branch information
@portasynthinca3
portasynthinca3 committed Mar 5, 2025
1 parent 49e5649 commit db899d4
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 39 deletions.
2 changes: 0 additions & 2 deletions applications/system/js_app/js_modules.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@ typedef struct {
const ElfApiInterface* api_interface;
} JsModuleDescriptor;



JsModules* js_modules_create(struct mjs* mjs, CompositeApiResolver* resolver);

void js_modules_destroy(JsModules* modules);
Expand Down
5 changes: 3 additions & 2 deletions applications/system/js_app/modules/js_event_loop/js_event_loop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ static void js_event_loop_subscribe(struct mjs* mjs) {
JS_VALUE_SIMPLE(JsValueTypeRawPointer),
JS_VALUE_SIMPLE(JsValueTypeFunction),
};
static const JsValueArguments js_loop_subscribe_args = JS_VALUE_ARGS(js_loop_subscribe_arg_list);
static const JsValueArguments js_loop_subscribe_args =
JS_VALUE_ARGS(js_loop_subscribe_arg_list);

JsEventLoopContract* contract;
mjs_val_t callback;
Expand Down Expand Up @@ -261,7 +262,7 @@ static void js_event_loop_timer(struct mjs* mjs) {
FuriEventLoopTimerType mode;
int32_t interval;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_loop_timer_args, &mode, &interval);

JsEventLoop* module = JS_GET_CONTEXT(mjs);

// make timer contract
Expand Down
27 changes: 17 additions & 10 deletions applications/system/js_app/modules/js_gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ static void js_gpio_init(struct mjs* mjs) {
{"in", JsGpioDirectionIn},
{"out", JsGpioDirectionOut},
};
static const JsValueDeclaration js_gpio_direction = JS_VALUE_ENUM(JsGpioDirection, js_gpio_direction_variants);

static const JsValueDeclaration js_gpio_direction =
JS_VALUE_ENUM(JsGpioDirection, js_gpio_direction_variants);

// inMode variants
typedef enum {
JsGpioInModeAnalog = (0 << 0),
Expand All @@ -78,8 +79,9 @@ static void js_gpio_init(struct mjs* mjs) {
{"interrupt", JsGpioInModeInterrupt},
{"event", JsGpioInModeEvent},
};
static const JsValueDeclaration js_gpio_in_mode = JS_VALUE_ENUM_W_DEFAULT(JsGpioInMode, js_gpio_in_mode_variants, JsGpioInModePlainDigital);

static const JsValueDeclaration js_gpio_in_mode =
JS_VALUE_ENUM_W_DEFAULT(JsGpioInMode, js_gpio_in_mode_variants, JsGpioInModePlainDigital);

// outMode variants
typedef enum {
JsGpioOutModePushPull,
Expand All @@ -89,8 +91,9 @@ static void js_gpio_init(struct mjs* mjs) {
{"push_pull", JsGpioOutModePushPull},
{"open_drain", JsGpioOutModeOpenDrain},
};
static const JsValueDeclaration js_gpio_out_mode = JS_VALUE_ENUM_W_DEFAULT(JsGpioOutMode, js_gpio_out_mode_variants, JsGpioOutModeOpenDrain);

static const JsValueDeclaration js_gpio_out_mode =
JS_VALUE_ENUM_W_DEFAULT(JsGpioOutMode, js_gpio_out_mode_variants, JsGpioOutModeOpenDrain);

// edge variants
typedef enum {
JsGpioEdgeRising = (0 << 2),
Expand All @@ -102,14 +105,16 @@ static void js_gpio_init(struct mjs* mjs) {
{"falling", JsGpioEdgeFalling},
{"both", JsGpioEdgeBoth},
};
static const JsValueDeclaration js_gpio_edge = JS_VALUE_ENUM_W_DEFAULT(JsGpioEdge, js_gpio_edge_variants, JsGpioEdgeRising);
static const JsValueDeclaration js_gpio_edge =
JS_VALUE_ENUM_W_DEFAULT(JsGpioEdge, js_gpio_edge_variants, JsGpioEdgeRising);

// pull variants
static const JsValueEnumVariant js_gpio_pull_variants[] = {
{"up", GpioPullUp},
{"down", GpioPullDown},
};
static const JsValueDeclaration js_gpio_pull = JS_VALUE_ENUM_W_DEFAULT(GpioPull, js_gpio_pull_variants, GpioPullNo);
static const JsValueDeclaration js_gpio_pull =
JS_VALUE_ENUM_W_DEFAULT(GpioPull, js_gpio_pull_variants, GpioPullNo);

// complete mode object
static const JsValueObjectField js_gpio_mode_object_fields[] = {
Expand All @@ -131,7 +136,8 @@ static void js_gpio_init(struct mjs* mjs) {
JsGpioOutMode out_mode;
JsGpioEdge edge;
GpioPull pull;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_gpio_init_args, &direction, &in_mode, &out_mode, &edge, &pull);
JS_VALUE_PARSE_ARGS_OR_RETURN(
mjs, &js_gpio_init_args, &direction, &in_mode, &out_mode, &edge, &pull);

GpioMode mode;
if(direction == JsGpioDirectionOut) {
Expand Down Expand Up @@ -295,7 +301,8 @@ static void js_gpio_pwm_write(struct mjs* mjs) {
JS_VALUE_SIMPLE(JsValueTypeInt32),
JS_VALUE_SIMPLE(JsValueTypeInt32),
};
static const JsValueArguments js_gpio_pwm_write_args = JS_VALUE_ARGS(js_gpio_pwm_write_arg_list);
static const JsValueArguments js_gpio_pwm_write_args =
JS_VALUE_ARGS(js_gpio_pwm_write_arg_list);
int32_t frequency, duty;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_gpio_pwm_write_args, &frequency, &duty);

Expand Down
18 changes: 12 additions & 6 deletions applications/system/js_app/modules/js_gui/js_gui.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ static void js_gui_vd_send_custom(struct mjs* mjs) {
static const JsValueDeclaration js_gui_vd_send_custom_arg_list[] = {
JS_VALUE_SIMPLE(JsValueTypeInt32),
};
static const JsValueArguments js_gui_vd_send_custom_args = JS_VALUE_ARGS(js_gui_vd_send_custom_arg_list);
static const JsValueArguments js_gui_vd_send_custom_args =
JS_VALUE_ARGS(js_gui_vd_send_custom_arg_list);

int32_t event;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_gui_vd_send_custom_args, &event);
Expand All @@ -95,7 +96,8 @@ static void js_gui_vd_send_to(struct mjs* mjs) {
static const JsValueDeclaration js_gui_vd_send_to_arg_list[] = {
JS_VALUE_ENUM(JsSendDir, js_send_dir_variants),
};
static const JsValueArguments js_gui_vd_send_to_args = JS_VALUE_ARGS(js_gui_vd_send_to_arg_list);
static const JsValueArguments js_gui_vd_send_to_args =
JS_VALUE_ARGS(js_gui_vd_send_to_arg_list);

JsSendDir send_direction;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_gui_vd_send_to_args, &send_direction);
Expand All @@ -115,7 +117,8 @@ static void js_gui_vd_switch_to(struct mjs* mjs) {
static const JsValueDeclaration js_gui_vd_switch_to_arg_list[] = {
JS_VALUE_SIMPLE(JsValueTypeAny),
};
static const JsValueArguments js_gui_vd_switch_to_args = JS_VALUE_ARGS(js_gui_vd_switch_to_arg_list);
static const JsValueArguments js_gui_vd_switch_to_args =
JS_VALUE_ARGS(js_gui_vd_switch_to_arg_list);

mjs_val_t view;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_gui_vd_switch_to_args, &view);
Expand Down Expand Up @@ -310,7 +313,8 @@ static void js_gui_view_add_child(struct mjs* mjs) {
static const JsValueDeclaration js_gui_view_add_child_arg_list[] = {
JS_VALUE_SIMPLE(JsValueTypeAny),
};
static const JsValueArguments js_gui_view_add_child_args = JS_VALUE_ARGS(js_gui_view_add_child_arg_list);
static const JsValueArguments js_gui_view_add_child_args =
JS_VALUE_ARGS(js_gui_view_add_child_arg_list);

mjs_val_t child;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_gui_view_add_child_args, &child);
Expand Down Expand Up @@ -343,7 +347,8 @@ static void js_gui_view_set_children(struct mjs* mjs) {
static const JsValueDeclaration js_gui_view_set_children_arg_list[] = {
JS_VALUE_SIMPLE(JsValueTypeAnyArray),
};
static const JsValueArguments js_gui_view_set_children_args = JS_VALUE_ARGS(js_gui_view_set_children_arg_list);
static const JsValueArguments js_gui_view_set_children_args =
JS_VALUE_ARGS(js_gui_view_set_children_arg_list);

mjs_val_t children;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_gui_view_set_children_args, &children);
Expand Down Expand Up @@ -416,7 +421,8 @@ static void js_gui_vf_make_with(struct mjs* mjs) {
JS_VALUE_SIMPLE(JsValueTypeAnyObject),
JS_VALUE_SIMPLE(JsValueTypeAny),
};
static const JsValueArguments js_gui_vf_make_with_args = JS_VALUE_ARGS(js_gui_vf_make_with_arg_list);
static const JsValueArguments js_gui_vf_make_with_args =
JS_VALUE_ARGS(js_gui_vf_make_with_arg_list);

mjs_val_t props, children;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_gui_vf_make_with_args, &props, &children);
Expand Down
40 changes: 26 additions & 14 deletions applications/system/js_app/modules/js_serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,29 +39,32 @@ static void js_serial_setup(struct mjs* mjs) {
{"lpuart", FuriHalSerialIdLpuart},
{"usart", FuriHalSerialIdUsart},
};

static const JsValueEnumVariant js_serial_data_bit_variants[] = {
{"6", FuriHalSerialDataBits6},
{"7", FuriHalSerialDataBits7},
{"8", FuriHalSerialDataBits8},
{"9", FuriHalSerialDataBits9},
};
static const JsValueDeclaration js_serial_data_bits = JS_VALUE_ENUM_W_DEFAULT(FuriHalSerialDataBits, js_serial_data_bit_variants, FuriHalSerialDataBits8);
static const JsValueDeclaration js_serial_data_bits = JS_VALUE_ENUM_W_DEFAULT(
FuriHalSerialDataBits, js_serial_data_bit_variants, FuriHalSerialDataBits8);

static const JsValueEnumVariant js_serial_parity_variants[] = {
{"none", FuriHalSerialParityNone},
{"even", FuriHalSerialParityEven},
{"odd", FuriHalSerialParityOdd},
};
static const JsValueDeclaration js_serial_parity = JS_VALUE_ENUM_W_DEFAULT(FuriHalSerialParity, js_serial_parity_variants, FuriHalSerialParityNone);
static const JsValueDeclaration js_serial_parity = JS_VALUE_ENUM_W_DEFAULT(
FuriHalSerialParity, js_serial_parity_variants, FuriHalSerialParityNone);

static const JsValueEnumVariant js_serial_stop_bit_variants[] = {
{"0.5", FuriHalSerialStopBits0_5},
{"1", FuriHalSerialStopBits1},
{"1.5", FuriHalSerialStopBits1_5},
{"2", FuriHalSerialStopBits2},
};
static const JsValueDeclaration js_serial_stop_bits = JS_VALUE_ENUM_W_DEFAULT(FuriHalSerialStopBits, js_serial_stop_bit_variants, FuriHalSerialStopBits1);
static const JsValueDeclaration js_serial_stop_bits = JS_VALUE_ENUM_W_DEFAULT(
FuriHalSerialStopBits, js_serial_stop_bit_variants, FuriHalSerialStopBits1);

static const JsValueObjectField js_serial_framing_fields[] = {
{"dataBits", &js_serial_data_bits},
Expand All @@ -81,11 +84,13 @@ static void js_serial_setup(struct mjs* mjs) {
FuriHalSerialDataBits data_bits = FuriHalSerialDataBits8;
FuriHalSerialParity parity = FuriHalSerialParityNone;
FuriHalSerialStopBits stop_bits = FuriHalSerialStopBits1;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_serial_setup_args, &serial_id, &baudrate, &data_bits, &parity, &stop_bits);
JS_VALUE_PARSE_ARGS_OR_RETURN(
mjs, &js_serial_setup_args, &serial_id, &baudrate, &data_bits, &parity, &stop_bits);

JsSerialInst* serial = JS_GET_CONTEXT(mjs);

if(serial->setup_done) JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is already configured");
if(serial->setup_done)
JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is already configured");

expansion_disable(furi_record_open(RECORD_EXPANSION));
furi_record_close(RECORD_EXPANSION);
Expand Down Expand Up @@ -123,15 +128,17 @@ static void js_serial_end(struct mjs* mjs) {
JsSerialInst* serial = JS_GET_CONTEXT(mjs);
furi_assert(serial);

if(!serial->setup_done) JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");
if(!serial->setup_done)
JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");

js_serial_deinit(serial);
}

static void js_serial_write(struct mjs* mjs) {
JsSerialInst* serial = JS_GET_CONTEXT(mjs);
furi_assert(serial);
if(!serial->setup_done) JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");
if(!serial->setup_done)
JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");

bool args_correct = true;

Expand Down Expand Up @@ -224,7 +231,8 @@ static const JsValueArguments js_serial_read_args = JS_VALUE_ARGS(js_serial_read
static void js_serial_read(struct mjs* mjs) {
JsSerialInst* serial = JS_GET_CONTEXT(mjs);
furi_assert(serial);
if(!serial->setup_done) JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");
if(!serial->setup_done)
JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");

int32_t read_len, timeout;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_serial_read_args, &read_len, &timeout);
Expand All @@ -243,7 +251,8 @@ static void js_serial_read(struct mjs* mjs) {
static void js_serial_readln(struct mjs* mjs) {
JsSerialInst* serial = JS_GET_CONTEXT(mjs);
furi_assert(serial);
if(!serial->setup_done) JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");
if(!serial->setup_done)
JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");

static const JsValueDeclaration js_serial_readln_arg_list[] = {
JS_VALUE_SIMPLE(JsValueTypeInt32),
Expand Down Expand Up @@ -281,7 +290,8 @@ static void js_serial_readln(struct mjs* mjs) {
static void js_serial_read_bytes(struct mjs* mjs) {
JsSerialInst* serial = JS_GET_CONTEXT(mjs);
furi_assert(serial);
if(!serial->setup_done) JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");
if(!serial->setup_done)
JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");

int32_t read_len, timeout;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_serial_read_args, &read_len, &timeout);
Expand Down Expand Up @@ -315,12 +325,14 @@ static char* js_serial_receive_any(JsSerialInst* serial, size_t* len, uint32_t t
static void js_serial_read_any(struct mjs* mjs) {
JsSerialInst* serial = JS_GET_CONTEXT(mjs);
furi_assert(serial);
if(!serial->setup_done) JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");
if(!serial->setup_done)
JS_ERROR_AND_RETURN(mjs, MJS_INTERNAL_ERROR, "Serial is not configured");

static const JsValueDeclaration js_serial_read_any_arg_list[] = {
JS_VALUE_SIMPLE_W_DEFAULT(JsValueTypeInt32, int32_val, INT32_MAX),
};
static const JsValueArguments js_serial_read_any_args = JS_VALUE_ARGS(js_serial_read_any_arg_list);
static const JsValueArguments js_serial_read_any_args =
JS_VALUE_ARGS(js_serial_read_any_arg_list);

int32_t timeout;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_serial_read_any_args, &timeout);
Expand Down Expand Up @@ -567,7 +579,7 @@ static void* js_serial_create(struct mjs* mjs, mjs_val_t* object, JsModules* mod
UNUSED(modules);
JsSerialInst* js_serial = malloc(sizeof(JsSerialInst));
js_serial->mjs = mjs;

mjs_val_t serial_obj = mjs_mk_object(mjs);
JS_ASSIGN_MULTI(mjs, serial_obj) {
JS_FIELD(INST_PROP_NAME, mjs_mk_foreign(mjs, js_serial));
Expand Down
15 changes: 10 additions & 5 deletions applications/system/js_app/modules/js_storage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ static void js_storage_file_write(struct mjs* mjs) {
static const JsValueDeclaration js_storage_file_write_arg_list[] = {
JS_VALUE_SIMPLE(JsValueTypeAny),
};
static const JsValueArguments js_storage_file_write_args = JS_VALUE_ARGS(js_storage_file_write_arg_list);
static const JsValueArguments js_storage_file_write_args =
JS_VALUE_ARGS(js_storage_file_write_arg_list);

mjs_val_t data;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_storage_file_write_args, &data);
Expand Down Expand Up @@ -125,7 +126,8 @@ static void js_storage_file_copy_to(struct mjs* mjs) {
JS_VALUE_SIMPLE(JsValueTypeAny),
JS_VALUE_SIMPLE(JsValueTypeInt32),
};
static const JsValueArguments js_storage_file_write_args = JS_VALUE_ARGS(js_storage_file_write_arg_list);
static const JsValueArguments js_storage_file_write_args =
JS_VALUE_ARGS(js_storage_file_write_arg_list);

mjs_val_t dest_obj;
int32_t bytes;
Expand Down Expand Up @@ -166,12 +168,14 @@ static void js_storage_open_file(struct mjs* mjs) {
JS_VALUE_ENUM(FS_AccessMode, js_storage_fsam_variants),
JS_VALUE_ENUM(FS_OpenMode, js_storage_fsom_variants),
};
static const JsValueArguments js_storage_open_file_args = JS_VALUE_ARGS(js_storage_open_file_arg_list);
static const JsValueArguments js_storage_open_file_args =
JS_VALUE_ARGS(js_storage_open_file_arg_list);

const char* path;
FS_AccessMode access_mode;
FS_OpenMode open_mode;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_storage_open_file_args, &path, &access_mode, &open_mode);
JS_VALUE_PARSE_ARGS_OR_RETURN(
mjs, &js_storage_open_file_args, &path, &access_mode, &open_mode);

Storage* storage = JS_GET_CONTEXT(mjs);
File* file = storage_file_alloc(storage);
Expand Down Expand Up @@ -353,7 +357,8 @@ static void js_storage_next_available_filename(struct mjs* mjs) {

const char *dir_path, *file_name, *file_ext;
int32_t max_len;
JS_VALUE_PARSE_ARGS_OR_RETURN(mjs, &js_storage_naf_args, &dir_path, &file_name, &file_ext, &max_len);
JS_VALUE_PARSE_ARGS_OR_RETURN(
mjs, &js_storage_naf_args, &dir_path, &file_name, &file_ext, &max_len);

Storage* storage = JS_GET_CONTEXT(mjs);
FuriString* next_name = furi_string_alloc();
Expand Down

0 comments on commit db899d4

Please sign in to comment.