Squashed 'applications/external/' changes from 8a49bcacfa..fc158f8452

fc158f8452 Revert "Merge esubghz_chat from https://github.com/xMasterX/all-the-plugins"
d3248dc0b2 NRF24 Mouse Jacker: Improve addresses.txt reading
6c1142aee2 Count Down Timer: Fix < 1 sec crash for good
3db1115d7f Fix build
b05bff1dc5 Mifare Nested: Fix memmgmt to please TLSF
24b7f24218 Add mifare_nested from https://github.com/xMasterX/all-the-plugins
edb45b2bd3 Squashed 'mifare_nested/' content from commit 1e5c18982
84defb6273 ESP Flasher: Add source links
9d7caa8862 Merge unitemp from https://github.com/xMasterX/all-the-plugins
21784a0709 Merge slots from https://github.com/Daniel-dev-s/flipperzero-slots
8a029cbe70 Merge picopass from https://github.com/xMasterX/all-the-plugins
4ae790701a Merge nfc_magic from https://github.com/flipperdevices/flipperzero-good-faps
4e341d0037 Merge mfkey from https://github.com/xMasterX/all-the-plugins
17112829cf Merge metronome from https://github.com/xMasterX/all-the-plugins
6cf07387b2 Merge magspoof from https://github.com/zacharyweiss/magspoof_flipper
797a84eca9 Merge magspoof from https://github.com/xMasterX/all-the-plugins
9474576622 Merge hex_viewer from https://github.com/xMasterX/all-the-plugins
9774a2f1d5 Merge esubghz_chat from https://github.com/xMasterX/all-the-plugins
a1b5a7e967 Merge esp_flasher from https://github.com/xMasterX/all-the-plugins
fe7e68fe97 Merge color_guess from https://github.com/xMasterX/all-the-plugins
75e727d785 Merge cntdown_timer from https://github.com/0w0mewo/fpz_cntdown_timer
7f3b17bd46 [NFC Magic] Fix the user dict attack results being discarded (#211)
4f2520c Pass VarItem through scene state, rather than global
04d7a71 clamp counter setting to always above zero
ceced6c catalog as "Tools"
882ebc1b3a backported ported and added kostily and velosipedy
4710622461 fix metronome crash
0583748ac0 upd mfkey
e62db22b7d upd colorguess
ea1dad52f9 upd picopass
c7da4f3528 add links to binary sources
920d7551b7 update espflasher
3b83d0198e upd hex viewer
123425e Merge pull request #2 from DefinetlyNotAI/master
714b1cd4c8 upd magspoof
15cfdec6c4 fix unitemp icon
1f6c8f1 Update slotmachine.c
70557ce Add files via upload

git-subtree-dir: applications/external
git-subtree-split: fc158f8452a6fa74ab9292a8d529c1eafbb7cba9

cntdown_timer/application.fam

@@ -1,5 +1,3 @@
-# qv. https://github.com/flipperdevices/flipperzero-firmware/blob/dev/documentation/AppManifests.md
-
 App(
     appid="cntdown_tim",
     name="Count Down Timer",

cntdown_timer/views/countdown_view.c

@@ -222,8 +222,8 @@ static void handle_time_setting_updown(CountDownTimView* cdv, CountDownViewCmd c
                 break;
             }
 
-            if(count < 0) {
-                count = 0;
+            if(count <= 0) {
+                count = 1;
             }
 
             // update count state

esp_flasher/scenes/esp_flasher_scene_quick.c

@@ -1,5 +1,10 @@
 #include "../esp_flasher_app_i.h"
 
+// Marauder firmware source - https://github.com/justcallmekoko/ESP32Marauder
+// Wardriver firmware source - https://github.com/Sil333033/flipperzero-wardriver
+// AirTag Scanner firmware source - https://github.com/MatthewKuKanich/ESP32-AirTag-Scanner
+// Black Magic firmware source - https://github.com/flipperdevices/blackmagic-esp32-s2
+
 // DO NOT use as an example, you should split into different scene files for each screen
 // To keep in a single file, this is setup in an unusual and confusing way
 // You can find more info in comments throughout

esubghz_chat/esubghz_chat_i.h

@@ -11,7 +11,6 @@
 #include <gui/modules/text_box.h>
 #include <gui/modules/text_input.h>
 #include <notification/notification_messages.h>
-// #include <lib/nfc/nfc_worker.h>
 #include <lib/subghz/subghz_tx_rx_worker.h>
 #include <mbedtls/sha256.h>
 

esubghz_chat/scenes/esubghz_chat_key_share_popup.c

@@ -81,7 +81,7 @@
 //     popup_disable_timeout(state->nfc_popup);
 
 //     popup_set_header(state->nfc_popup, "Sharing...", 67, 13, AlignLeft, AlignTop);
-//     popup_set_icon(state->nfc_popup, 0, 3, &I_NFC_dolphin_emulation_47x61);
+//     popup_set_icon(state->nfc_popup, 0, 3, &I_NFC_dolphin_emulation_51x64);
 //     popup_set_text(state->nfc_popup, "Sharing\nKey via\nNFC", 90, 28, AlignCenter, AlignTop);
 
 //     prepare_nfc_dev_data(state);

magspoof/application.fam

@@ -17,7 +17,7 @@ App(
     fap_category="GPIO",
     fap_icon_assets="icons",
     fap_icon_assets_symbol="mag",
-    fap_version=(0, 9),  # major, minor
+    fap_version=(0, 10),  # major, minor
     fap_description="Enables wireless transmission of magstripe data",
     fap_author="Zachary Weiss",
     fap_weburl="https://github.com/zacharyweiss/magspoof_flipper",

magspoof/scenes/mag_scene_emulate_config.c

@@ -199,15 +199,13 @@ void mag_scene_emulate_config_on_enter(void* context) {
     item = variable_item_list_add(
         mag->variable_item_list, "Clock:", CLOCK_COUNT, mag_scene_emulate_config_set_clock, mag);
     value_index = value_index_uint32(mag->state.us_clock, clock_value, CLOCK_COUNT);
-    // scene_manager_set_scene_state(mag->scene_manager, MagSceneEmulateConfig, (uint32_t)item);
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, clock_text[value_index]);
 
     // Track
     item = variable_item_list_add(
         mag->variable_item_list, "Track:", TRACK_COUNT, mag_scene_emulate_config_set_track, mag);
     value_index = value_index_uint32(mag->state.track, track_value, TRACK_COUNT);
-    //scene_manager_set_scene_state(mag->scene_manager, MagSceneEmulateConfig, (uint32_t)item);
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, track_text[value_index]);
 
@@ -220,7 +218,6 @@ void mag_scene_emulate_config_on_enter(void* context) {
         mag_scene_emulate_config_set_reverse,
         mag);
     value_index = value_index_uint32(mag->state.reverse, reverse_value, REVERSE_COUNT);
-    //scene_manager_set_scene_state(mag->scene_manager, MagSceneEmulateConfig, (uint32_t)item);
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, reverse_text[value_index]);
 
@@ -232,7 +229,6 @@ void mag_scene_emulate_config_on_enter(void* context) {
         mag_scene_emulate_config_set_repeat_mode,
         mag);
     value_index = (uint32_t)mag->state.repeat_mode;
-    //scene_manager_set_scene_state(mag->scene_manager, MagSceneEmulateConfig, (uint32_t)item);
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, reverse_text[value_index]);
 
@@ -243,7 +239,6 @@ void mag_scene_emulate_config_on_enter(void* context) {
         item = variable_item_list_add(
             mag->variable_item_list, "TX via:", TX_COUNT, mag_scene_emulate_config_set_tx, mag);
         value_index = value_index_uint32(mag->state.tx, tx_value, TX_COUNT);
-        //scene_manager_set_scene_state(mag->scene_manager, MagSceneEmulateConfig, (uint32_t)item);
         variable_item_set_current_value_index(item, value_index);
         variable_item_set_current_value_text(item, tx_text[value_index]);
 #ifdef FW_ORIGIN_Official
@@ -261,7 +256,6 @@ void mag_scene_emulate_config_on_enter(void* context) {
         mag);
     value_index =
         value_index_uint32(mag->setting->us_interpacket, interpacket_value, INTERPACKET_COUNT);
-    scene_manager_set_scene_state(mag->scene_manager, MagSceneEmulateConfig, (uint32_t)item);
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, interpacket_text[value_index]);*/
     UNUSED(mag_scene_emulate_config_set_interpacket);

magspoof/scenes/mag_scene_settings.c

@@ -10,9 +10,7 @@ enum VarItemListIndex {
     VarItemListIndexPinEnable,
     VarItemListIndexNRepeats,
     VarItemListIndexRepeatModeOn,
-#ifndef FW_ORIGIN_Official
     VarItemListIndexAllowUART,
-#endif
 };
 
 static const char* gpio[] = {
@@ -61,8 +59,6 @@ const char* const off_on_text[OFF_ON_COUNT] = {
     "ON",
 };
 
-VariableItem* item_dialog_cb;
-
 void mag_scene_settings_var_item_list_callback(void* context, uint32_t index) {
     Mag* mag = context;
     view_dispatcher_send_custom_event(mag->view_dispatcher, index);
@@ -114,7 +110,7 @@ static void mag_scene_settings_set_allow_uart(VariableItem* item) {
     bool rising = !mag->state.allow_uart && !!variable_item_get_current_value_index(item);
     // trigger dialog only on rising change
     if(rising) {
-        item_dialog_cb = item;
+        scene_manager_set_scene_state(mag->scene_manager, MagSceneSettings, (uint32_t)item);
         view_dispatcher_send_custom_event(mag->view_dispatcher, MagEventConfirmDialog);
     }
 
@@ -228,7 +224,7 @@ bool mag_scene_settings_on_event(void* context, SceneManagerEvent event) {
 
         break;
     case SceneManagerEventTypeCustom:
-        scene_manager_set_scene_state(mag->scene_manager, MagSceneSettings, event.event);
+        // scene_manager_set_scene_state(mag->scene_manager, MagSceneSettings, event.event);
         consumed = true;
         if(event.event == MagEventConfirmDialog) {
             DialogMessage* msg = dialog_message_alloc();
@@ -244,12 +240,15 @@ bool mag_scene_settings_on_event(void* context, SceneManagerEvent event) {
             DialogMessageButton res = dialog_message_show(furi_record_open(RECORD_DIALOGS), msg);
             if(res != DialogMessageButtonRight) {
                 // if not "Yes", reset to "OFF" (0 / false-y)
-                variable_item_set_current_value_index(item_dialog_cb, 0);
-                mag_scene_settings_set_bool(item_dialog_cb, &mag->state.allow_uart);
+                VariableItem* item =
+                    (VariableItem*)scene_manager_get_scene_state(scene_manager, MagSceneSettings);
+                variable_item_set_current_value_index(item, 0);
+                mag_scene_settings_set_bool(item, &mag->state.allow_uart);
             }
             dialog_message_free(msg);
             furi_record_close(RECORD_DIALOGS);
-            item_dialog_cb = NULL;
+            // clear item from scene state
+            scene_manager_set_scene_state(scene_manager, MagSceneSettings, 0);
         }
         break;
     default:

metronome/application.fam

@@ -12,6 +12,6 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_author="@panki27 & @xMasterX",
-    fap_version="1.1",
+    fap_version="1.2",
     fap_description="Metronome app",
 )

metronome/gui_extensions.c

@@ -9,7 +9,7 @@ void elements_button_top_left(Canvas* canvas, const char* str) {
     const uint8_t button_height = 12;
     const uint8_t vertical_offset = 3;
     const uint8_t horizontal_offset = 3;
-    const uint8_t string_width = canvas_string_width(canvas, str);
+    uint16_t string_width = canvas_string_width(canvas, str);
     const Icon* icon = &I_ButtonUp_7x4;
     const uint8_t icon_h_offset = 3;
     const uint8_t icon_width_with_offset = icon->width + icon_h_offset;
@@ -25,7 +25,7 @@ void elements_button_top_left(Canvas* canvas, const char* str) {
     canvas_draw_line(canvas, x + button_width + 2, y - button_height, x + button_width + 2, y - 3);
 
     canvas_invert_color(canvas);
-    canvas_draw_icon(canvas, x + horizontal_offset, y - icon_v_offset, &I_ButtonUp_7x4);
+    canvas_draw_icon(canvas, x + horizontal_offset, y - icon_v_offset, icon);
     canvas_draw_str(
         canvas, x + horizontal_offset + icon_width_with_offset, y - vertical_offset, str);
     canvas_invert_color(canvas);
@@ -35,7 +35,7 @@ void elements_button_top_right(Canvas* canvas, const char* str) {
     const uint8_t button_height = 12;
     const uint8_t vertical_offset = 3;
     const uint8_t horizontal_offset = 3;
-    const uint8_t string_width = canvas_string_width(canvas, str);
+    uint16_t string_width = canvas_string_width(canvas, str);
     const Icon* icon = &I_ButtonUp_7x4;
     const uint8_t icon_h_offset = 3;
     const uint8_t icon_width_with_offset = icon->width + icon_h_offset;
@@ -52,7 +52,6 @@ void elements_button_top_right(Canvas* canvas, const char* str) {
 
     canvas_invert_color(canvas);
     canvas_draw_str(canvas, x - button_width + horizontal_offset, y - vertical_offset, str);
-    canvas_draw_icon(
-        canvas, x - horizontal_offset - icon->width, y - icon_v_offset, &I_ButtonUp_7x4);
+    canvas_draw_icon(canvas, x - horizontal_offset - icon->width, y - icon_v_offset, icon);
     canvas_invert_color(canvas);
 }

metronome/metronome.c

@@ -124,8 +124,12 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     elements_button_top_right(canvas, "Hold");
 
     // draw progress bar
-    elements_progress_bar(
-        canvas, 8, 36, 112, (float)metronome_state->current_beat / metronome_state->beats_per_bar);
+    float current_progress = (float)metronome_state->current_beat / metronome_state->beats_per_bar;
+    if(!((current_progress >= 0.0f) && (current_progress <= 1.0f))) {
+        current_progress = 0.1f;
+    }
+
+    elements_progress_bar(canvas, 8, 36, 112, current_progress);
 
     // cleanup
     furi_string_free(tempStr);
@@ -301,7 +305,6 @@ int32_t metronome_app() {
         FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
 
         furi_mutex_acquire(metronome_state->mutex, FuriWaitForever);
-
         if(event_status == FuriStatusOk) {
             if(event.type == EventTypeKey) {
                 if(event.input.type == InputTypeShort) {
@@ -380,7 +383,6 @@ int32_t metronome_app() {
                 }
             }
         }
-
         furi_mutex_release(metronome_state->mutex);
         view_port_update(view_port);
     }

mifare_nested/.gitsubtree

@@ -0,0 +1 @@
+https://github.com/xMasterX/all-the-plugins dev base_pack/mifare_nested