Merge remote-tracking branch 'origin/dev' into release-candidate

Author: hedger

.github/CODEOWNERS

@@ -1,69 +1,69 @@
 # Who owns all the fish by default
-* @skotopes @DrZlo13 @hedger @gsurkov
+* @DrZlo13 @hedger @gsurkov
 
 # Apps
-/applications/debug/bt_debug_app/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich
-/applications/debug/accessor/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/debug/battery_test_app/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich
-/applications/debug/bt_debug_app/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich
-/applications/debug/file_browser_test/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/debug/lfrfid_debug/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/debug/text_box_test/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/debug/uart_echo/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/debug/usb_mouse/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/debug/usb_test/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/debug/bt_debug_app/ @DrZlo13 @hedger @gsurkov @gornekich
+/applications/debug/accessor/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/debug/battery_test_app/ @DrZlo13 @hedger @gsurkov @gornekich
+/applications/debug/bt_debug_app/ @DrZlo13 @hedger @gsurkov @gornekich
+/applications/debug/file_browser_test/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/debug/lfrfid_debug/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/debug/text_box_test/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/debug/uart_echo/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/debug/usb_mouse/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/debug/usb_test/ @DrZlo13 @hedger @gsurkov @nminaylov
 
-/applications/main/archive/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/main/bad_usb/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/main/gpio/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/main/ibutton/ @skotopes @DrZlo13 @hedger @gsurkov
-/applications/main/infrared/ @skotopes @DrZlo13 @hedger @gsurkov
-/applications/main/nfc/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich @Astrrra
-/applications/main/subghz/ @skotopes @DrZlo13 @hedger @gsurkov @Skorpionm
-/applications/main/u2f/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/main/archive/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/main/bad_usb/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/main/gpio/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/main/ibutton/ @DrZlo13 @hedger @gsurkov
+/applications/main/infrared/ @DrZlo13 @hedger @gsurkov
+/applications/main/nfc/ @DrZlo13 @hedger @gsurkov @gornekich
+/applications/main/subghz/ @DrZlo13 @hedger @gsurkov @Skorpionm
+/applications/main/u2f/ @DrZlo13 @hedger @gsurkov @nminaylov
 
-/applications/services/bt/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich
-/applications/services/cli/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/services/crypto/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/services/desktop/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/services/dolphin/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/services/power/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich
-/applications/services/rpc/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/services/bt/ @DrZlo13 @hedger @gsurkov @gornekich
+/applications/services/cli/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/services/crypto/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/services/desktop/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/services/dolphin/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/services/power/ @DrZlo13 @hedger @gsurkov @gornekich
+/applications/services/rpc/ @DrZlo13 @hedger @gsurkov @nminaylov
 
-/applications/services/bt_settings_app/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich
-/applications/services/desktop_settings/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/services/dolphin_passport/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/services/power_settings_app/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich
+/applications/services/bt_settings_app/ @DrZlo13 @hedger @gsurkov @gornekich
+/applications/services/desktop_settings/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/services/dolphin_passport/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/services/power_settings_app/ @DrZlo13 @hedger @gsurkov @gornekich
 
-/applications/system/storage_move_to_sd/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/applications/system/js_app/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov @portasynthinca3
+/applications/system/storage_move_to_sd/ @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/system/js_app/ @DrZlo13 @hedger @gsurkov @nminaylov @portasynthinca3
 
-/applications/debug/unit_tests/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov @gornekich @Astrrra @Skorpionm
+/applications/debug/unit_tests/ @DrZlo13 @hedger @gsurkov @nminaylov @gornekich @Skorpionm
 
-/applications/examples/example_thermo/ @skotopes @DrZlo13 @hedger @gsurkov
+/applications/examples/example_thermo/ @DrZlo13 @hedger @gsurkov
 
 # Firmware targets
-/targets/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
+/targets/ @DrZlo13 @hedger @gsurkov @nminaylov
 
 # Assets
-/applications/main/infrared/resources/ @skotopes @DrZlo13 @hedger @gsurkov
+/applications/main/infrared/resources/ @DrZlo13 @hedger @gsurkov
 
 # Documentation
-/documentation/ @skotopes @DrZlo13 @hedger @gsurkov
-/scripts/toolchain/ @skotopes @DrZlo13 @hedger @gsurkov
+/documentation/ @DrZlo13 @hedger @gsurkov @portasynthinca3
+/scripts/toolchain/ @DrZlo13 @hedger @gsurkov
 
 # Lib
-/lib/stm32wb_copro/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich
-/lib/digital_signal/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich
-/lib/infrared/ @skotopes @DrZlo13 @hedger @gsurkov
-/lib/lfrfid/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/lib/libusb_stm32/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/lib/mbedtls/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/lib/mjs/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov @portasynthinca3
-/lib/nanopb/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/lib/nfc/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich @Astrrra
-/lib/one_wire/ @skotopes @DrZlo13 @hedger @gsurkov
-/lib/subghz/ @skotopes @DrZlo13 @hedger @gsurkov @Skorpionm
+/lib/stm32wb_copro/ @DrZlo13 @hedger @gsurkov @gornekich
+/lib/digital_signal/ @DrZlo13 @hedger @gsurkov @gornekich
+/lib/infrared/ @DrZlo13 @hedger @gsurkov
+/lib/lfrfid/ @DrZlo13 @hedger @gsurkov @nminaylov
+/lib/libusb_stm32/ @DrZlo13 @hedger @gsurkov @nminaylov
+/lib/mbedtls/ @DrZlo13 @hedger @gsurkov @nminaylov
+/lib/mjs/ @DrZlo13 @hedger @gsurkov @nminaylov @portasynthinca3
+/lib/nanopb/ @DrZlo13 @hedger @gsurkov @nminaylov
+/lib/nfc/ @DrZlo13 @hedger @gsurkov @gornekich
+/lib/one_wire/ @DrZlo13 @hedger @gsurkov
+/lib/subghz/ @DrZlo13 @hedger @gsurkov @Skorpionm
 
 # CI/CD
