Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit

Permalink
mjs: minor fixes (#3442)
Browse files Browse the repository at this point in the history
* lib: mjs: removed relocation flags

* js: fixed api example script

* js: private api cleanup

* Updated CODEOWNERS & readme for apps
  • Loading branch information
hedger authored Feb 12, 2024
1 parent 0154018 commit c8e62ba
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
/applications/services/power_settings_app/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich

/applications/system/storage_move_to_sd/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
/applications/system/js_app/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov

/applications/debug/unit_tests/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov @gornekich @Astrrra @Skorpionm

Expand All @@ -58,7 +59,7 @@
/lib/lfrfid/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
/lib/libusb_stm32/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
/lib/mbedtls/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
/lib/micro-ecc/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
/lib/mjs/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
/lib/nanopb/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
/lib/nfc/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich @Astrrra
/lib/one_wire/ @skotopes @DrZlo13 @hedger @gsurkov
Expand Down
5 changes: 4 additions & 1 deletion applications/ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ Small applications providing configuration for basic firmware and its services.

## system

Utility apps not visible in other menus.
Utility apps not visible in other menus, plus few external apps pre-packaged with the firmware.

- `hid_app` - BLE & USB HID remote
- `js_app` - JS engine runner
- `snake_game` - Snake game
- `storage_move_to_sd` - Data migration tool for internal storage
- `updater` - Update service & application
2 changes: 1 addition & 1 deletion applications/system/js_app/examples/apps/Scripts/load.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
let math = load("/ext/apps/Scripts/api.js");
let math = load("/ext/apps/Scripts/load_api.js");
let result = math.add(5, 10);
print(result);
4 changes: 1 addition & 3 deletions applications/system/js_app/plugin_api/app_api_table_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@
static constexpr auto app_api_table = sort(create_array_t<sym_entry>(
API_METHOD(js_delay_with_flags, bool, (struct mjs*, uint32_t)),
API_METHOD(js_flags_set, void, (struct mjs*, uint32_t)),
API_METHOD(js_flags_wait, uint32_t, (struct mjs*, uint32_t, uint32_t)),
API_VARIABLE(I_Certification1_103x56, const Icon),
API_VARIABLE(I_Certification2_46x33, const Icon)));
API_METHOD(js_flags_wait, uint32_t, (struct mjs*, uint32_t, uint32_t))));
3 changes: 0 additions & 3 deletions lib/mjs/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ libenv.ApplyLibFlags()

libenv.AppendUnique(
CCFLAGS=[
# Required for lib to be linkable with .faps
"-mword-relocations",
"-mlong-calls",
"-Wno-redundant-decls",
"-Wno-unused-function",
],
Expand Down

0 comments on commit c8e62ba

Please sign in to comment.