diff --git a/ReadMe.md b/ReadMe.md index 751e13df2..bfb6983bd 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -31,6 +31,7 @@ Thank you to all the supporters! - Fixed passport to show more data for EXP - Added: [Mifare dictionary attack performance improvements. #2173 (By nezza)](https://github.com/flipperdevices/flipperzero-firmware/pull/2173) - [New PAXGOD Build: Unlocked, 1 New Custom PaxGod animation and non-anime/RM animations from Minimal, and Mountains Passport Theme (from Kuranons) on PATREON](https://www.patreon.com/posts/76225261) - Custom FW Builds available for [PATREON subscribers](https://www.patreon.com/RogueMaster/membership) +- Updated: [NRF24 Scanner v2.1 (By vad7)](https://github.com/vad7/nrf24scan) ## Install from Release FLASH STOCK FIRST BEFORE UPDATING TO CUSTOM FIRMWARE! diff --git a/applications/plugins/nrf24scan/nrf24scan.c b/applications/plugins/nrf24scan/nrf24scan.c index a206c1e9c..da0093e8d 100644 --- a/applications/plugins/nrf24scan/nrf24scan.c +++ b/applications/plugins/nrf24scan/nrf24scan.c @@ -501,7 +501,7 @@ static void prepare_nrf24(bool fsend_packet) { if((*(p - 2) & 0x80) && (*(p - 1) & 0b11) + 2 == addr_size && rec + 2 != p) { if(memcmp(p, addrs.addr_P0, addr_size - 1) == 0) { - check_add_addr(rec + 2); + check_add_addr(p); if(addrs.addr_count >= 6) break; } } diff --git a/assets/resources/apps_data/nrf24scan/sniff.txt b/assets/resources/apps_data/nrf24scan/sniff.txt index 99a3c095d..fa8c5ba9f 100644 --- a/assets/resources/apps_data/nrf24scan/sniff.txt +++ b/assets/resources/apps_data/nrf24scan/sniff.txt @@ -1,5 +1,5 @@ SNIFF ESB: 1 -DPL: 0 CRC: 2 -P0: 0055 +P0: 00AA +P1: 0055 diff --git a/assets/resources/apps_data/nrf24scan/sniff2.txt b/assets/resources/apps_data/nrf24scan/sniff2.txt deleted file mode 100644 index fa8c5ba9f..000000000 --- a/assets/resources/apps_data/nrf24scan/sniff2.txt +++ /dev/null @@ -1,5 +0,0 @@ -SNIFF -ESB: 1 -CRC: 2 -P0: 00AA -P1: 0055 diff --git a/assets/resources/apps_data/nrf24scan/sniff3.txt b/assets/resources/apps_data/nrf24scan/sniff3.txt deleted file mode 100644 index 675852f2d..000000000 --- a/assets/resources/apps_data/nrf24scan/sniff3.txt +++ /dev/null @@ -1,6 +0,0 @@ -SNIFF -ESB: 1 -CRC: 2 -P0: FFAA -P1: 0055 -P2: AA