Latest RM0630-2130-0.102.4-54e7e3e on PATREON & GitHub - RM FIXES

RogueMaster · Jul 1, 2024 · 29729e4 · 29729e4
1 parent da54f2e
commit 29729e4
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 23 deletions.
diff --git a/ReadMe.md b/ReadMe.md
@@ -79,7 +79,6 @@ This software is for experimental purposes only and is not meant for any illegal
 - Updated: [15 v1.2 (By x27)](https://github.com/x27/flipperzero-game15) (Updated from MNTM Apps)
 - Updated: [Barcode App v1.3 (By Kingal1337)](https://github.com/Kingal1337/flipper-barcode-generator) (Updated from MNTM Apps)
 - Updated: [Doom v1.4 (By p4nic4ttack)](https://github.com/p4nic4ttack/doom-flipper-zero) (Updated from MNTM Apps)
-- Updated: [Enhanced Sub-Ghz Chat v1.3 (By twisted-pear)](https://github.com/twisted-pear/esubghz_chat) (Updated from MNTM Apps)
 - Updated: [Mifare Nested v1.6.6 (By AloneLiberty)](https://github.com/AloneLiberty/FlipperNested) [free up some space in mifare nested (By xMasterX)](https://github.com/xMasterX/all-the-plugins/commit/27544eb845e3bd23391394e8ea5817effefb213b) (Updated from MNTM Apps)
 - Updated: [Paint v1.2 (By n-o-T-I-n-s-a-n-e)](https://github.com/n-o-T-I-n-s-a-n-e) (Updated from MNTM Apps)
 - Updated: [Password Generator v1.3 (By anakod)](https://github.com/anakod/flipper_passgen) (Updated from MNTM Apps)
@@ -90,6 +89,13 @@ This software is for experimental purposes only and is not meant for any illegal
 - Updated: [Many apps version increment only from MNTM Apps (By Willy-JL) (Merged By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/5535ae10e25e2863e45e8309d92d68dbe946401e)
 - Updated: [Music Beeper (By DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/pull/1189) (Updated from UL Apps)
 - Updated: [Many apps version increment only from UL Apps (By xMasterX) (Merged By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/f3e91cd826b298d724742cb0a8fd23ebdb6ab7b8)
+- Updated: [Enhanced Sub-Ghz Chat v1.3 (By twisted-pear)](https://github.com/twisted-pear/esubghz_chat) (Updated from MNTM Apps) [Merge Fixes By RogueMaster](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/)
+- Updated: [HC-11 Modem v1.0 (By Giraut)](https://github.com/Giraut/flipper_zero_hc11_wireless_modem) `Req: HC-11` [Merge Fixes By RogueMaster](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/)
+- Updated: [LaserCat v1.1 (By DroWez)](https://github.com/DroWez/LaserCat) [Merge Fixes By RogueMaster](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/)
+- Updated: [Multi Counter v1.1 (By JadePossible)](https://github.com/JadePossible/Flipper-Multi-Counter) [Merge Fixes By RogueMaster](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/)
+- Updated: [Pet a Dolphin v1.1 (By ugeneSmile)](https://github.com/EugeneSmile/PetADolphin) [Merge Fixes By RogueMaster](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/)
+- Updated: [Rock Paper Scissors 2 v1.1 (By benwoo1110)](https://github.com/benwoo1110/rps-FlipperZero) [Merge Fixes By RogueMaster](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/)
+- Updated: [UHF RFID WIP v1.1 (By frux-c)](https://github.com/frux-c/uhf_rfid) `Req: M100 or QM100` [Merge Fixes By RogueMaster](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/)
 
 <a name="release">
 
@@ -338,7 +344,7 @@ $ ./fbt dolphin_ext
 - [Minesweeper v1.2 (By panki27)](https://github.com/panki27/minesweeper)
 - [Minesweeper Redux v1.5 (By squee72564)](https://github.com/squee72564/F0_Minesweeper_Fap)
 - [Monty Hall v1.2 (By DevMilanIan)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/203)
-- [Multi Counter (By JadePossible)](https://github.com/JadePossible/Flipper-Multi-Counter)
+- [Multi Counter v1.1 (By JadePossible)](https://github.com/JadePossible/Flipper-Multi-Counter)
 - [Nu Pogodi! (Ну, погоди!) v1.3 (By sionyx)](https://github.com/sionyx/flipper_nupogodi)
 - [PacMan WIP v0.1 (By DanieleMaffi)](https://github.com/DanieleMaffi/flipper-pacman)
 - [Paper Plane v1.3 (By Larry-the-Pig)](https://github.com/Larry-the-Pig/flipper-plane)
@@ -350,7 +356,7 @@ $ ./fbt dolphin_ext
 - [Reaction Time (By ihatecsv)](https://github.com/ihatecsv/flipper_reaction_time)
 - [Reversi v1.3 (By dimat)](https://github.com/dimat/flipperzero-reversi)
 - [Rock Paper Scissors v1.5 (By CodeAllNight/jamisonderek)](https://github.com/jamisonderek/flipper-zero-tutorials/tree/main/subghz/plugins/rock_paper_scissors)
-- [Rock Paper Scissors 2 v1.0 (By benwoo1110)](https://github.com/benwoo1110/rps-FlipperZero)
+- [Rock Paper Scissors 2 v1.1 (By benwoo1110)](https://github.com/benwoo1110/rps-FlipperZero)
 - [Root of Life v1.2 (By Xorboo)](https://github.com/Xorboo/root-of-life)
 - [Rubiks Cube Scrambler v1.3 (By RaZeSloth)](https://github.com/RaZeSloth/flipperzero-rubiks-cube-scrambler)
 - [Scorched Tanks v1.3 (By jasniec)](https://github.com/jasniec/flipper-scorched-tanks-game)
@@ -492,7 +498,7 @@ $ ./fbt dolphin_ext
 - [IR Xbox Controller v1.2 (By gebeto)](https://github.com/gebeto/flipper-xbox-controller)
 - [J305 Geiger Counter v1.4 (By nmrr)](https://github.com/nmrr/flipperzero-geigercounter)
 - [JS Runner v1.0 (By nminaylov & DrZlo13)-OFW](https://github.com/flipperdevices/flipperzero-firmware/pull/3286)
-- [LaserCat v1.0 (By DroWez)](https://github.com/DroWez/LaserCat)
+- [LaserCat v1.1 (By DroWez)](https://github.com/DroWez/LaserCat)
 - [LED Pulsator (By leedave)](https://github.com/leedave/Leeds-Flipper-Zero-Applications)
 - [Lightmeter v1.2 (By oleksiikutuzov)](https://github.com/oleksiikutuzov/flipperzero-lightmeter) `Req: BH1750/MAX44009`
 - [Logic Analyzer (By g3gg0)](https://github.com/g3gg0/flipper-logic_analyzer)
@@ -546,7 +552,7 @@ $ ./fbt dolphin_ext
 - [Orgasmotron (By jbohack)](https://github.com/jbohack)
 - [Password Generator v1.3 (By anakod)](https://github.com/anakod/flipper_passgen)
 - [PC Monitor v1.1 (By TheSainEyereg)](https://github.com/TheSainEyereg/flipper-pc-monitor) _Req: [Backend](https://github.com/TheSainEyereg/flipper-pc-monitor-backend)_
-- [Pet a Dolphin (By ugeneSmile)](https://github.com/EugeneSmile/PetADolphin)
+- [Pet a Dolphin v1.1 (By ugeneSmile)](https://github.com/EugeneSmile/PetADolphin)
 - [pForth (By twisted-pear)](https://github.com/twisted-pear/f0forth)
 - [Pi Terminal v1.0 (By dagnazty & InfoSecREDD)](https://github.com/InfoSecREDD/Flip-pi)
 - [PicoPass (iClass) v1.16 (By Bettse)](https://gitlab.com/bettse/picopass)

diff --git a/applications/external/esubghz_chat/scenes/esubghz_chat_key_read_popup.c b/applications/external/esubghz_chat/scenes/esubghz_chat_key_read_popup.c
@@ -138,7 +138,7 @@ static void key_read_popup_set_state(ESubGhzChatState* state, KeyReadPopupState
         popup_reset(state->nfc_popup);
         popup_set_header(state->nfc_popup, "Failure!", 64, 2, AlignCenter, AlignTop);
         popup_set_text(state->nfc_popup, "Failed\nto read\nkey.", 78, 16, AlignLeft, AlignTop);
-        popup_set_icon(state->nfc_popup, 21, 13, &I_dolph_cry_49x54);
+        popup_set_icon(state->nfc_popup, 15, 15, &I_Cry_dolph_55x52);
 
         popup_set_timeout(state->nfc_popup, KEY_READ_POPUP_MS);
         popup_set_context(state->nfc_popup, state);
@@ -151,7 +151,7 @@ static void key_read_popup_set_state(ESubGhzChatState* state, KeyReadPopupState
 
         popup_reset(state->nfc_popup);
         popup_set_header(state->nfc_popup, "Key\nread!", 13, 22, AlignLeft, AlignBottom);
-        popup_set_icon(state->nfc_popup, 36, 5, &I_DolphinDone_80x58);
+        popup_set_icon(state->nfc_popup, 20, 4, &I_DolphinNice_96x59);
 
         popup_set_timeout(state->nfc_popup, KEY_READ_POPUP_MS);
         popup_set_context(state->nfc_popup, state);

diff --git a/applications/external/esubghz_chat/scenes/esubghz_chat_key_share_popup.c b/applications/external/esubghz_chat/scenes/esubghz_chat_key_share_popup.c
@@ -82,7 +82,7 @@ void scene_on_enter_key_share_popup(void* context) {
     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_51x64);
+    popup_set_icon(state->nfc_popup, 4, 6, &I_NFC_dolphin_emulation_47x61);
     popup_set_text(state->nfc_popup, "Sharing\nKey via\nNFC", 90, 28, AlignCenter, AlignTop);
 
     prepare_nfc_dev_data(state);

diff --git a/applications/external/hc11_wireless_modem/common.h b/applications/external/hc11_wireless_modem/common.h
@@ -16,7 +16,7 @@
 #include "hc11_radio_comm.h"
 
 /*** Defines ***/
-#define VERSION "0.1"
+#define VERSION FAP_VERSION
 #define TAG "hc11_modem"
 
 #define CONFIG_FILE "hc11_modem.save"

diff --git a/applications/external/lasercat/application.fam b/applications/external/lasercat/application.fam
@@ -9,6 +9,6 @@ App(
     fap_category="GPIO",
     fap_author="DroWez",
     fap_weburl="https://github.com/DroWez/LaserCat",
-    fap_version="1.0",
+    fap_version="1.1",
     fap_description="Application to turn on a GPIO laser.",
 )
diff --git a/applications/external/lasercat/lasercat.c b/applications/external/lasercat/lasercat.c
@@ -37,7 +37,6 @@ static void draw_callback(Canvas* canvas, void* ctx) {
 // система furi-timer будет вызывать наш определенный обратный вызов
 static void timer_callback(void* ctx) {
     furi_assert(ctx);
-    FuriMessageQueue* event_queue = ctx;
     if(keyonoff == true) {
         currentKeyPressed = "Laser > ON";
         furi_hal_gpio_write(&gpio_ext_pc3, true);

diff --git a/applications/external/meal_pager/meal_pager_i.h b/applications/external/meal_pager/meal_pager_i.h
@@ -23,8 +23,6 @@
 
 #define TAG "Meal_Pager"
 
-#define SUBGHZ_APP_EXTENSION ".sub"
-#define SUBGHZ_APP_FOLDER ANY_PATH("subghz")
 #define MEAL_PAGER_VERSION FAP_VERSION
 
 typedef struct Meal_PagerTransmit Meal_PagerTransmit;

diff --git a/applications/external/multi_counter/application.fam b/applications/external/multi_counter/application.fam
@@ -8,6 +8,6 @@ App(
     fap_icon_assets="icons",
     fap_author="JadePossible & Roro",
     fap_weburl="https://github.com/JadePossible/Flipper-Multi-Counter",
-    fap_version=(1, 0),
+    fap_version="1.1",
     fap_description="Counter App with 4 counter for tabletop games",
 )
diff --git a/applications/external/multi_counter/counter.c b/applications/external/multi_counter/counter.c
@@ -26,7 +26,7 @@ typedef struct {
     ViewPort* view_port;
     Gui* gui;
     NotificationApp* notification;
-    FuriMutex** mutex;
+    FuriMutex* mutex;
 
     bool togglelight;
     int count;

diff --git a/applications/external/pet_a_dolphin/application.fam b/applications/external/pet_a_dolphin/application.fam
@@ -8,6 +8,6 @@ App(
     fap_category="Tools",
     fap_author="EugeneSmile",
     fap_weburl="https://github.com/EugeneSmile/PetADolphin",
-    fap_version=(1, 0),
+    fap_version="1.1",
     fap_description="Flipper app to make your dolphin a little bit happier (Reset mood)",
 )
diff --git a/applications/external/pet_a_dolphin/es_app.h b/applications/external/pet_a_dolphin/es_app.h
@@ -35,7 +35,7 @@ typedef struct {
 typedef struct {
     bool run;
 
-    FuriMutex** mutex;
+    FuriMutex* mutex;
     FuriMessageQueue* queue;
     FuriTimer* timer;
 

diff --git a/applications/external/rock_paper_scissors2/application.fam b/applications/external/rock_paper_scissors2/application.fam
@@ -8,8 +8,8 @@ App(
     fap_icon_assets="assets",
     fap_icon_assets_symbol="rps",
     fap_icon="assets/fist.png",
-    fap_version="1.0",
-    fap_description="Rock Paper Scissor app",
     fap_author="benwoo1110",
     fap_weburl="https://github.com/benwoo1110/rps-FlipperZero",
+    fap_version="1.1",
+    fap_description="Rock Paper Scissor app",
 )
diff --git a/applications/external/rock_paper_scissors2/rps.h b/applications/external/rock_paper_scissors2/rps.h
@@ -33,7 +33,7 @@ typedef struct RPSApp {
     FuriMessageQueue* event_queue;
     ViewPort* view_port;
     Gui* gui;
-    FuriMutex** mutex;
+    FuriMutex* mutex;
     FuriTimer* roll_timer;
     FuriTimer* roll_complete_timer;
 

diff --git a/applications/external/rs485modbus/modbus.c b/applications/external/rs485modbus/modbus.c
@@ -609,8 +609,8 @@ static int32_t uart_worker(void* context) {
         }
     }
 
-    furi_stream_buffer_free(app->uart->rxBuff);
-    furi_stream_buffer_free(app->msgBuf);
+    // furi_stream_buffer_free(app->uart->rxBuff);
+    // furi_stream_buffer_free(app->msgBuf);
 
     return 0;
 }

diff --git a/applications/external/uhf_rfid/icons/DolphinMafia_115x62.png b/applications/external/uhf_rfid/icons/DolphinMafia_115x62.png
diff --git a/applications/external/uhf_rfid/scenes/uhf_scene_save_success.c b/applications/external/uhf_rfid/scenes/uhf_scene_save_success.c
@@ -12,7 +12,7 @@ void uhf_scene_save_success_on_enter(void* context) {
 
     // Setup view
     Popup* popup = uhf_app->popup;
-    popup_set_icon(popup, 32, 5, &I_DolphinNice_96x59);
+    popup_set_icon(popup, 13, 2, &I_DolphinMafia_115x62);
     popup_set_header(popup, "Saved!", 13, 22, AlignLeft, AlignBottom);
     popup_set_timeout(popup, 1500);
     popup_set_context(popup, uhf_app);