Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-15 20:01:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev

Browse Source
This commit is contained in:
VerstreuteSeele
2022-12-20 20:39:35 +01:00
parent 1277968c87 22a61e0e2d
commit 6136e386bd
2 changed files with 124 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/plugins/nrf24scan/nrf24scan.c
+120 -69
View File
@@ -40,7 +40,8 @@
#define SNIFF_FILENAME "sniff.txt" // settings for sniff mode
#define LOG_FILENAME "log"
#define LOG_FILEEXT ".txt"
#define MAX_LOG_RECORDS 100
#define MAX_LOG_RECORDS 200
#define MAX_FOUND_RECORDS 100
#define LOG_REC_SIZE 34 // max packet size
#define VIEW_LOG_MAX_X 22
#define VIEW_LOG_WIDTH_B 10 // bytes
@@ -58,7 +59,6 @@ Nrf24Scan* APP;
uint8_t what_doing = 0; // 0 - setup, 1 - view log, 2 - view addresses
uint8_t what_to_do =
1; // 0 - view, 1 - view & sniff, 2 - view & read, 3 - view & read selected addr
uint32_t key_press_seq_ok = 0;
uint8_t save_settings = 0;
char screen_buf[64];
char addr_file_name[32];
@@ -87,7 +87,7 @@ struct ADDRS addrs;
struct ADDRS addrs_sniff;
bool sniff_loaded = 0;
int16_t found_total;
int16_t view_found = 0;
int16_t view_found = -1;
int8_t log_to_file = 0; // 0 - no, 1 - yes(new), 2 - append, -1 - only clear
uint16_t log_arr_idx;
@@ -461,9 +461,9 @@ static void prepare_nrf24(bool fsend_packet) {
uint8_t erx_addr = (1 << 0); // Enable RX_P0
struct ADDRS* adr = what_to_do == 1 ? &addrs_sniff : &addrs;
if(!fsend_packet) {
if(adr->addr_count == 0) return;
uint8_t payload = NRF_Payload;
if(what_to_do == 1) { // SNIFF
if(adr->addr_count == 0) return;
//payload += 5 + NRF_CRC; // + addr_max + CRC
//if(NRF_ESB) payload += 2;
//if(payload > 32) payload = 32;
@@ -475,7 +475,8 @@ static void prepare_nrf24(bool fsend_packet) {
nrf24_HANDLE,
REG_FEATURE,
0); // Enables the W_TX_PAYLOAD_NOACK command, Disable Payload with ACK, set Dynamic Payload
} else {
} else if(what_to_do == 2) {
if(adr->addr_count == 0) return;
nrf24_write_reg(
nrf24_HANDLE,
REG_CONFIG,
@@ -483,7 +484,7 @@ static void prepare_nrf24(bool fsend_packet) {
NRF_CRC == 2 ? 0b1100 :
0))); // Mask all interrupts
nrf24_write_reg(
nrf24_HANDLE, REG_SETUP_RETR, NRF_ESB ? 0x11 : 0); // Automatic Retransmission
nrf24_HANDLE, REG_SETUP_RETR, NRF_ESB ? 0x01 : 0); // Automatic Retransmission
nrf24_write_reg(
nrf24_HANDLE,
REG_EN_AA,
@@ -495,51 +496,84 @@ static void prepare_nrf24(bool fsend_packet) {
4 + 1 :
1); // Enables the W_TX_PAYLOAD_NOACK command, Disable Payload with ACK, set Dynamic Payload
}
nrf24_set_maclen(nrf24_HANDLE, adr->addr_len);
nrf24_set_mac(REG_RX_ADDR_P0, adr->addr_P0, adr->addr_len);
uint8_t tmp[5] = {0};
nrf24_read_reg(nrf24_HANDLE, REG_RX_ADDR_P0, tmp, adr->addr_len);
for(uint8_t i = 0; i < adr->addr_len / 2; i++) {
uint8_t tb = tmp[i];
tmp[i] = tmp[adr->addr_len - i - 1];
tmp[adr->addr_len - i - 1] = tb;
if(what_to_do == 3) {
uint8_t* p = APP->log_arr + view_log_arr_idx * LOG_REC_SIZE;
uint8_t addr_size = (*(p + 1) & 0b11) + 2;
nrf24_set_maclen(nrf24_HANDLE, addr_size);
nrf24_set_mac(REG_RX_ADDR_P0, p + 2, addr_size);
memcpy(addrs.addr_P0, p + 2, addr_size);
addrs.addr_count = 1;
addrs.addr_len = addr_size;
nrf24_write_reg(nrf24_HANDLE, RX_PW_P0, *(p + 1) >> 3);
nrf24_write_reg(nrf24_HANDLE, REG_EN_RXADDR, erx_addr);
nrf24_write_reg(nrf24_HANDLE, REG_RF_CH, *p & 0x7F);
nrf24_write_reg(
nrf24_HANDLE,
REG_CONFIG,
0x70 | ((NRF_CRC == 1 ? 0b1000 :
NRF_CRC == 2 ? 0b1100 :
0))); // Mask all interrupts
if(*(p + 1) & 0b100) { // ESB
nrf24_write_reg(nrf24_HANDLE, REG_SETUP_RETR, 0x01); // Automatic Retransmission
nrf24_write_reg(nrf24_HANDLE, REG_EN_AA, 0x3F); // Auto acknowledgement
nrf24_write_reg(
nrf24_HANDLE,
REG_FEATURE,
*(p + 2 + addr_size) >> 2 != 0x33 ?
4 + 1 :
1); // Enables the W_TX_PAYLOAD_NOACK command, Disable Payload with ACK, set Dynamic Payload
} else {
nrf24_write_reg(nrf24_HANDLE, REG_SETUP_RETR, 0); // Automatic Retransmission
nrf24_write_reg(nrf24_HANDLE, REG_EN_AA, 0); // Auto acknowledgement
}
} else {
nrf24_set_maclen(nrf24_HANDLE, adr->addr_len);
nrf24_set_mac(REG_RX_ADDR_P0, adr->addr_P0, adr->addr_len);
uint8_t tmp[5] = {0};
nrf24_read_reg(nrf24_HANDLE, REG_RX_ADDR_P0, tmp, adr->addr_len);
for(uint8_t i = 0; i < adr->addr_len / 2; i++) {
uint8_t tb = tmp[i];
tmp[i] = tmp[adr->addr_len - i - 1];
tmp[adr->addr_len - i - 1] = tb;
}
NRF_ERROR = memcmp(adr->addr_P0, tmp, adr->addr_len) != 0;
FURI_LOG_D(TAG, "Payload: %d", payload);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P0, payload);
if(adr->addr_count > 1) {
nrf24_set_mac(REG_RX_ADDR_P1, adr->addr_P1, adr->addr_len);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P1, payload);
erx_addr |= (1 << 1); // Enable RX_P1
} else
nrf24_write_reg(nrf24_HANDLE, RX_PW_P1, 0);
if(adr->addr_count > 2) {
nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P2, &adr->addr_P2, 1);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P2, payload);
erx_addr |= (1 << 2); // Enable RX_P2
} else
nrf24_write_reg(nrf24_HANDLE, RX_PW_P2, 0);
if(adr->addr_count > 3) {
nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P3, &adr->addr_P3, 1);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P3, payload);
erx_addr |= (1 << 3); // Enable RX_P3
} else
nrf24_write_reg(nrf24_HANDLE, RX_PW_P3, 0);
if(adr->addr_count > 4) {
nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P4, &adr->addr_P4, 1);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P4, payload);
erx_addr |= (1 << 4); // Enable RX_P4
} else
nrf24_write_reg(nrf24_HANDLE, RX_PW_P4, 0);
if(adr->addr_count > 5) {
nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P5, &adr->addr_P5, 1);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P5, payload);
erx_addr |= (1 << 5); // Enable RX_P5
} else
nrf24_write_reg(nrf24_HANDLE, RX_PW_P5, 0);
nrf24_write_reg(
nrf24_HANDLE, REG_DYNPD, NRF_DPL ? 0x3F : 0); // Enable dynamic payload reg
nrf24_write_reg(nrf24_HANDLE, REG_EN_RXADDR, erx_addr);
nrf24_write_reg(nrf24_HANDLE, REG_RF_CH, NRF_channel);
}
NRF_ERROR = memcmp(adr->addr_P0, tmp, adr->addr_len) != 0;
FURI_LOG_D(TAG, "Payload: %d", payload);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P0, payload);
if(adr->addr_count > 1) {
nrf24_set_mac(REG_RX_ADDR_P1, adr->addr_P1, adr->addr_len);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P1, payload);
erx_addr |= (1 << 1); // Enable RX_P1
} else
nrf24_write_reg(nrf24_HANDLE, RX_PW_P1, 0);
if(adr->addr_count > 2) {
nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P2, &adr->addr_P2, 1);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P2, payload);
erx_addr |= (1 << 2); // Enable RX_P2
} else
nrf24_write_reg(nrf24_HANDLE, RX_PW_P2, 0);
if(adr->addr_count > 3) {
nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P3, &adr->addr_P3, 1);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P3, payload);
erx_addr |= (1 << 3); // Enable RX_P3
} else
nrf24_write_reg(nrf24_HANDLE, RX_PW_P3, 0);
if(adr->addr_count > 4) {
nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P4, &adr->addr_P4, 1);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P4, payload);
erx_addr |= (1 << 4); // Enable RX_P4
} else
nrf24_write_reg(nrf24_HANDLE, RX_PW_P4, 0);
if(adr->addr_count > 5) {
nrf24_write_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P5, &adr->addr_P5, 1);
nrf24_write_reg(nrf24_HANDLE, RX_PW_P5, payload);
erx_addr |= (1 << 5); // Enable RX_P5
} else
nrf24_write_reg(nrf24_HANDLE, RX_PW_P5, 0);
nrf24_write_reg(nrf24_HANDLE, REG_DYNPD, NRF_DPL ? 0x3F : 0); // Enable dynamic payload reg
nrf24_write_reg(nrf24_HANDLE, REG_EN_RXADDR, erx_addr);
nrf24_write_reg(nrf24_HANDLE, REG_RF_CH, NRF_channel);
}
nrf24_flush_rx(nrf24_HANDLE);
nrf24_flush_tx(nrf24_HANDLE);
@@ -557,6 +591,7 @@ static void start_scanning() {
correct_NRF_Payload_sniff_min();
view_log_decode_CRC = NRF_CRC;
} else if(sniff_loaded) { // Switch from sniff to scan/view
// to do...
}
prepare_nrf24(false);
if(NRF_ERROR) {
@@ -725,14 +760,13 @@ bool check_packet(uint8_t* pkt, uint16_t size) {
if(i != found_total) { // found
APP->found[i].total++;
} else {
pkt--;
uint8_t* p = APP->log_arr;
uint8_t* p = APP->log_arr + 2;
for(i = 0; i < log_arr_idx; i++, p += LOG_REC_SIZE) {
if(*p & 0x80 && (*(p + 1) & 0b11) + 2 == addr_size && pkt != p) {
if((*(p - 2) & 0x80) && (*(p - 1) & 0b11) + 2 == addr_size && pkt != p) {
if(memcmp(p, pkt, addr_size) == 0) break;
}
}
if(i != log_arr_idx && found_total < MAX_LOG_RECORDS) { // found -> 2
if(i != log_arr_idx && found_total < MAX_FOUND_RECORDS) { // found -> 2
memset(&APP->found[found_total], 0, sizeof(struct FOUND));
memcpy(APP->found[found_total].addr, pkt, addr_size);
APP->found[found_total].addr_size = addr_size;
@@ -974,7 +1008,14 @@ static void render_callback(Canvas* const canvas, void* ctx) {
canvas_draw_str(canvas, 10, 30, screen_buf);
if(what_to_do == 1)
snprintf(screen_buf, sizeof(screen_buf), "Min Payl: %d", NRF_Payload_sniff_min);
else
else if(what_to_do == 3) {
uint8_t* p = APP->log_arr + view_log_arr_idx * LOG_REC_SIZE;
snprintf(
screen_buf,
sizeof(screen_buf),
"Payload: %d",
log_arr_idx && (*p & 0x80) ? *(p + 1) >> 3 : NRF_Payload);
} else
snprintf(screen_buf, sizeof(screen_buf), "Payload: %d", NRF_Payload);
canvas_draw_str(canvas, 78, 30, screen_buf);
strcpy(screen_buf, "Next Ch time: "); // menu_selected = 3
@@ -999,7 +1040,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
canvas_draw_str(canvas, 10, 50, screen_buf);
if(what_to_do) { // menu_selected = 5
if(NRF_ERROR)
snprintf(screen_buf, sizeof(screen_buf), "nRF24L01+ R/W ERROR!");
snprintf(screen_buf, sizeof(screen_buf), "nRF24L01+ r/w ERROR!");
else {
if(what_to_do == 1)
snprintf(screen_buf, sizeof(screen_buf), "Start sniff");
@@ -1187,8 +1228,16 @@ static void render_callback(Canvas* const canvas, void* ctx) {
}
uint16_t y = 14 + i * 7;
canvas_draw_str(canvas, 3 * 5, y, screen_buf);
uint16_t x = snprintf(screen_buf, sizeof(screen_buf), "%d", page + i + 1);
canvas_draw_str(canvas, 0, y, screen_buf);
uint16_t x = page + i + 1;
if(x > 99) {
snprintf(screen_buf, 16, "%d", x);
canvas_draw_str(canvas, 1, y, screen_buf + 1);
canvas_draw_frame(canvas, 0, y - 2, 1, 2);
x = 2;
} else {
x = snprintf(screen_buf, 16, "%d", x);
canvas_draw_str(canvas, 0, y, screen_buf);
}
if(crcptr) { // 5x7 font, 9 lines
canvas_draw_str(canvas, x * 5, y, "=");
int n = crcptr - (uint8_t*)ptr;
@@ -1216,9 +1265,9 @@ static void render_callback(Canvas* const canvas, void* ctx) {
snprintf(screen_buf, 50, "Found > 1: %d", found_total);
canvas_draw_str(canvas, 0, 1 * 7, screen_buf);
int16_t idx = view_found * 7;
for(uint8_t i = 0; i < 7; i++) {
if(idx++ >= found_total) break;
snprintf(screen_buf, 16, "%d. ", idx);
for(uint8_t i = 0; i < 7; i++, idx++) {
if(idx >= found_total) break;
snprintf(screen_buf, 16, "%d. ", idx + 1);
add_to_str_hex_bytes(
screen_buf, (char*)APP->found[idx].addr, APP->found[idx].addr_size);
if(APP->found[idx].addr_size == 3)
@@ -1226,7 +1275,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
else if(APP->found[idx].addr_size == 4)
strcat(screen_buf, " ");
snprintf(screen_buf + strlen(screen_buf), 16, " - %d", APP->found[idx].total);
canvas_draw_str(canvas, 0, 2 + i * 7, screen_buf);
canvas_draw_str(canvas, 0, (2 + i) * 7, screen_buf);
}
} else {
struct ADDRS* a;
@@ -1286,7 +1335,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
}
screen_buf[0] = 'v';
strcpy(screen_buf + 1, VERSION);
canvas_draw_str(canvas, 104, 7, screen_buf);
canvas_draw_str(canvas, 105, 7, screen_buf);
if(view_log_decode_PCF || view_log_decode_CRC) {
strcpy(screen_buf, "Decode: ");
if(view_log_decode_PCF) strcat(screen_buf, "ESB ");
@@ -1318,9 +1367,9 @@ int32_t nrf24scan_app(void* p) {
strcpy(addr_file_name, "MEMORY LOW!");
}
clear_log();
APP->found = malloc(sizeof(struct FOUND) * MAX_LOG_RECORDS);
APP->found = malloc(sizeof(struct FOUND) * MAX_FOUND_RECORDS);
if(APP->found == NULL) {
FURI_LOG_E(TAG, "Not enouch memory: %d", sizeof(struct FOUND) * MAX_LOG_RECORDS);
FURI_LOG_E(TAG, "Not enouch memory: %d", sizeof(struct FOUND) * MAX_FOUND_RECORDS);
strcpy(addr_file_name, "MEMORY LOW!!");
}
@@ -1535,7 +1584,11 @@ int32_t nrf24scan_app(void* p) {
break;
case Menu_ok:
if(what_to_do) {
if(addrs.addr_count || what_to_do == 1) {
if((addrs.addr_count ||
(what_to_do == 3 && log_arr_idx &&
*(APP->log_arr + view_log_arr_idx * LOG_REC_SIZE) &
0x80)) ||
what_to_do == 1) {
if(log_to_file == -1) {
log_to_file = 0;
clear_log();
@@ -1547,7 +1600,6 @@ int32_t nrf24scan_app(void* p) {
}
} else
what_doing = 1;
key_press_seq_ok = event.input.sequence;
break;
}
} else if(what_doing == 1) {
@@ -1559,7 +1611,6 @@ int32_t nrf24scan_app(void* p) {
if(what_doing == 0) {
if(menu_selected == Menu_enter_channel) {
NRF_AA_OFF ^= 1;
key_press_seq_ok = event.input.sequence;
} else if(menu_selected == Menu_log) { // Log
if(log_arr_idx && (log_to_file == 1 || log_to_file == 2)) {
write_to_log_file(APP->storage, false);
@@ -1616,4 +1667,4 @@ int32_t nrf24scan_app(void* p) {
if(APP->found) free(APP->found);
free(APP);
return 0;
}
}
applications/services/desktop/scenes/desktop_scene_main.c
+4 -2
View File
@@ -237,11 +237,13 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
break;
}
case DesktopMainEventOpenHeap: {
desktop_scene_main_open_app_or_profile(desktop, EXT_PATH("/apps/Games/Heap_Defence.fap"));
desktop_scene_main_open_app_or_profile(
desktop, EXT_PATH("/apps/Games/Heap_Defence.fap"));
break;
}
case DesktopMainEventOpenSubRemote: {
desktop_scene_main_open_app_or_profile(desktop, EXT_PATH("/apps/Main/SubGHz_Remote.fap"));
desktop_scene_main_open_app_or_profile(
desktop, EXT_PATH("/apps/Main/SubGHz_Remote.fap"));
break;
}
case DesktopMainEventOpenClock: {