Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into js-backport3-and-more
Browse files Browse the repository at this point in the history
  • Loading branch information
skotopes committed Oct 31, 2024
2 parents fd8b181 + 85e5642 commit f7d34e7
Show file tree
Hide file tree
Showing 108 changed files with 6,152 additions and 949 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,7 @@ PVS-Studio.log

.gdbinit

/fbt_options_local.py
/fbt_options_local.py

# JS packages
node_modules/
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static void view_port_input_callback(InputEvent* input_event, void* context) {
furi_message_queue_put(app->input_queue, input_event, 0);
}

static bool input_queue_callback(FuriEventLoopObject* object, void* context) {
static void input_queue_callback(FuriEventLoopObject* object, void* context) {
FuriMessageQueue* queue = object;
EventLoopBlinkTestApp* app = context;

Expand All @@ -107,8 +107,6 @@ static bool input_queue_callback(FuriEventLoopObject* object, void* context) {
furi_event_loop_stop(app->event_loop);
}
}

return true;
}

static void blink_timer_callback(void* context) {
Expand Down
11 changes: 11 additions & 0 deletions applications/debug/unit_tests/resources/unit_tests/js/basic.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
let tests = require("tests");
let flipper = require("flipper");

tests.assert_eq(1337, 1337);
tests.assert_eq("hello", "hello");

tests.assert_eq("compatible", sdkCompatibilityStatus(0, 1));
tests.assert_eq("firmwareTooOld", sdkCompatibilityStatus(100500, 0));
tests.assert_eq("firmwareTooNew", sdkCompatibilityStatus(-100500, 0));
tests.assert_eq(true, doesSdkSupport(["baseline"]));
tests.assert_eq(false, doesSdkSupport(["abobus", "other-nonexistent-feature"]));

tests.assert_eq("flipperdevices", flipper.firmwareVendor);
tests.assert_eq(0, flipper.jsSdkVersion[0]);
tests.assert_eq(1, flipper.jsSdkVersion[1]);
205 changes: 0 additions & 205 deletions applications/debug/unit_tests/tests/furi/furi_event_loop.c

This file was deleted.

Loading

0 comments on commit f7d34e7

Please sign in to comment.