merged upstream

.drone.yml

@@ -36,6 +36,7 @@ steps:
       - mkdir -p sd-card/nfc/assets
       - mkdir -p sd-card/infrared/assets
       - mkdir -p sd-card/unirf
+      - mkdir -p sd-card/rfidfuzzer
       - mkdir -p sd-card/badusb/layouts
       - cp assets/resources/badusb/layouts/* sd-card/badusb/layouts/
       - cp assets/resources/subghz/assets/dangerous_settings sd-card/subghz/assets/dangerous_settings
@@ -48,6 +49,7 @@ steps:
       - cp assets/resources/infrared/assets/projectors.ir sd-card/infrared/assets/projectors.ir
       - cp assets/resources/infrared/assets/audio.ir sd-card/infrared/assets/audio.ir
       - cp assets/resources/unirf/unirf_map_example.txt sd-card/unirf/unirf_map_example.txt
+      - cp assets/resources/rfidfuzzer/example_uids.txt sd-card/rfidfuzzer/example_uids.txt
       - cp assets/resources/Manifest sd-card/Manifest
       - zip -r artifacts-default/sd-card-${DRONE_TAG}.zip sd-card
       - rm -rf sd-card

CHANGELOG.md

@@ -1,19 +1,19 @@
 ### New changes
-* NRF24 sniffer - tweak sniff parameters for more speed and reliability (by @mothball187) (PR #51)
-* Fixed text in LF RFID -> Extra Actions
+* Fix picopass plugin (revert OFW PR 1701)
 * Updated universal remote assets (by @Amec0e)
-* OFW PR: SubGHz decode raw gui (by @qistoph) (PR 1667) / xMasterX: Replaced custom image with default one & Fixed Led don't stop blink after pressing Send from decoder scene
-* WAV Player plugin excluded from releases to save space, you can enable it in `applications\meta` for your builds
-* OFW PR: SubGhz: add protocol Intertechno_V3 - OFW PR 1622
-* OFW PR: SubGhz: add protocol Prastel - OFW PR 1674
-* OFW PR: Fix displaying LFRFID protocol names - OFW PR 1682 / xMasterX: Fixed display for N/A manufacturer
-* OFW: LF RFID - PAC/Stanley, Paradox, Jablotron, Viking, Pyramid protocols support
-* OFW: Picopass write (PR 1658)
-* OFW: SubGhz: fix CLI "subghz tx"
-* OFW: IR: Fix crash after cancelling Learn New Remote
-* OFW: SubGhz: output debug data to external pin
-* OFW: Speedup SD card & enlarge your RAM
-* OFW: Other small changes
+### Changes from previous release
+* Add SubGhz Bruteforce plugin (by @Ganapati & @xMasterX) (PR #57) - saving functionality and many fixes by @xMasterX
+* Fix GUI and add new icon in LF-RFID App (icon by @Svaarich)
+* GUI Changes to LFRFID Fuzzer
+* New Battery info (from @theeogflip) (PR #60)
+* NRFSniff: Adds unique count display (by @Graf3x) (PR #56)
+* Updated universal remote assets (by @Amec0e)
+* OFW: RFID app port to plain C
+* OFW: SubGhz: fix decoder keeloq
+* OFW PR: Picopass: detect and show SE / SIO - OFW PR 1701 (by pcunning)
+* OFW PR: Fix MFClassic 4k reading - OFW PR 1712 (by Astrrra)
+* OFW: SubGhz: handle missing key in cryptostore. Lib: lower default display contrast.
+* OFW: Furi: wait for timer wind down in destructor 
 
 **Note: To avoid issues prefer installing using web updater or by self update package, all needed assets will be installed**
 

ReadMe.md

@@ -39,4 +39,4 @@ The great user [dummy-decoy](https://github.com/dummy-decoy) implemented loading
 * DOGE: `D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`
 * LTC: `ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`
 
-_logo generated with DALLE-2_
+_logo generated with DALLE-2_

applications/debug_tools/application.fam

@@ -15,6 +15,16 @@ App(
     ],
 )
 
+App(
+    appid="debug_apps_lite",
+    name="Basic debug apps bundle",
+    apptype=FlipperAppType.METAPACKAGE,
+    provides=[
+        "usb_mouse",
+        "uart_echo",
+    ],
+)
+
 App(
     appid="blink_test",
     name="Blink Test",

applications/desktop/desktop_settings/desktop_settings.h

@@ -46,4 +46,5 @@ typedef struct {
     PinCode pin_code;
     uint8_t is_locked;
     uint32_t auto_lock_delay_ms;
+    uint8_t displayBatteryPercentage;
 } DesktopSettings;

applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c

@@ -8,6 +8,7 @@
 #define SCENE_EVENT_SELECT_FAVORITE_SECONDARY 1
 #define SCENE_EVENT_SELECT_PIN_SETUP 2
 #define SCENE_EVENT_SELECT_AUTO_LOCK_DELAY 3
+#define SCENE_EVENT_SELECT_BATTERY_DISPLAY 4
 
 #define AUTO_LOCK_DELAY_COUNT 9
 const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = {
@@ -25,11 +26,31 @@ const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = {
 const uint32_t auto_lock_delay_value[AUTO_LOCK_DELAY_COUNT] =
     {0, 10000, 15000, 30000, 60000, 90000, 120000, 300000, 600000};
 
+#define BATTERY_VIEW_COUNT 5
+
+const char* const battery_view_count_text[BATTERY_VIEW_COUNT] = {
+    "Bar",
+    "%",
+    "Inv. %",
+    "Retro 3",
+    "Retro 5",
+};
+
+const uint32_t displayBatteryPercentage_value[BATTERY_VIEW_COUNT] = {0, 1, 2, 3, 4};
+
 static void desktop_settings_scene_start_var_list_enter_callback(void* context, uint32_t index) {
     DesktopSettingsApp* app = context;
     view_dispatcher_send_custom_event(app->view_dispatcher, index);
 }
 
+static void desktop_settings_scene_start_battery_view_changed(VariableItem* item) {
+    DesktopSettingsApp* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, battery_view_count_text[index]);
+    app->settings.displayBatteryPercentage = index;
+}
+
 static void desktop_settings_scene_start_auto_lock_delay_changed(VariableItem* item) {
     DesktopSettingsApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -65,6 +86,20 @@ void desktop_settings_scene_start_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, auto_lock_delay_text[value_index]);
 
+    item = variable_item_list_add(
+        variable_item_list,
+        "Battery View",
+        BATTERY_VIEW_COUNT,
+        desktop_settings_scene_start_battery_view_changed,
+        app);
+
+    value_index = value_index_uint32(
+        app->settings.displayBatteryPercentage,
+        displayBatteryPercentage_value,
+        BATTERY_VIEW_COUNT);
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, battery_view_count_text[value_index]);
+
     view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewVarItemList);
 }
 
@@ -91,6 +126,9 @@ bool desktop_settings_scene_start_on_event(void* context, SceneManagerEvent even
         case SCENE_EVENT_SELECT_AUTO_LOCK_DELAY:
             consumed = true;
             break;
+        case SCENE_EVENT_SELECT_BATTERY_DISPLAY:
+            consumed = true;
+            break;
         }
     }
     return consumed;

applications/desktop/views/desktop_view_main.c

@@ -16,7 +16,7 @@ struct DesktopMainView {
     TimerHandle_t poweroff_timer;
 };
 
-#define DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT 3000
+#define DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT 2000
 
 static void desktop_main_poweroff_timer_callback(TimerHandle_t timer) {
     DesktopMainView* main_view = pvTimerGetTimerID(timer);

applications/flipfrid/README.md

@@ -1,4 +1,21 @@
-# FlipFrid
+# Flipfrid
 
-A simple implementation of ZigFrid on Flipper zero (+bonus)
-(https://z4ziggy.wordpress.com/2017/07/21/zigfrid-a-passive-rfid-fuzzer/)
+Basic EM4100 Fuzzer
+
+## Why
+
+Flipfrid is a simple Rfid fuzzer using EM4100 protocol (125khz).
+Objective is to provide a simple to use fuzzer to test readers by emulating various cards.
+
+EM4100 cards use a 1 byte customer id and 4 bytes card id.
+
+## How
+
+There is 4 modes :
+- Default key loop over 16 factory/default keys and emulate each one after one ;
+- BF customer id. just an iteration from 0X00 to 0XFF on the first byte ;
+- Load Dump file : Load an existing EM4100 dump generated by Flipperzero, select an index and bruteforce from 0X00 to 0XFF;
+- Uids list: loop over a text file (one uid per line)
+
+TODO : 
+- blank screen on back press 

applications/flipfrid/application.fam

@@ -6,5 +6,5 @@ App(
     cdefines=["APP_FLIP_FRID"],
     requires=["gui"],
     stack_size=1 * 1024,
-    order=29,
+    order=13,
 )