New settings: Enhanced SB, Dynamic payload, CRC

README.md

@@ -2,15 +2,22 @@
 
 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>
+Settings file (default addr.txt) format:<br><br>
+
+Rate: 0/1/2 - rate in Mbps (=0.25/1/2)<br>
+Ch: 0..125 - default channel          <br>
+ESB: 0/1 (1 - Enhanced ShockBurst)    <br>
+DPL: 0/1 (1 - Dynamic Payload Length) <br>
+Payload: 1..32 (bytes)                <br>
+P0: address pipe #0 in hex (max 5 bytes, LSB last)<br>
+P1: address pipe #1 in hex (max 5 bytes, LSB last)<br>
+P2: address pipe #2, LSB in hex (1 byte)   <br>
+P3: address pipe #3, LSB in hex (1 byte)   <br>
+P4: address pipe #4, LSB in hex (1 byte)   <br>
+P5: address pipe #5, LSB in hex (1 byte)   <br>
+captured data in raw format, first byte = address # 0..5, Payload len if DPL   
+... up to MAX_LOG_RECORDS-1                                                    
+<br>
 <br>
 <img src="https://raw.githubusercontent.com/vad7/nrf24scan/master/Screenshot-1.png">
 <br>

addr.txt

@@ -1,5 +1,5 @@
-1
-120
-C8C801
-C8C802
-03
+Rate: 1
+Ch: 120
+P0: C8C801
+P1: C8C802
+P2: 03

addr1.txt

@@ -1,3 +1,3 @@
-1
-120
-C8C8E5
+Rate: 1
+Ch: 120
+P0: C8C8E5

addr_sniff.txt

@@ -1,4 +1,4 @@
-1
-0
-0055
-00AA
+Rate: 1
+Ch: 0
+P0: 0055
+P1: 00AA

lib/nrf24/nrf24.c

@@ -188,8 +188,7 @@ uint8_t nrf24_set_packetlen(FuriHalSpiBusHandle* handle, uint8_t len) {
     return status;
 }
 
-uint8_t
-    nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* packetsize, bool full) {
+uint8_t nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* packetsize, bool full) {
     uint8_t status = 0;
     uint8_t size = 0;
     uint8_t tx_pl_wid[] = {R_RX_PL_WID, 0};
@@ -206,7 +205,7 @@ uint8_t
             nrf24_spi_trx(handle, tx_pl_wid, rx_pl_wid, 2, nrf24_TIMEOUT);
             size = rx_pl_wid[1];
         }
-
+        if(size > 32) size = 32;
         tx_cmd[0] = R_RX_PAYLOAD;
         nrf24_spi_trx(handle, tx_cmd, tmp_packet, size + 1, nrf24_TIMEOUT);
         nrf24_write_reg(handle, REG_STATUS, 0x50); // clear RX_DR, MAX_RT.

nrf24scan.c

@@ -1,9 +1,9 @@
 //
 // Written by vad7, 20.11.2022.
-// ver. 1.0
+// ver. 1.1
 //
 #include "nrf24scan.h"
-
+ 
 #include <furi.h>
 #include <furi_hal.h>
 #include <gui/gui.h>
@@ -19,29 +19,46 @@
 
 #define SCAN_APP_PATH_FOLDER "/ext/nrf24scan"
 #define ADDR_FILENAME "addr.txt"	// File format (1 parameter per line): 
-									// 0.25/1/2 - rate in Mbps
-									// 0..125 - default channel
-									// address P0 in hex (5 byte, LSB last)
-									// address P1 in hex (5 byte, LSB last)
-									// address P2, LSB in hex (1 byte)
-									// address P3, LSB in hex (1 byte)
-									// address P4, LSB in hex (1 byte)
-									// address P5, LSB in hex (1 byte)
-									// captured data in raw format, first byte = addr # 0..5
-									// ... up to MAX_LOG_RECORDS
+									// Rate: 0/1/2 - rate in Mbps (=0.25/1/2)
+									// Ch: 0..125 - default channel
+									// ESB: 0/1 (1 - Enhanced ShockBurst)
+									// DPL: 0/1 (1 - Dynamic Payload Length)
+									// CRC: 0/1/2 (CRC length)
+									// Payload: 1..32 (bytes)
+									// P0: address P0 in hex (5 byte, LSB last)
+									// P1: address P1 in hex (5 byte, LSB last)
+									// P2: address P2, LSB in hex (1 byte)
+									// P3: address P3, LSB in hex (1 byte)
+									// P4: address P4, LSB in hex (1 byte)
+									// P5: address P5, LSB in hex (1 byte)
+									// captured data in raw format, first byte = address # 0..5, Payload len if DPL
+									// ... up to MAX_LOG_RECORDS-1
 #define LOG_FILENAME "log"
 #define LOG_FILEEXT	 ".txt"
 #define MAX_LOG_RECORDS	100
 #define LOG_REC_SIZE	33				// max packet size
 #define VIEW_LOG_MAX_X	22
 
