From 8096391c6c8040f0079ce4371e89fbc5bb51581a Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Tue, 14 Nov 2023 23:49:52 +0000 Subject: [PATCH] Update from apps repo, magspoof working (not nfc) --- applications/external/evil_portal/evil_portal_app.c | 1 + applications/external/gpio_reader_b/application.fam | 1 - applications/external/magspoof/application.fam | 2 +- applications/external/magspoof/helpers/mag_helpers.c | 10 +++++----- .../external/nrf24channelscanner/nrf24channelscanner.c | 10 ++++++---- applications/external/protoview/app.h | 1 - applications/external/solitaire/defines.h | 7 ++++++- applications/external/swd_probe/swd_probe_app.c | 8 ++++---- applications/external/totp/ui/scenes/standby/standby.c | 2 +- applications/external/uart_terminal/application.fam | 4 +++- 10 files changed, 27 insertions(+), 19 deletions(-) diff --git a/applications/external/evil_portal/evil_portal_app.c b/applications/external/evil_portal/evil_portal_app.c index 0a47e1697..29d68e603 100644 --- a/applications/external/evil_portal/evil_portal_app.c +++ b/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); diff --git a/applications/external/gpio_reader_b/application.fam b/applications/external/gpio_reader_b/application.fam index c3a417774..557bd4b99 100644 --- a/applications/external/gpio_reader_b/application.fam +++ b/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, diff --git a/applications/external/magspoof/application.fam b/applications/external/magspoof/application.fam index 7795a2532..6044ec4e3 100644 --- a/applications/external/magspoof/application.fam +++ b/applications/external/magspoof/application.fam @@ -1,5 +1,5 @@ App( - appid=".magspoof", + appid="magspoof", name="[MAG] MagSpoof", apptype=FlipperAppType.EXTERNAL, entry_point="mag_app", diff --git a/applications/external/magspoof/helpers/mag_helpers.c b/applications/external/magspoof/helpers/mag_helpers.c index 89c451f62..a29777535 100644 --- a/applications/external/magspoof/helpers/mag_helpers.c +++ b/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: diff --git a/applications/external/nrf24channelscanner/nrf24channelscanner.c b/applications/external/nrf24channelscanner/nrf24channelscanner.c index 5f7f7e42f..ac9665718 100644 --- a/applications/external/nrf24channelscanner/nrf24channelscanner.c +++ b/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; } \ No newline at end of file diff --git a/applications/external/protoview/app.h b/applications/external/protoview/app.h index e142fa1d4..5fb0adf34 100644 --- a/applications/external/protoview/app.h +++ b/applications/external/protoview/app.h @@ -19,7 +19,6 @@ #include #include #include "raw_samples.h" - #include "helpers/radio_device_loader.h" #define TAG "ProtoView" diff --git a/applications/external/solitaire/defines.h b/applications/external/solitaire/defines.h index a225b7c83..80cfaa118 100644 --- a/applications/external/solitaire/defines.h +++ b/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; diff --git a/applications/external/swd_probe/swd_probe_app.c b/applications/external/swd_probe/swd_probe_app.c index 4bf655e6e..68be295b4 100644 --- a/applications/external/swd_probe/swd_probe_app.c +++ b/applications/external/swd_probe/swd_probe_app.c @@ -5,8 +5,6 @@ #include "jep106.h" #include "adi.h" -#include - #include #define SWD_PATH EXT_PATH("apps_data/swd") @@ -947,16 +945,19 @@ static bool swd_scriptfunc_goto(ScriptContext* ctx) { return true; } +#include + 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"); diff --git a/applications/external/totp/ui/scenes/standby/standby.c b/applications/external/totp/ui/scenes/standby/standby.c index aa17304d3..1f9f21e22 100644 --- a/applications/external/totp/ui/scenes/standby/standby.c +++ b/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"); -} +} \ No newline at end of file diff --git a/applications/external/uart_terminal/application.fam b/applications/external/uart_terminal/application.fam index a627041ef..358869c3a 100644 --- a/applications/external/uart_terminal/application.fam +++ b/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.", )