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

.github/workflows/lint_and_submodule_check.yml

@@ -23,9 +23,8 @@ jobs:
       - name: 'Checkout code'
         uses: actions/checkout@v3
         with:
-          fetch-depth: 1
-          ref: ${{ github.event.pull_request.head.sha }}
-
+          fetch-depth: 2
+          ref: ${{ github.sha }}
 
       - name: 'Check protobuf branch'
         run: |
@@ -48,8 +47,26 @@ jobs:
             exit 1;
           fi
 
+      - name: 'Check for new TODOs'
+        id: check_todos
+        if: github.event_name == 'pull_request'
+        run: |
+          set +e;
+          git diff --unified=0 --no-color ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep -E '^\+' | grep -i -E '(TODO|HACK|FIXME|XXX)[ :]' | grep -v -- '-nofl' > lines.log;
+          MISSING_TICKETS=$( grep -v -E '\[FL-[0-9]+\]' lines.log );
+          if [ -n "$MISSING_TICKETS" ]; then
+            echo "Error: Missing ticket number in \`TODO\` comment(s)" >> $GITHUB_STEP_SUMMARY;
+            echo "\`\`\`" >> $GITHUB_STEP_SUMMARY;
+            echo "$MISSING_TICKETS" >> $GITHUB_STEP_SUMMARY;
+            echo "\`\`\`" >> $GITHUB_STEP_SUMMARY;
+            exit 1;
+          else
+            echo "No new TODOs without tickets found" >> $GITHUB_STEP_SUMMARY;
+          fi
+
       - name: 'Check Python code formatting'
         id: syntax_check_py
+        if: always()
         run: |
           set +e;
           ./fbt -s lint_py 2>&1 | tee lint-py.log;

applications/main/gpio/scenes/gpio_scene_usb_uart.c

@@ -19,7 +19,7 @@ void gpio_scene_usb_uart_on_enter(void* context) {
     uint32_t prev_state = scene_manager_get_scene_state(app->scene_manager, GpioAppViewUsbUart);
     if(prev_state == 0) {
         scene_usb_uart = malloc(sizeof(SceneUsbUartBridge));
-        scene_usb_uart->cfg.vcp_ch = 0; // TODO FL-3495: settings load
+        scene_usb_uart->cfg.vcp_ch = 0;
         scene_usb_uart->cfg.uart_ch = 0;
         scene_usb_uart->cfg.flow_pins = 0;
         scene_usb_uart->cfg.baudrate_mode = 0;

applications/main/infrared/scenes/infrared_scene_universal_ac.c

@@ -21,11 +21,11 @@ void infrared_scene_universal_ac_on_enter(void* context) {
         0,
         6,
         15,
-        &I_power_19x20,
-        &I_power_hover_19x20,
+        &I_off_19x20,
+        &I_off_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
-    button_panel_add_icon(button_panel, 4, 37, &I_power_text_24x5);
+    button_panel_add_icon(button_panel, 10, 37, &I_off_text_12x5);
     infrared_brute_force_add_record(brute_force, i++, "Off");
     button_panel_add_item(
         button_panel,

applications/main/lfrfid/lfrfid.c

@@ -186,13 +186,15 @@ int32_t lfrfid_app(void* p) {
             dolphin_deed(DolphinDeedRfidEmulate);
         } else {
             furi_string_set(app->file_path, args);
-            lfrfid_load_key_data(app, app->file_path, true);
-            view_dispatcher_attach_to_gui(
-                app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
-            scene_manager_next_scene(app->scene_manager, LfRfidSceneEmulate);
-            dolphin_deed(DolphinDeedRfidEmulate);
+            if(lfrfid_load_key_data(app, app->file_path, true)) {
+                view_dispatcher_attach_to_gui(
+                    app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
+                scene_manager_next_scene(app->scene_manager, LfRfidSceneEmulate);
+                dolphin_deed(DolphinDeedRfidEmulate);
+            } else {
+                view_dispatcher_stop(app->view_dispatcher);
+            }
         }
-
     } else {
         view_dispatcher_attach_to_gui(
             app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);

applications/main/subghz/scenes/subghz_scene_receiver.c

@@ -123,7 +123,7 @@ void subghz_scene_receiver_on_enter(void* context) {
         subghz_rx_key_state_set(subghz, SubGhzRxKeyStateAddKey);
     }
     furi_string_free(str_buff);
-    subghz_scene_receiver_update_statusbar(subghz);
+
     subghz_view_receiver_set_callback(
         subghz->subghz_receiver, subghz_scene_receiver_callback, subghz);
     subghz_txrx_set_rx_calback(subghz->txrx, subghz_scene_add_to_history_callback, subghz);
@@ -136,6 +136,8 @@ void subghz_scene_receiver_on_enter(void* context) {
     furi_check(
         subghz_txrx_load_decoder_by_name_protocol(subghz->txrx, SUBGHZ_PROTOCOL_BIN_RAW_NAME));
 
+    subghz_scene_receiver_update_statusbar(subghz);
+
     view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdReceiver);
 }
 

firmware/targets/f7/furi_hal/furi_hal_nfc.c

@@ -701,7 +701,9 @@ bool furi_hal_nfc_tx_rx(FuriHalNfcTxRxContext* tx_rx, uint16_t timeout_ms) {
         rfalNfcWorker();
         state = rfalNfcGetState();
         ret = rfalNfcDataExchangeGetStatus();
-        if(ret == ERR_BUSY) {
+        if(ret == ERR_WRONG_STATE) {
+            return false;
+        } else if(ret == ERR_BUSY) {
             if(DWT->CYCCNT - start > timeout_ms * clocks_in_ms) {
                 FURI_LOG_D(TAG, "Timeout during data exchange");
                 return false;