nrf24 scanner upd

ReadMe.md

@@ -15,8 +15,8 @@ Thank you to all the supporters!
 ## Latest Updates
 
 - Known Issues:	 `Chess`
-- Last Synced/Checked [Unleashed/xMasterX](https://github.com/DarkFlippers/unleashed-firmware), changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md): `2022-11-24 14:48 EST`
-- Last Synced/Checked [OFW](https://github.com/flipperdevices/flipperzero-firmware), changes in [commits](https://github.com/flipperdevices/flipperzero-firmware/commits/dev): `2022-11-24 14:48 EST`
+- Last Synced/Checked [Unleashed/xMasterX](https://github.com/DarkFlippers/unleashed-firmware), changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md): `2022-11-25 01:09 EST`
+- Last Synced/Checked [OFW](https://github.com/flipperdevices/flipperzero-firmware), changes in [commits](https://github.com/flipperdevices/flipperzero-firmware/commits/dev): `2022-11-25 01:09 EST`
 - Added: [Zero Tracker (By DrZZlo13)](https://github.com/DrZlo13/flipper-zero-music-tracker)
 - Updated: [DHT Temp Monitor (By quen0n)](https://github.com/quen0n/FipperZero-DHT-Monitor) `Req: DHT11/DHT22(AM2302)/AM2301`
 - Updated: [Sub-GHz Bruteforcer (By Ganapati & xMasterX)](https://github.com/derskythe/flipperzero-subbrute/tree/master)
@@ -29,6 +29,7 @@ Thank you to all the supporters!
 - Added: [NRF24 Scanner (By vad7)](https://github.com/vad7/nrf24scan)
 - Some new Mifare Possible keys for transport cards by novacard.ru [from vadrozh](https://github.com/DarkFlippers/unleashed-firmware/pull/181)
 - Animation fixes [by TalkingSasquach](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/360)
+- Updated: [NRF24 Scanner (By vad7)](https://github.com/vad7/nrf24scan)
 
 ## Install from Release
 FLASH STOCK FIRST BEFORE UPDATING TO CUSTOM FIRMWARE!

applications/plugins/nrf24scan/README.md

@@ -2,6 +2,16 @@
 
 An [NRF24](https://www.sparkfun.com/datasheets/Components/SMD/nRF24L01Pluss_Preliminary_Product_Specification_v1_0.pdf) driver for the [Flipper Zero](https://flipperzero.one/) device. The NRF24 is a popular line of 2.4GHz radio transceivers from Nordic Semiconductors. This library is not currently complete, but functional.
 
+Settings file (default addr.txt) format:<br>
+1: <Rate (0/1/2)><br>
+2: <Channel (0..125)><br>
+3: <address P0 (5 bytes in hex)><br>
+4: [address P1 (5 bytes in hex)]<br>
+5: [LSB address P2, MSB like P1]<br>
+6: [LSB address P3, MSB like P1]<br>
+7: [LSB address P4, MSB like P1]<br>
+8: [LSB address P5, MSB like P1]<br>
+<br>
 <img src="https://raw.githubusercontent.com/vad7/nrf24scan/master/Screenshot-1.png">
 <br>
 <img src="https://raw.githubusercontent.com/vad7/nrf24scan/master/Screenshot-2.png">
@@ -9,7 +19,7 @@ An [NRF24](https://www.sparkfun.com/datasheets/Components/SMD/nRF24L01Pluss_Prel
 ## PinOut from from NoComp/Frog
 <img src="https://media.discordapp.net/attachments/937479784726949900/994495234618687509/unknown.png?width=567&height=634">
 
-# Mousejack / NRF24 pinout by UberGuidoZ
+# NRF24 pinout by UberGuidoZ
 2/A7 on FZ goes to MOSI/6 on nrf24l01<br>
 3/A6 on FZ goes to MISO/7 on nrf24l01<br>
 4/A4 on FZ goes to CSN/4 on nrf24l01<br>

applications/plugins/nrf24scan/addr1.txt

@@ -1,3 +1,3 @@
 1
 120
-C8C801
+C8C8E5

applications/plugins/nrf24scan/addr_sniff.txt

@@ -1,4 +1,4 @@
 1
-1
+0
 0055
 00AA

applications/plugins/nrf24scan/lib/nrf24/nrf24.c

@@ -35,12 +35,7 @@ uint8_t nrf24_write_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t data)
     uint8_t tx[2] = {W_REGISTER | (REGISTER_MASK & reg), data};
     uint8_t rx[2] = {0};
     nrf24_spi_trx(handle, tx, rx, 2, nrf24_TIMEOUT);
-
-
-    FURI_LOG_D("NRF_WR", " #%02X=%02X", reg, data);
-
-
-
+    //FURI_LOG_D("NRF_WR", " #%02X=%02X", reg, data);
     return rx[0];
 }
 
@@ -52,13 +47,7 @@ uint8_t
     tx[0] = W_REGISTER | (REGISTER_MASK & reg);
     memcpy(&tx[1], data, size);
     nrf24_spi_trx(handle, tx, rx, size + 1, nrf24_TIMEOUT);
-
-
-
-    FURI_LOG_D("NRF_WR", " #%02X(%02X)=0x%02X%02X%02X%02X%02X", reg, size, data[0], data[1], data[2], data[3], data[4] );
-
-
-
+    //FURI_LOG_D("NRF_WR", " #%02X(%02X)=0x%02X%02X%02X%02X%02X", reg, size, data[0], data[1], data[2], data[3], data[4] );
     return rx[0];
 }
 
@@ -231,6 +220,7 @@ uint8_t
     return status;
 }
 
+// Return 0 when error
 uint8_t nrf24_txpacket(FuriHalSpiBusHandle* handle, uint8_t* payload, uint8_t size, bool ack) {
     uint8_t status = 0;
     uint8_t tx[size + 1];
@@ -247,7 +237,8 @@ uint8_t nrf24_txpacket(FuriHalSpiBusHandle* handle, uint8_t* payload, uint8_t si
     nrf24_spi_trx(handle, tx, rx, size + 1, nrf24_TIMEOUT);
     nrf24_set_tx_mode(handle);
 
-    while(!(status & (TX_DS | MAX_RT))) status = nrf24_status(handle);
+    uint32_t start_time = furi_get_tick();
+    while(!(status & (TX_DS | MAX_RT)) && furi_get_tick() - start_time < 2000UL) status = nrf24_status(handle);
 
     if(status & MAX_RT) nrf24_flush_tx(handle);
 

applications/plugins/nrf24scan/nrf24scan.h

@@ -6,6 +6,7 @@
 #include <gui/modules/submenu.h>
 #include <gui/modules/dialog_ex.h>
 #include <toolbox/stream/file_stream.h>
+#include <notification/notification_messages.h>
 
 typedef enum {
     EventTypeTick,
@@ -28,5 +29,6 @@ typedef struct {
     PluginState* plugin_state;
     ViewPort* view_port;
     Storage* storage;
+    NotificationApp* notification;
     uint8_t* log_arr;
 } Nrf24Scan;