From bda53e1325ca6b1e4a897118a1e8005a1a6746ee Mon Sep 17 00:00:00 2001 From: RogueMaster Date: Sun, 23 Apr 2023 20:56:12 -0400 Subject: [PATCH] 2x UL Upd SubBrute & All Other SubGHz --- ReadMe.md | 6 ++++-- applications/external/subbrute/subbrute.c | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index 320936d4b92..279fd3d92a4 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -31,8 +31,8 @@ This software is for experimental purposes only and is not meant for any illegal ## Latest Updates - [PATREON: Latest Release RM0423-1538-0.81.2-994045c](https://www.patreon.com/RogueMaster?filters[tag]=Latest%20Release) -- Last Synced/Checked Unleashed, changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md) and in [commits](https://github.com/DarkFlippers/unleashed-firmware/commits/dev): `2023-04-23 15:38 EST` -- Last Synced/Checked OFW, changes in [commits](https://github.com/flipperdevices/flipperzero-firmware/commits/dev): `2023-04-23 15:38 EST` +- Last Synced/Checked Unleashed, changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md) and in [commits](https://github.com/DarkFlippers/unleashed-firmware/commits/dev): `2023-04-23 20:55 EST` +- Last Synced/Checked OFW, changes in [commits](https://github.com/flipperdevices/flipperzero-firmware/commits/dev): `2023-04-23 20:55 EST` - OFW: [cubewb: updated to v1.16.0 #2595 (By hedger)](https://github.com/flipperdevices/flipperzero-firmware/pull/2595) - Updated: [Scope (By anfractuosity)](https://github.com/anfractuosity/flipperscope) to allow firmware compile - Updated: Bad USB is now a FAP again @@ -61,6 +61,8 @@ This software is for experimental purposes only and is not meant for any illegal - UL: scripts: storage: fixed exception handler for paths - UL: [RFID: More user-friendly RAW emulation (By dcaprita)](https://forum.flipperzero.one/t/electra-intercom/6368/43) - Added: [Wifi Mapping (By carvilsi)](https://github.com/carvilsi/flipper0-wifi-map/tree/main) `Req: ESP32` +- UL: SubGHz Fix external radio SPI handlers +- UL: Updated: [Sub-GHz Bruteforcer v3.5 (By Ganapati/xMasterX/derskythe)](https://github.com/derskythe/flipperzero-subbrute/tree/master) diff --git a/applications/external/subbrute/subbrute.c b/applications/external/subbrute/subbrute.c index d0ea6ad6290..c5793d9424d 100644 --- a/applications/external/subbrute/subbrute.c +++ b/applications/external/subbrute/subbrute.c @@ -185,7 +185,8 @@ int32_t subbrute_app(void* p) { // Auto switch to internal radio if external radio is not available furi_delay_ms(15); if(!furi_hal_subghz_check_radio()) { - furi_hal_subghz_set_radio_type(SubGhzRadioInternal); + furi_hal_subghz_select_radio_type(SubGhzRadioInternal); + furi_hal_subghz_init_radio_type(SubGhzRadioInternal); } furi_hal_power_suppress_charge_enter(); @@ -195,6 +196,8 @@ int32_t subbrute_app(void* p) { furi_hal_power_suppress_charge_exit(); // Disable power for External CC1101 if it was enabled and module is connected furi_hal_subghz_disable_ext_power(); + // Reinit SPI handles for internal radio / nfc + furi_hal_subghz_init_radio_type(SubGhzRadioInternal); subbrute_free(instance);