-/.github/workflows/ @skotopes @DrZlo13 @hedger @gsurkov
+/.github/workflows/ @DrZlo13 @hedger @gsurkov

.github/workflows/unit_tests.yml

@@ -21,7 +21,7 @@ jobs:
       - name: 'Flash unit tests firmware'
         id: flashing
         if: success()
-        timeout-minutes: 20
+        timeout-minutes: 5
         run: |
           source scripts/toolchain/fbtenv.sh
           ./fbt resources firmware_latest flash LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1
@@ -30,7 +30,7 @@ jobs:
       - name: 'Copy assets and unit data, reboot and wait for flipper'
         id: copy
         if: steps.flashing.outcome == 'success'
-        timeout-minutes: 7
+        timeout-minutes: 5
         run: |
           source scripts/toolchain/fbtenv.sh
           python3 scripts/testops.py -t=15 await_flipper
@@ -42,7 +42,7 @@ jobs:
       - name: 'Run units and validate results'
         id: run_units
         if: steps.copy.outcome == 'success'
-        timeout-minutes: 7
+        timeout-minutes: 5
         run: |
           source scripts/toolchain/fbtenv.sh
           python3 scripts/testops.py run_units

.github/workflows/updater_test.yml

@@ -20,7 +20,7 @@ jobs:
 
       - name: 'Flashing target firmware'
         id: first_full_flash
-        timeout-minutes: 20
+        timeout-minutes: 5
         run: |
           source scripts/toolchain/fbtenv.sh
           python3 scripts/testops.py -t=180 await_flipper
@@ -29,7 +29,7 @@ jobs:
 
       - name: 'Validating updater'
         id: second_full_flash
-        timeout-minutes: 10
+        timeout-minutes: 5
         if: success()
         run: |
           source scripts/toolchain/fbtenv.sh

.gitignore

@@ -67,3 +67,7 @@ PVS-Studio.log
 
 # JS packages
 node_modules/
+
+# cli_perf script output in case of errors
+/block.bin
+/return_block.bin

.vscode/example/settings.json.tmpl

@@ -12,6 +12,7 @@
         "SConstruct": "python",
         "*.fam": "python"
     },
+    "clangd.checkUpdates": false,
     "clangd.path": "${workspaceFolder}/toolchain/current/bin/clangd@FBT_PLATFORM_EXECUTABLE_EXT@",
     "clangd.arguments": [
         "--query-driver=**/arm-none-eabi-*",

SConstruct

@@ -412,6 +412,21 @@ distenv.PhonyTarget(
     ],
 )
 
+
+# Measure CLI loopback performance
+distenv.PhonyTarget(
+    "cli_perf",
+    [
+        [
+            "${PYTHON3}",
+            "${FBT_SCRIPT_DIR}/serial_cli_perf.py",
+            "-p",
+            "${FLIP_PORT}",
+            "${ARGS}",
+        ]
+    ],
+)
+
 # Update WiFi devboard firmware with release channel
 distenv.PhonyTarget(
     "devboard_flash",

applications/debug/accessor/accessor_app.cpp

@@ -2,6 +2,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 #include <stdarg.h>
+#include <power/power_service/power.h>
 
 void AccessorApp::run(void) {
     AccessorEvent event;
@@ -35,16 +36,18 @@ AccessorApp::AccessorApp()
     : text_store{0} {
     notification = static_cast<NotificationApp*>(furi_record_open(RECORD_NOTIFICATION));
     expansion = static_cast<Expansion*>(furi_record_open(RECORD_EXPANSION));
+    power = static_cast<Power*>(furi_record_open(RECORD_POWER));
     onewire_host = onewire_host_alloc(&gpio_ibutton);
     expansion_disable(expansion);
-    furi_hal_power_enable_otg();
+    power_enable_otg(power, true);
 }
 
 AccessorApp::~AccessorApp() {
-    furi_hal_power_disable_otg();
+    power_enable_otg(power, false);
     expansion_enable(expansion);
     furi_record_close(RECORD_EXPANSION);
     furi_record_close(RECORD_NOTIFICATION);
+    furi_record_close(RECORD_POWER);
     onewire_host_free(onewire_host);
 }
 

applications/debug/accessor/accessor_app.h

@@ -7,6 +7,7 @@
 #include <one_wire/one_wire_host.h>
 #include <notification/notification_messages.h>
 #include <expansion/expansion.h>
+#include <power/power_service/power.h>
 
 class AccessorApp {
 public:
@@ -53,4 +54,5 @@ class AccessorApp {
 
     NotificationApp* notification;
     Expansion* expansion;
+    Power* power;
 };

applications/debug/accessor/application.fam

@@ -6,6 +6,5 @@ App(
     entry_point="accessor_app",
     requires=["gui"],
     stack_size=4 * 1024,
-    order=40,
     fap_category="Debug",
 )

applications/debug/battery_test_app/application.fam

@@ -8,7 +8,6 @@ App(
         "power",
     ],
     stack_size=1 * 1024,
-    order=130,
     fap_category="Debug",
     fap_libs=["assets"],
 )