+const char SettingsFld_Rate[] = "Rate:";
+const char SettingsFld_Ch[] = "Ch:";
+const char SettingsFld_ESB[] = "ESB:";
+const char SettingsFld_DPL[] = "DPL:";
+const char SettingsFld_CRC[] = "CRC:";
+const char SettingsFld_Payload[] = "Payload:";
+char SettingsFld_Addr = 'P';
+
 Nrf24Scan* APP;
 uint8_t what_doing = 0; // 0 - setup, 1 - view log
 uint8_t what_to_do = 1; // 0 - view, 1 - view & scan
 char screen_buf[64];
 char addr_file_name[32];
-uint8_t NRF_rate; 		// 0 - 250Kbps, 1 - 1Mbps, 2 - 2Mbps
-uint8_t NRF_channel;	// 0..125
+uint8_t NRF_rate = 1; 	// 0 - 250Kbps, 1 - 1Mbps, 2 - 2Mbps
+uint8_t NRF_channel = 0;// 0..125
+uint8_t NRF_ESB = 0;	// 0 - ShockBurst, 1 - Enhanced ShockBurst
+uint8_t NRF_DPL = 0;	// 1 - Dynamic Payload Length
+uint8_t NRF_CRC = 0;	// 1 - No, 1 - CRC 1byte, 2 - CRC 2byte
+uint8_t NRF_Payload = 32;// len in bytes, max 32
+
 struct {
 	uint8_t addr_P0[5];		// MSB first
 	uint8_t addr_P1[5];		// MSB first
@@ -52,6 +69,7 @@ struct {
 	uint8_t addr_len;		// 2..5
 	uint8_t addr_count;
 } addrs;
+
 int8_t log_to_file = 0;	// 0 - no, 1 - yes(new), 2 - append, -1 - only clear
 uint16_t log_arr_idx;
 uint16_t view_log_arr_idx = 0;
@@ -92,7 +110,7 @@ static uint8_t ConvertHexToArray(char * hex, uint8_t * array, uint8_t maxlen) {
 
 static void add_to_str_hex_bytes(char *out, char *arr, int bytes)
 {
-	if(!bytes) return;
+	if(bytes <= 0) return;
 	out += strlen(out);
 	do {
 		snprintf(out, 3, "%02X", *arr++);
@@ -129,8 +147,8 @@ void write_to_log_file(Storage* storage)
 {
 	if(log_arr_idx == 0) return;
 	Stream* file_stream = file_stream_alloc(storage);
-    FuriString* str = furi_string_alloc();
-    furi_string_set(str, SCAN_APP_PATH_FOLDER);
+	FuriString* str = furi_string_alloc();
+	furi_string_set(str, SCAN_APP_PATH_FOLDER);
 	furi_string_cat(str, "/");
 	furi_string_cat(str, LOG_FILENAME);
 	furi_string_cat(str, LOG_FILEEXT);
@@ -140,7 +158,8 @@ void write_to_log_file(Storage* storage)
 		do {
 			fl = file_stream_open(file_stream, furi_string_get_cstr(str), FSAM_READ_WRITE, FSOM_CREATE_NEW);
 			if(fl) break;
-    		furi_string_set(str, SCAN_APP_PATH_FOLDER);
+			file_stream_close(file_stream);
+			furi_string_set(str, SCAN_APP_PATH_FOLDER);
 			furi_string_cat(str, "/");
 			furi_string_cat(str, LOG_FILENAME);
 			furi_string_cat_printf(str, "-%02d", cnt);
@@ -152,18 +171,22 @@ void write_to_log_file(Storage* storage)
 		}
 	} else {
 		fl = file_stream_open(file_stream, furi_string_get_cstr(str), FSAM_READ_WRITE, FSOM_OPEN_APPEND);
-		if(stream_size(file_stream) == 0) save_to_new_log = true;
+		if(fl) {
+			if(stream_size(file_stream) == 0) save_to_new_log = true;
+		} else file_stream_close(file_stream);
 	}
 	if(fl) {
 		FURI_LOG_D(TAG, "Save to log %s", furi_string_get_cstr(str));
 		if(save_to_new_log) {
-			furi_string_printf(str, "%d\n%d\n", NRF_rate, NRF_channel);
+			furi_string_printf(str, "%s %d\n%s %d\n%s %d\n", SettingsFld_Rate, NRF_rate, SettingsFld_Ch, NRF_channel, SettingsFld_ESB, NRF_ESB);
+			furi_string_cat_printf(str, "%s %d\n%s %d\n%s %d\n", SettingsFld_DPL, NRF_DPL, SettingsFld_CRC, NRF_CRC, SettingsFld_Payload, NRF_Payload);
+			furi_string_cat_printf(str, "P0: ");
 			add_to_furi_str_hex_bytes(str, (char*)addrs.addr_P0, addrs.addr_len); furi_string_cat(str, "\n");
-			if(addrs.addr_count > 1) { add_to_furi_str_hex_bytes(str, (char*)addrs.addr_P1, addrs.addr_len); furi_string_cat(str, "\n"); }
-			if(addrs.addr_count > 2) furi_string_cat_printf(str, "%02X\n", addrs.addr_P2);
-			if(addrs.addr_count > 3) furi_string_cat_printf(str, "%02X\n", addrs.addr_P3);
-			if(addrs.addr_count > 4) furi_string_cat_printf(str, "%02X\n", addrs.addr_P4);
-			if(addrs.addr_count > 5) furi_string_cat_printf(str, "%02X\n", addrs.addr_P5);
+			if(addrs.addr_count > 1) { furi_string_cat_printf(str, "P1: "); add_to_furi_str_hex_bytes(str, (char*)addrs.addr_P1, addrs.addr_len); furi_string_cat(str, "\n"); }
+			if(addrs.addr_count > 2) { furi_string_cat_printf(str, "P2: "); furi_string_cat_printf(str, "%02X\n", addrs.addr_P2); }
+			if(addrs.addr_count > 3) { furi_string_cat_printf(str, "P3: "); furi_string_cat_printf(str, "%02X\n", addrs.addr_P3); }
+			if(addrs.addr_count > 4) { furi_string_cat_printf(str, "P4: "); furi_string_cat_printf(str, "%02X\n", addrs.addr_P4); }
+			if(addrs.addr_count > 5) { furi_string_cat_printf(str, "P5: "); furi_string_cat_printf(str, "%02X\n", addrs.addr_P5); }
 			if(!(fl = stream_write_string(file_stream, str) == furi_string_size(str))) {
 				FURI_LOG_E(TAG, "Failed to write header to log!");
 				notification_message(APP->notification, &sequence_blink_red_100);
@@ -186,48 +209,48 @@ void write_to_log_file(Storage* storage)
 			}
 		}
 		save_to_new_log = false;
+		file_stream_close(file_stream);
 	} else {
 		FURI_LOG_E(TAG, "Failed to open log file");
 		notification_message(APP->notification, &sequence_blink_red_100);
 	}
-	//file_stream_close(file_stream);
 	stream_free(file_stream);
 	furi_string_free(str);
 }
 
 static bool select_settings_file(Stream* stream) {
-    DialogsApp* dialogs = furi_record_open("dialogs");
-    bool result = false;
-    FuriString* path;
-    path = furi_string_alloc();
-    furi_string_set(path, SCAN_APP_PATH_FOLDER);
-
-    DialogsFileBrowserOptions browser_options;
-    dialog_file_browser_set_basic_options(&browser_options, ".txt", NULL);
-    browser_options.hide_ext = false;
-
-    bool ret = dialog_file_browser_show(dialogs, path, path, &browser_options);
-
-    furi_record_close("dialogs");
-    if(ret) {
-        if(!file_stream_open(stream, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
-			//file_stream_close(stream);
-            FURI_LOG_D(TAG, "Cannot open file \"%s\"", furi_string_get_cstr(path));
-        } else {
+	DialogsApp* dialogs = furi_record_open("dialogs");
+	bool result = false;
+	FuriString* path;
+	path = furi_string_alloc();
+	furi_string_set(path, SCAN_APP_PATH_FOLDER);
+
+	DialogsFileBrowserOptions browser_options;
+	dialog_file_browser_set_basic_options(&browser_options, ".txt", NULL);
+	browser_options.hide_ext = false;
+
+	bool ret = dialog_file_browser_show(dialogs, path, path, &browser_options);
+
+	furi_record_close("dialogs");
+	if(ret) {
+		if(!file_stream_open(stream, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
+			FURI_LOG_D(TAG, "Cannot open file \"%s\"", furi_string_get_cstr(path));
+			file_stream_close(stream);
+		} else {
 			FURI_LOG_D(TAG, "Open file \"%s\"", furi_string_get_cstr(path));
 			strncpy(addr_file_name, furi_string_get_cstr(path) + sizeof(SCAN_APP_PATH_FOLDER), sizeof(addr_file_name));
-            result = true;
-        }
-    }
-    furi_string_free(path);
-    return result;
+			result = true;
+		}
+	}
+	furi_string_free(path);
+	return result;
 }
 
 // True - success
 static bool load_settings_file(Stream* file_stream) {
-    size_t file_size = 0;
-    char* file_buf;
-    bool loaded = false;
+	size_t file_size = 0;
+	char* file_buf;
+	bool loaded = false;
 	file_size = stream_size(file_stream);
 	if(file_size == (size_t)0) {
 		FURI_LOG_D(TAG, "load failed. file_size: %d", file_size);
@@ -254,7 +277,50 @@ static bool load_settings_file(Stream* file_stream) {
 				*(end_ptr - 1) = '\0';
 				line_len--;
 			}
-			if(line_len >= LOG_REC_SIZE * 2) { // data
+			if(strcmp(line_ptr, SettingsFld_Rate) == 0) {
+				NRF_rate = atoi(line_ptr + sizeof(SettingsFld_Rate));
+			} else if(strcmp(line_ptr, SettingsFld_Ch) == 0) {
+				NRF_channel = atoi(line_ptr + sizeof(SettingsFld_Ch));
+			} else if(strcmp(line_ptr, SettingsFld_ESB) == 0) {
+				NRF_ESB = atoi(line_ptr + sizeof(SettingsFld_ESB));
+			} else if(strcmp(line_ptr, SettingsFld_DPL) == 0) {
+				NRF_DPL = atoi(line_ptr + sizeof(SettingsFld_DPL));
+			} else if(strcmp(line_ptr, SettingsFld_CRC) == 0) {
+				NRF_CRC = atoi(line_ptr + sizeof(SettingsFld_CRC));
+			} else if(strcmp(line_ptr, SettingsFld_Payload) == 0) {
+				NRF_Payload = atoi(line_ptr + sizeof(SettingsFld_Payload));
+				if(NRF_Payload == 0 || NRF_Payload > 32) NRF_Payload = 32;
+			} else if(*line_ptr == SettingsFld_Addr) {
+				char a = *(++line_ptr);
+				line_ptr += 3;
+				switch(a) {
+					case '0':
+						addrs.addr_len = ConvertHexToArray(line_ptr, addrs.addr_P0, 5);
+						FURI_LOG_D(TAG, " +Addr(%d): %02X%02X%02X...", addrs.addr_len, addrs.addr_P0[0], addrs.addr_P0[1], addrs.addr_P0[2]);
+						loaded = true;
+						break;
+					case '1':
+						ConvertHexToArray(line_ptr, addrs.addr_P1, 5);
+						FURI_LOG_D(TAG, " +Addr: %02X%02X%02X...", addrs.addr_P0[1], addrs.addr_P1[1], addrs.addr_P1[2]);
+						break;
+					case '2':
+						ConvertHexToArray(line_ptr, &addrs.addr_P2, 1);
+						break;
+					case '3':
+						ConvertHexToArray(line_ptr, &addrs.addr_P3, 1);
+						break;
+					case '4':
+						ConvertHexToArray(line_ptr, &addrs.addr_P4, 1);
+						break;
+					case '5':
+						ConvertHexToArray(line_ptr, &addrs.addr_P5, 1);
+						break;
+					default:
+						a = 0;
+						break;
+				}
+				if(a) addrs.addr_count = a - '0' + 1;
+			} else if(line_len >= LOG_REC_SIZE * 2) { // data
 				if(!log_loaded) {
 					clear_log();
 					what_to_do = 0;
@@ -264,23 +330,6 @@ static bool load_settings_file(Stream* file_stream) {
 					ConvertHexToArray(line_ptr, APP->log_arr + log_arr_idx * LOG_REC_SIZE, LOG_REC_SIZE);
 					log_arr_idx++;
 				}
-			} else if(addrs.addr_count) {
-				ConvertHexToArray(line_ptr, addrs.addr_count==1? &addrs.addr_P1[0] : addrs.addr_count==2? &addrs.addr_P2 : addrs.addr_count==3? &addrs.addr_P3 : addrs.addr_count==4? &addrs.addr_P4: &addrs.addr_P5, addrs.addr_count==1? 5 : 1);
-				FURI_LOG_D(TAG, " +Addr_LSB: %s", line_ptr);
-				if(++addrs.addr_count == MAX_ADDR) break;
-			} else if(line_len < 4) { // Rate or Channel
-				if(line_num == 0) { // 1st line - Rate
-					NRF_rate = atoi(line_ptr);
-					FURI_LOG_D(TAG, " Rate: %d", NRF_rate);
-				} else if(line_num == 1) { // second line - Channel
-					NRF_channel = atoi(line_ptr);
-					FURI_LOG_D(TAG, " Ch: %d", NRF_channel);
-				}
-			} else if(line_len <= 5*2){ // addresses
-				addrs.addr_len = ConvertHexToArray(line_ptr, addrs.addr_P0, 5);
-				FURI_LOG_D(TAG, " +Addr(%d): %02X%02X%02X...", addrs.addr_len, addrs.addr_P0[0], addrs.addr_P0[1], addrs.addr_P0[2]);
-				loaded = true;
-				if(++addrs.addr_count == MAX_ADDR) break;
 			}
 			line_ptr = end_ptr + 1;
 			line_num++;
@@ -289,7 +338,7 @@ static bool load_settings_file(Stream* file_stream) {
 		FURI_LOG_D(TAG, "load failed. file size: %d", file_size);
 	}
 	free(file_buf);
-    return loaded;
+	return loaded;
 }
 
 static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
@@ -303,39 +352,40 @@ static void prepare_nrf24()
 	uint8_t addr[5];
 	uint8_t erx_addr = (1<<0); // Enable RX_P0
 	if(addrs.addr_count == 0) return;
-	nrf24_write_reg(nrf24_HANDLE, REG_CONFIG, 0x00); // Stop nRF
+	nrf24_write_reg(nrf24_HANDLE, REG_CONFIG, NRF_CRC == 1 ? 0b10100 : NRF_CRC == 1 ? 0b11000 : 0);
 	nrf24_write_reg(nrf24_HANDLE, REG_STATUS, 0x70); // clear interrupts
-	nrf24_write_reg(nrf24_HANDLE, REG_DYNPD, 0x0); // disable shockburst
-	nrf24_write_reg(nrf24_HANDLE, REG_EN_AA, 0x00); // Disable Shockburst
-	nrf24_write_reg(nrf24_HANDLE, REG_FEATURE, 0x01); // Enables the W_TX_PAYLOAD_NOACK command, Disable Payload with ACK, Disable Dynamic Payload Length
+	nrf24_write_reg(nrf24_HANDLE, REG_SETUP_RETR, NRF_ESB ? 1 : 0); // Disable Automatic Retransmission
+	nrf24_write_reg(nrf24_HANDLE, REG_DYNPD, NRF_DPL ? 0x3F : 0); // Enable dynamic payload reg
+	nrf24_write_reg(nrf24_HANDLE, REG_EN_AA, 0); // Auto acknowledgement
+	nrf24_write_reg(nrf24_HANDLE, REG_FEATURE, 1 + (NRF_DPL || NRF_ESB ? 4 : 0)); // Enables the W_TX_PAYLOAD_NOACK command, Disable Payload with ACK, set Dynamic Payload
 	nrf24_set_maclen(nrf24_HANDLE, addrs.addr_len);
 	for(int i = 0; i < addrs.addr_len; i++) addr[i] = addrs.addr_P0[addrs.addr_len - i - 1];
-    nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P0, &addr[0], addrs.addr_len);
-	nrf24_write_reg(nrf24_HANDLE, RX_PW_P0, 32);
+	nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P0, &addr[0], addrs.addr_len);
+	nrf24_write_reg(nrf24_HANDLE, RX_PW_P0, NRF_Payload);
 	if(addrs.addr_count > 1) {
 		for(int i = 0; i < addrs.addr_len; i++) addr[i] = addrs.addr_P1[addrs.addr_len - i - 1];
 		nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P1, &addr[0], addrs.addr_len);
-		nrf24_write_reg(nrf24_HANDLE, RX_PW_P1, 32);
+		nrf24_write_reg(nrf24_HANDLE, RX_PW_P1, NRF_Payload);
 		erx_addr |= (1<<1); // Enable RX_P1
 	} else nrf24_write_reg(nrf24_HANDLE, RX_PW_P1, 0);
 	if(addrs.addr_count > 2) {
 		nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P2, &addrs.addr_P2, 1);
-		nrf24_write_reg(nrf24_HANDLE, RX_PW_P2, 32);
+		nrf24_write_reg(nrf24_HANDLE, RX_PW_P2, NRF_Payload);
 		erx_addr |= (1<<2); // Enable RX_P2
 	} else nrf24_write_reg(nrf24_HANDLE, RX_PW_P2, 0);
 	if(addrs.addr_count > 3) {
 		nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P3, &addrs.addr_P3, 1);
-		nrf24_write_reg(nrf24_HANDLE, RX_PW_P3, 32);
+		nrf24_write_reg(nrf24_HANDLE, RX_PW_P3, NRF_Payload);
 		erx_addr |= (1<<3); // Enable RX_P3
 	} else nrf24_write_reg(nrf24_HANDLE, RX_PW_P3, 0);
 	if(addrs.addr_count > 4) {
 		nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P4, &addrs.addr_P4, 1);
-		nrf24_write_reg(nrf24_HANDLE, RX_PW_P4, 32);
+		nrf24_write_reg(nrf24_HANDLE, RX_PW_P4, NRF_Payload);
 		erx_addr |= (1<<4); // Enable RX_P4
 	} else nrf24_write_reg(nrf24_HANDLE, RX_PW_P4, 0);
 	if(addrs.addr_count > 5) {
 		nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P5, &addrs.addr_P5, 1);
-		nrf24_write_reg(nrf24_HANDLE, RX_PW_P5, 32);
+		nrf24_write_reg(nrf24_HANDLE, RX_PW_P5, NRF_Payload);
 		erx_addr |= (1<<5); // Enable RX_P5
 	} else nrf24_write_reg(nrf24_HANDLE, RX_PW_P5, 0);
 	nrf24_write_reg(nrf24_HANDLE, REG_STATUS, 0x50); // clear RX_DR, MAX_RT.
@@ -363,13 +413,13 @@ static void start_scanning()
 
 bool nrf24_read_newpacket() {
 	if(APP->log_arr == NULL) return false;
-    bool found = false;
-    uint8_t packetsize;
+	bool found = false;
+	uint8_t packetsize;
 	uint8_t packet[32] = {0};
-    uint8_t status = nrf24_rxpacket(nrf24_HANDLE, packet, &packetsize, true);
-    if(status & 0x40) {
+	uint8_t status = nrf24_rxpacket(nrf24_HANDLE, packet, &packetsize, !NRF_DPL);
+	if(status & 0x40) {
 		uint8_t *ptr = APP->log_arr + log_arr_idx * LOG_REC_SIZE;
-		*ptr++ = (status >> 1) & 7; // pipe #
+		*ptr++ = ((packetsize & 0x1F) << 3) | ((status >> 1) & 7); // payload size + pipe #
 		memcpy(ptr, packet, packetsize);
 		if(packetsize < 32) memset(ptr + packetsize, 0, 32 - packetsize);
 		if(log_arr_idx < MAX_LOG_RECORDS - 1) {
@@ -379,13 +429,13 @@ bool nrf24_read_newpacket() {
 				write_to_log_file(APP->storage);
 				clear_log();
 			} else {
-				memcpy((void*)APP->log_arr, (void*)APP->log_arr + LOG_REC_SIZE, log_arr_idx * LOG_REC_SIZE);
+				memmove(APP->log_arr, APP->log_arr + LOG_REC_SIZE, log_arr_idx * LOG_REC_SIZE);
 			}
 		}
 		FURI_LOG_D(TAG, "Found packet #%d pipe %d", log_arr_idx, (status >> 1) & 7);
 		notification_message(APP->notification, &sequence_blink_white_100);
-        found = true;
-    }
+		found = true;
+	}
 	return found;
 }
 
@@ -408,10 +458,21 @@ static void render_callback(Canvas* const canvas, void* ctx) {
 		canvas_set_font(canvas, FontSecondary); // 8x10 font
 		snprintf(screen_buf, sizeof(screen_buf), "Settings: %s", addr_file_name); 										// menu_selected = 0
 		canvas_draw_str(canvas, 10, 10, screen_buf);
-		snprintf(screen_buf, sizeof(screen_buf), "Channel: %d", NRF_channel); 											// menu_selected = 1
+		snprintf(screen_buf, sizeof(screen_buf), "Ch: %d", NRF_channel); 												// menu_selected = 1
 		canvas_draw_str(canvas, 10, 20, screen_buf);
+		if(NRF_ESB) {
+			strcpy(screen_buf, "ESB");
+			if(NRF_DPL) strcat(screen_buf, " DPL");
+			canvas_draw_str(canvas, 80, 20, screen_buf);
+		}
 		snprintf(screen_buf, sizeof(screen_buf), "Rate: %sbps",  NRF_rate == 2 ? "2M" : NRF_rate == 1 ? "1M" : "250K");	// menu_selected = 2
 		canvas_draw_str(canvas, 10, 30, screen_buf);
+		canvas_set_font(canvas, FontBatteryPercent);
+		snprintf(screen_buf, sizeof(screen_buf), "R:%d", NRF_Payload);
+		canvas_draw_str(canvas, 80, 30, screen_buf);
+		if(NRF_CRC == 1) canvas_draw_str(canvas, 105, 30, "CRC1");
+		else if(NRF_CRC == 2) canvas_draw_str(canvas, 105, 30, "CRC2");
+		canvas_set_font(canvas, FontSecondary);
 		strcpy(screen_buf, "Find channel period: ");																	// menu_selected = 3
 		if(find_channel_period == 0) strcat(screen_buf, "off"); else snprintf(screen_buf + strlen(screen_buf), sizeof(screen_buf), "%d s", find_channel_period);
 		canvas_draw_str(canvas, 10, 40, screen_buf);
@@ -433,17 +494,27 @@ static void render_callback(Canvas* const canvas, void* ctx) {
 		canvas_draw_str(canvas, 0, 7, screen_buf);
 		if(ch2) canvas_draw_str(canvas, 121, 7, ">");
 		if(log_arr_idx) {
+			if(view_log_arr_idx >= log_arr_idx) view_log_arr_idx = log_arr_idx - 1;
 			uint16_t page = view_log_arr_idx & ~7;
 			for(uint8_t i = 0; i < 8 && page + i < log_arr_idx; i++) {
 				snprintf(screen_buf, sizeof(screen_buf), "%d:%c", page + i + 1, (view_log_arr_idx & 7) != i ? ' ' : last_packet_send != view_log_arr_idx ? '>' : last_packet_send_st ? '+' : '!');
-				char *ptr = (char*)APP->log_arr + (page + i) * LOG_REC_SIZE + view_log_arr_x;
-				if(view_log_arr_x == 0 && addrs.addr_count > 1) {
-					snprintf(screen_buf + strlen(screen_buf), sizeof(screen_buf), "%d-", *ptr + 1);
-					add_to_str_hex_bytes(screen_buf, ptr + 1, 9);
-				} else {
-					add_to_str_hex_bytes(screen_buf, ptr + 1, 10);
+				char *ptr = (char*)APP->log_arr + (page + i) * LOG_REC_SIZE;
+				uint8_t dpl = *ptr++;
+				uint8_t pipe = dpl & 7;
+				dpl >>= 3;
+				if(dpl == 0) dpl = 32;
+				int count = dpl - view_log_arr_x;
+				if(count < 10) count = dpl; else count = 10;
+				ptr += view_log_arr_x;
+				if(count > 0) {
+					if(view_log_arr_x == 0 && addrs.addr_count > 1) {
+						snprintf(screen_buf + strlen(screen_buf), sizeof(screen_buf), "%d-", pipe);
+						add_to_str_hex_bytes(screen_buf, ptr, count - 1);
+					} else {
+						add_to_str_hex_bytes(screen_buf, ptr, count);
+					}
+					canvas_draw_str(canvas, 0, 14 + i * 7, screen_buf);
 				}
-				canvas_draw_str(canvas, 0, 14 + i * 7, screen_buf);
 			}
 		}
 	}
@@ -477,11 +548,11 @@ int32_t nrf24scan_app(void* p) {
 	APP->storage = furi_record_open(RECORD_STORAGE);
 	storage_common_mkdir(APP->storage, SCAN_APP_PATH_FOLDER);
 	Stream* file_stream = file_stream_alloc(APP->storage);
-    FuriString* path = furi_string_alloc();
-    furi_string_set(path, SCAN_APP_PATH_FOLDER);
+	FuriString* path = furi_string_alloc();
+	furi_string_set(path, SCAN_APP_PATH_FOLDER);
 	furi_string_cat(path, "/");
 	furi_string_cat(path, ADDR_FILENAME);
-    if(file_stream_open(file_stream, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
+	if(file_stream_open(file_stream, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
 		if(load_settings_file(file_stream)) strcpy(addr_file_name, ADDR_FILENAME); else strcpy(addr_file_name, "LOAD ERROR");
 	} else {
 		strcpy(addr_file_name, "NONE");
@@ -556,8 +627,8 @@ int32_t nrf24scan_app(void* p) {
 									if(NRF_channel > MAX_CHANNEL) NRF_channel = MAX_CHANNEL;
 									break;
 								case Menu_enter_rate:
-									NRF_rate--;
-									if(NRF_rate > 2) NRF_rate = 2;
+									NRF_Payload -= event.input.type == InputTypeRepeat ? 10 : 1;
+									if(NRF_Payload > 32) NRF_Payload = 32;
 									break;
 								case Menu_enter_scan_period:
 									find_channel_period -= event.input.type == InputTypeRepeat ? 10 : 1;
@@ -578,27 +649,38 @@ int32_t nrf24scan_app(void* p) {
 				case InputKeyOk:
 					if(event.input.type == InputTypePress) {
 						if(what_doing == 0) {
-							if(menu_selected == Menu_open_file) { // File
-								file_stream = file_stream_alloc(APP->storage);
-								if(select_settings_file(file_stream)) {
-									if(load_settings_file(file_stream)) save_to_new_log = true; else strcpy(addr_file_name, "LOAD ERROR");
-									//file_stream_close(file_stream);
-								}
-								stream_free(file_stream);
-							} else if(menu_selected == Menu_ok) { // Ok
-								what_doing = !what_doing;
-								if(what_doing) {
-									if(what_to_do) {
-										if(addrs.addr_count == 0) what_doing = 0;
-										else {
-											if(log_to_file == -1) {
-												clear_log();
-												save_to_new_log = true;
-											} else if(log_to_file == 1) save_to_new_log = true;
-											start_scanning(); 
-										}
+							switch(menu_selected) {
+								case Menu_open_file:
+									file_stream = file_stream_alloc(APP->storage);
+									if(select_settings_file(file_stream)) {
+										if(load_settings_file(file_stream)) save_to_new_log = true; else strcpy(addr_file_name, "LOAD ERROR");
+										file_stream_close(file_stream);
 									}
-								} else nrf24_set_idle(nrf24_HANDLE);
+									stream_free(file_stream);
+									break;
+								case Menu_enter_channel:
+									if(NRF_ESB) {
+										if(NRF_DPL) NRF_DPL = NRF_ESB = 0; else NRF_DPL = 1;
+									} else NRF_ESB = 1;
+									break;
+								case Menu_enter_rate:
+									if(++NRF_CRC > 2) NRF_CRC = 0;
+									break;
+								case Menu_ok:
+									what_doing = !what_doing;
+									if(what_doing) {
+										if(what_to_do) {
+											if(addrs.addr_count == 0) what_doing = 0;
+											else {
+												if(log_to_file == -1) {
+													clear_log();
+													save_to_new_log = true;
+												} else if(log_to_file == 1) save_to_new_log = true;
+												start_scanning(); 
+											}
+										}
+									} else nrf24_set_idle(nrf24_HANDLE);
+									break;
 							}
 						} else { // Send
 							nrf24_send_packet();
@@ -624,7 +706,6 @@ int32_t nrf24scan_app(void* p) {
 				}
 			}
 		}
-
 		if(what_to_do) {
 			nrf24_read_newpacket();
 			if(find_channel_period && furi_get_tick() - start_time >= (uint32_t)find_channel_period * 1000UL) {