Update from apps repo, magspoof working (not nfc)

applications/external/evil_portal/evil_portal_app.c

@@ -134,6 +134,7 @@ int32_t evil_portal_app(void* p) {
         furi_hal_power_enable_otg();
         furi_delay_ms(10);
     }
+    furi_delay_ms(200);
 
     evil_portal_app->uart = evil_portal_uart_init(evil_portal_app);
 

applications/external/gpio_reader_b/application.fam

@@ -3,7 +3,6 @@ App(
     name="[GPIO] Reader (biotinker)",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="gpio_app",
-    cdefines=["APP_GPIOREADER"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=50,

applications/external/magspoof/application.fam

@@ -1,5 +1,5 @@
 App(
-    appid=".magspoof",
+    appid="magspoof",
     name="[MAG] MagSpoof",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="mag_app",

applications/external/magspoof/helpers/mag_helpers.c

@@ -68,9 +68,9 @@ void play_halfbit(bool value, MagSetting* setting) {
         //(value) ? furi_hal_nfc_ll_txrx_on() : furi_hal_nfc_ll_txrx_off();
 
         if(last_value == 2 || value != (bool)last_value) {
-            furi_hal_nfc_ll_txrx_on();
+            //furi_hal_nfc_ll_txrx_on();
             //furi_delay_us(64);
-            furi_hal_nfc_ll_txrx_off();
+            //furi_hal_nfc_ll_txrx_off();
         }
         break;
     case MagTxCC1101_434:
@@ -204,7 +204,7 @@ bool tx_init(MagSetting* setting) {
         tx_init_rfid();
         break;
     case MagTxStateNFC:
-        furi_hal_nfc_exit_sleep();
+        //furi_hal_nfc_exit_sleep();
         break;
     case MagTxCC1101_434:
         tx_init_rf(434000000);
@@ -245,8 +245,8 @@ bool tx_deinit(MagSetting* setting) {
         tx_deinit_rfid();
         break;
     case MagTxStateNFC:
-        furi_hal_nfc_ll_txrx_off();
-        furi_hal_nfc_start_sleep();
+        //furi_hal_nfc_ll_txrx_off();
+        //furi_hal_nfc_start_sleep();
         break;
     case MagTxCC1101_434:
     case MagTxCC1101_868:

applications/external/nrf24channelscanner/nrf24channelscanner.c

@@ -173,6 +173,7 @@ int32_t nrf24channelscanner_main(void* p) {
 
     //turn on 5v for some modules
     uint8_t attempts = 0;
+    bool otg_was_enabled = furi_hal_power_is_otg_enabled();
     while(!furi_hal_power_is_otg_enabled() && attempts++ < 5) {
         furi_hal_power_enable_otg();
         furi_delay_ms(10);
@@ -257,13 +258,14 @@ int32_t nrf24channelscanner_main(void* p) {
         }
     }
     nrf24_deinit();
+
+    if(furi_hal_power_is_otg_enabled() && !otg_was_enabled) {
+        furi_hal_power_disable_otg();
+    }
+
     furi_message_queue_free(event_queue);
     gui_remove_view_port(gui, view_port);
     view_port_free(view_port);
     furi_record_close(RECORD_GUI);
-    //turn off 5v
-    if(furi_hal_power_is_otg_enabled()) {
-        furi_hal_power_disable_otg();
-    }
     return 0;
 }

applications/external/protoview/app.h

@@ -19,7 +19,6 @@
 #include <lib/subghz/subghz_setting.h>
 #include <lib/subghz/registry.h>
 #include "raw_samples.h"
-
 #include "helpers/radio_device_loader.h"
 
 #define TAG "ProtoView"

applications/external/solitaire/defines.h

@@ -19,7 +19,12 @@ typedef struct {
     InputEvent input;
 } AppEvent;
 
-typedef enum { GameStateGameOver, GameStateStart, GameStatePlay, GameStateAnimate } PlayState;
+typedef enum {
+    GameStateGameOver,
+    GameStateStart,
+    GameStatePlay,
+    GameStateAnimate,
+} PlayState;
 
 typedef struct {
     uint8_t* buffer;

applications/external/swd_probe/swd_probe_app.c

@@ -5,8 +5,6 @@
 #include "jep106.h"
 #include "adi.h"
 
-#include <toolbox/path.h>
-
 #include <assets_icons.h>
 
 #define SWD_PATH EXT_PATH("apps_data/swd")
@@ -947,16 +945,19 @@ static bool swd_scriptfunc_goto(ScriptContext* ctx) {
     return true;
 }
 
+#include <toolbox/path.h>
+
 static bool swd_scriptfunc_call(ScriptContext* ctx) {
     DBGS("call");
 
     swd_script_skip_whitespace(ctx);
 
     /* fetch previous file directory */
-    char filename[MAX_FILE_LENGTH];
     FuriString* filepath = furi_string_alloc();
     path_extract_dirname(ctx->filename, filepath);
+    // strncpy(filename, ctx->filename, sizeof(filename));
 
+    char filename[MAX_FILE_LENGTH] = {};
     bool success = false;
     do {
         /* append filename */
@@ -967,7 +968,6 @@ static bool swd_scriptfunc_call(ScriptContext* ctx) {
         furi_string_cat_printf(filepath, "/%s", filename);
 
         swd_script_seek_newline(ctx);
-
         /* append extension */
         furi_string_cat_str(filepath, ".swd");
 

applications/external/totp/ui/scenes/standby/standby.c

@@ -11,4 +11,4 @@ void totp_scene_standby_render(Canvas* const canvas) {
     canvas_draw_str_aligned(canvas, 5, 10, AlignLeft, AlignTop, "CLI command");
 
     canvas_draw_str_aligned(canvas, 5, 24, AlignLeft, AlignTop, "is running now");
-}
+}

applications/external/uart_terminal/application.fam

@@ -3,11 +3,13 @@ App(
     name="[UART] UART Terminal",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="uart_terminal_app",
-    cdefines=["APP_UART_TERMINAL"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=90,
     fap_icon="uart_terminal.png",
     fap_category="GPIO",
     fap_icon_assets="assets",
+    fap_author="@cool4uma & (some fixes by @xMasterX)",
+    fap_version="1.2",
+    fap_description="Control various devices via the Flipper Zero UART interface.",
 )