From 0d53cb2c48380dff521e9fcbe157524111bbac57 Mon Sep 17 00:00:00 2001 From: Evgeny E <10674163+ssecsd@users.noreply.github.com> Date: Mon, 24 Feb 2025 22:00:51 +0000 Subject: [PATCH 1/3] test: fix timeout for flashing step (#4127) --- .github/workflows/unit_tests.yml | 2 +- .github/workflows/updater_test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 309dd7ebd..37df8e099 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -21,7 +21,7 @@ jobs: - name: 'Flash unit tests firmware' id: flashing if: success() - timeout-minutes: 20 + timeout-minutes: 10 run: | source scripts/toolchain/fbtenv.sh ./fbt resources firmware_latest flash LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1 diff --git a/.github/workflows/updater_test.yml b/.github/workflows/updater_test.yml index 59cc6e716..df62daf58 100644 --- a/.github/workflows/updater_test.yml +++ b/.github/workflows/updater_test.yml @@ -20,7 +20,7 @@ jobs: - name: 'Flashing target firmware' id: first_full_flash - timeout-minutes: 20 + timeout-minutes: 10 run: | source scripts/toolchain/fbtenv.sh python3 scripts/testops.py -t=180 await_flipper From 0d99e54a17860469f98a36f749362cb9470648d1 Mon Sep 17 00:00:00 2001 From: Tyler Crumpton Date: Wed, 26 Feb 2025 10:34:54 -0500 Subject: [PATCH 2/3] Fix PWM-supported logic on pwmStop() (#4129) --- applications/system/js_app/modules/js_gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/system/js_app/modules/js_gpio.c b/applications/system/js_app/modules/js_gpio.c index 23884a6d4..2a559570f 100644 --- a/applications/system/js_app/modules/js_gpio.c +++ b/applications/system/js_app/modules/js_gpio.c @@ -308,7 +308,7 @@ static void js_gpio_is_pwm_running(struct mjs* mjs) { */ static void js_gpio_pwm_stop(struct mjs* mjs) { JsGpioPinInst* manager_data = JS_GET_CONTEXT(mjs); - if(manager_data->pwm_output != FuriHalPwmOutputIdNone) { + if(manager_data->pwm_output == FuriHalPwmOutputIdNone) { JS_ERROR_AND_RETURN(mjs, MJS_BAD_ARGS_ERROR, "PWM is not supported on this pin"); } From cef20b3a5ef4596b010776a19df273f92eb8504c Mon Sep 17 00:00:00 2001 From: WillyJL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 5 Mar 2025 14:11:51 +0000 Subject: [PATCH 3/3] JS: Fix gui.js stopwatch example borders (#4131) --- applications/system/js_app/examples/apps/Scripts/gui.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/system/js_app/examples/apps/Scripts/gui.js b/applications/system/js_app/examples/apps/Scripts/gui.js index 16673524a..bc63a7ef6 100644 --- a/applications/system/js_app/examples/apps/Scripts/gui.js +++ b/applications/system/js_app/examples/apps/Scripts/gui.js @@ -19,8 +19,8 @@ let jsLogo = icon.getBuiltin("js_script_10px"); let stopwatchWidgetElements = [ { element: "string", x: 67, y: 44, align: "bl", font: "big_numbers", text: "00 00" }, { element: "string", x: 77, y: 22, align: "bl", font: "primary", text: "Stopwatch" }, - { element: "frame", x: 64, y: 27, w: 28, h: 20, radius: 3, fill: false }, - { element: "frame", x: 100, y: 27, w: 28, h: 20, radius: 3, fill: false }, + { element: "rect", x: 64, y: 27, w: 28, h: 20, radius: 3, fill: false }, + { element: "rect", x: 100, y: 27, w: 28, h: 20, radius: 3, fill: false }, { element: "icon", x: 0, y: 5, iconData: cuteDolphinWithWatch }, { element: "icon", x: 64, y: 13, iconData: jsLogo }, { element: "button", button: "right", text: "Back" },