From 83279545f6de5d9561ead724d9eab86adb7c1e7c Mon Sep 17 00:00:00 2001 From: RogueMaster Date: Mon, 28 Nov 2022 17:15:35 -0500 Subject: [PATCH] app upds --- applications/plugins/dice2/README.md | 2 + .../plugins/dice2/assets/ui_result_3.png | Bin 133 -> 129 bytes applications/plugins/dice2/dice_app.c | 2 +- .../plugins/dice2/sources/roll-screen.png | Bin 0 -> 2375 bytes applications/plugins/nrf24scan/README.md | 16 +- .../plugins/nrf24scan/Screenshot-4.png | Bin 1436 -> 1521 bytes .../plugins/nrf24scan/Screenshot-5.png | Bin 0 -> 3238 bytes applications/plugins/nrf24scan/addr-WCO1.txt | 7 + applications/plugins/nrf24scan/nrf24scan.c | 291 +++++++++++------- applications/plugins/nrf24scan/settings.txt | 9 + 10 files changed, 210 insertions(+), 117 deletions(-) create mode 100644 applications/plugins/dice2/sources/roll-screen.png create mode 100644 applications/plugins/nrf24scan/Screenshot-5.png create mode 100644 applications/plugins/nrf24scan/addr-WCO1.txt create mode 100644 applications/plugins/nrf24scan/settings.txt diff --git a/applications/plugins/dice2/README.md b/applications/plugins/dice2/README.md index f8e79cf64..bfd9f73b8 100644 --- a/applications/plugins/dice2/README.md +++ b/applications/plugins/dice2/README.md @@ -5,6 +5,8 @@ ## Screenshots
+
+
## Compiling diff --git a/applications/plugins/dice2/assets/ui_result_3.png b/applications/plugins/dice2/assets/ui_result_3.png index d773b9d20ab19f7adae3d58e850d51ec0b507207..8a23ac36d90ab6b04a4ac06f027d5d3d4a03ca2e 100644 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^l0eMD!3HF&7fw+FQjEnx?oJHr&dIz4a;!aF978mM z*G}-{Vo=~=p8VgwO2sK(Y3+>SGUgj%3+`*gdrR$H?sG(V$26Cc=whRHAIev@s4S?y c$(_&mZIAj7<#qRfrZ6ygy85}Sb4q9e07T0uA^-pY literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^5x9-7>k44ofy`glX(f`*n7G-hG+z@ zonXkvV8Frj@PGfZg`A$^%FdBfotLOgY*G0WGJ_>xa&gPqwKLeve00?wYroll_result > 99) - canvas_draw_icon(canvas, 53, 26, &I_ui_result_3); + canvas_draw_icon(canvas, 52, 26, &I_ui_result_3); else if(state->roll_result > 9) canvas_draw_icon(canvas, 56, 26, &I_ui_result_2); else diff --git a/applications/plugins/dice2/sources/roll-screen.png b/applications/plugins/dice2/sources/roll-screen.png new file mode 100644 index 0000000000000000000000000000000000000000..2dda26e59767e6f215eb0da7cdacce726919f379 GIT binary patch literal 2375 zcmcImdsGv57XAgcA}9}QsmjBwhqb4NbX8M~5_mBN=|CsZeIdkXU z@80`;_s)&j=!32It*TaV*jsxIezeRzytH+TS@w@DYbM~Ql8UX7yu3jimQMnm_ zwM&O1_Qx?Q=f?JPM}s}y>izurDx2Q>UlMMQZ2GEUP z)|I5<3zy#tugc1G2OQQ~z=?GLzx~?oYC8Z2od4gC1171{cl|B0m2#$4$j28&IrQ?k zfbjQGz~cx2SImrb-~1X?p|P;3ZPUcD?$?mw;H`3=f%y(H zXbq=Sn%qoUjx2dd$#IL~E)~&oa`yR+2pL(|SPlr+1IOK~@91O=VqC+A!UK5Do+0`% zYmu}-L%-FlBc^^hEukqres(z1LP*Qk1Q)1}02Q?puNFqQm89gvu(KcTpQD2Zsm zF~qCBrRrgUF|W#xFKzB|qxb{}(lxl+tCn}9M)DJ^kJMZmvyX(#LcCSpcPNuxyJwfB z)l-=Fg9M#jRs>sflVvgr_Kren!xGp0+Rs-d%1PFzUU0RQORF45ZyU?x*excn`uln& zbzVSTQH-^Mu;j_ULv#K|s*u9g~k50!Y63?!OgsFKc?@v}W zXYqF{T82eGJrmGb{;C}#PY@*$onBWrB6>h3{u~P(rHT2ub1Pc7-{7b_+4s_W$?}vz z(Crz1)6s(78 zPC}L3acfZFsp{4f?BbQiBFzJ>CLBqcCa3S3xyG9+2kow({*XJUW2@P5coWN5#o^&P zdDcjT?aB6cd!N$Sr^I=+JPP9yU0P+5!Uj*}x`llJbiEokc3Gs=v}-am`7WwYudz-J zSjmMNl5)WfzEO@4`OH@N$7~t1nCmH3&ESR&K7X2s!C1vZv>apndw!Bz7KA3WM73c? zD)=&`#4!o z%IWsCb-EEJ*of#~Zw38Pf?KlVEemn|?rED4O{;a1e?g@idGrFVu+W?kZbmgCb;Jaf zT7pS4b%TN`W^{$jbRfXapt3WJ%sgGKPWi!qd$e+R3vK6rU#%eC#UtJsZeM-s0xOd` z3hrG-u<~Dy)k)VZYeH#m7vIDd?o3}1Ucg=4j__ee92}FHSa?d4u7);->M`Sw5TMwj zSYR_fuE?T~tq8o#U9_vK)7o;Yb!Sb9h8eeq>&Wr`4;AhEske`3P!Tg18>7vOX8n#a zW5+BbXAC|6jxTrminZ-;2+vlPX`bzuB?RVf)Yf5Lg!H3Dg8`ig~A{VgjOc6Q{iXxL1q{1NmIdi7XoCa)P3Su zP80fKP1I7*m~n&$pIB(sidq#o_>B$wkHAY9m4oD;8#|ZZ!zjz^f)oFovph?mf<7EK zhovECbx-XOTG6DJ)uXcqnu6K2JUx2~^8WyvD4KW{jU$m(O!j$teTeK`89%eFsZEW* zVs8b9tCM`QEC`5W97(-@^M0ZJpf5MG^Etl&E*lMT1JvKWTKY^-+*WU6)wo$&TMG0C mxtDN@0C)gUzq;@XQ5zzLpKpkG`?3Ac2po=#ju0G3yZmqSl
+Settings file (default addr.txt) format:
Rate: 0/1/2 - rate in Mbps (=0.25/1/2)
Ch: 0..125 - default channel
@@ -18,24 +18,32 @@ P4: address pipe #4, LSB in hex (1 byte)
P5: address pipe #5, 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
-

+
In the list of the received:
Press OK - send the packet,
Long press OK - view addresses.



-


+

+Decode the Packet Control Field (long press OK in the list and then press '>').
+ESB (Enhanced Shockburst) option must be turned off.

+ +
+1 - pipe #
+2 - Payload length (for valide packet must be 1..20 hex, or 0x33 if not DPL)
+3 - PID (2 bit) + NO_ACK (1 bit)
+
+

- ## PinOut from from NoComp/Frog diff --git a/applications/plugins/nrf24scan/Screenshot-4.png b/applications/plugins/nrf24scan/Screenshot-4.png index b5396eb20acb460445a7a3b801a82bfe70c0e8ea..375f7b7778e3db3d00f2b9c443494214f524111e 100644 GIT binary patch literal 1521 zcmeAS@N?(olHy`uVBq!ia0y~yU;;8388|?c*QZDWAjMhW5n0T@z;^_M8K-LVNi#68 zF7|YB45^s&_U_5v+a3%KfvXo5$jompsOdXCW3`l<o?gM4p_1V7z66_T~fV{`YrF)#!&F$kyv zsq^2vzx1q2?O#`Weogi9zfL!2Rj!};e{=Lq%X1HR?UoT_n63^{{56;F!HM4=`|tb< z+qP@@KfT|q?^3_W+RahF@wbCvhYBM@hY&-u-?;x|zx@7i zReFuCjTwVo3j>1-CxgS4?d44JmG^&T{Iu;$@Be%4nr!azIgG5)wafS3`u$hq83Tg^ z&?pU{iB&t=xG$uzKwJuR@Yjm{C!XI^uRH$x<6l088(o474pX3JUir;1ZQtawmCEy3 zw>gmr<=9K#Xjs3=5W2Ovo2a3-&uUmfo8~2>kNM_%*ZoD4ze{QASnM>(s-`Cpy>U;le z@2y?l+nHn9kt{e|8r`6VWaRPRuHW__pOdU(>+XI3@9UVudnFjbAq4W2uPt}Rmpwn$ z-V4qCmtbGL-~YyLmIwQKkYf40xMcC!@5VpovYSXE^yPljSrGn?cYojB^R30a-&2u7 z?`=6l_PU38Uu|Zt?Q5^hp7)jI&U7T_0fW$OTUGiR%ZB7NKdr6ZKU5;wCb#Y(6S6hH zc!UQ1C^eEo!uGr!!-Ku+2kL(r9W8nb5FEo_Pc}c85m|LK?sr*dHUY`Z>L_L%Xtng!nW^n+y89tfjVIMDgrIG{xfunN={jPlkXa^ P3}^6k^>bP0l+XkK0%Zg1 literal 1436 zcmeAS@N?(olHy`uVBq!ia0y~yU;;8388|?c*QZDWAjMhW5n0T@AXEavjQ7&yD;OA9 z{XAV9Ln`LHz3V+`v73lP;N^u+D{A9fu3vv$SfR!C(u+rEe)YLE)(%0U&C)*uCZ4vh z|NoPn!FK<-e+&$BoEaDvu`noj5lv;yw9I%tk8%IMUw`+X|GVt_`JZ{ujIW=Q-Ft58 zdi@Xg*B}fE`_AC@`OeIl?_bPV`}|zZJllOgH{bbtXK|eT4mE9t1`S4r4k3ny71wXd zKj?DX{O01D>SuSX_vwGg31eUgWMU9d1yZZ48SekF`)3~iU&Fn2`9Hn)+%~gC862iC zFt~6sI9z!pcOY`}uivX*poe7e%D)WTZdnD}y_P#5`~BHgb%O#CB-x`p z;tNi4k>Yb`7-jwZIpO&`$?D^KE8lYR$Q(tO@#^cp{);x{Y0s=@>7TdAGTZxg@3wz? zwide|XE>k03h@xoUtfRyoM5?l=V#g8XAg|+AJ6+O7G8aS?R>@^;z-WBYTJ-sC;xx; z`uZu0_XXEa|IRw^EW)O&SCJ0$%dYKhpSbzi%dOv8&!r-a-+D{9;{2cTXFm<1=bQe2 zS@{L%`MtMxM#r=7;6t+D=p8Zg{eS+w`RVdGTjv`T_@YME;>vfw|9t;D zo_#jRKW}RF>KD`X6od=E-YVWS^SyD;y2Y=#&!-{8OK)s$xc4*fM`_KYs2%%0@E{w# zpZSLI`MbvA-*grfS3cu6iDU$)08m2keamiOH0y5v4gLo)(e>xuW8)vpLP~~W#nBB& z=?$9fh@e(HeeV25^0&x07Pfmx)~$WVc;-yg_H&i#=k8j~PP=#Q{(tp#`X~XhesSCh zng9FJ)=dO@Fd5;&t*;{;jBEV=#LWNqclW-6cvKHsytXvhmt42*VyVgf_Vmq6;Oqf% z=d4@&3CHGH?gQq9hf<91k^N>IL!RG=@cxKYvZ9_**X^K$`Omp-z~Yv{)78&qol`;+ E05BoZMF0Q* diff --git a/applications/plugins/nrf24scan/Screenshot-5.png b/applications/plugins/nrf24scan/Screenshot-5.png new file mode 100644 index 0000000000000000000000000000000000000000..0b4a59dd1a1cf3de6a4c5c3c91ff73d7ffb7ebbb GIT binary patch literal 3238 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 literal 0 HcmV?d00001 diff --git a/applications/plugins/nrf24scan/addr-WCO1.txt b/applications/plugins/nrf24scan/addr-WCO1.txt new file mode 100644 index 000000000..658340d03 --- /dev/null +++ b/applications/plugins/nrf24scan/addr-WCO1.txt @@ -0,0 +1,7 @@ +Rate: 1 +Ch: 120 +ESB: 1 +DPL: 1 +CRC: 2 +Payload: 4 +P0: C8C8E5 diff --git a/applications/plugins/nrf24scan/nrf24scan.c b/applications/plugins/nrf24scan/nrf24scan.c index bad487606..49aa7976d 100644 --- a/applications/plugins/nrf24scan/nrf24scan.c +++ b/applications/plugins/nrf24scan/nrf24scan.c @@ -1,6 +1,5 @@ // // Written by vad7, 20.11.2022. -// ver. 1.3 // #include "nrf24scan.h" @@ -14,26 +13,26 @@ #include #define TAG "nrf24scan" +#define VERSION "1.4" #define MAX_CHANNEL 125 #define MAX_ADDR 6 #define SCAN_APP_PATH_FOLDER "/ext/nrf24scan" -#define ADDR_FILENAME \ - "addr.txt" // File format (1 parameter per line): \ - // 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 SETTINGS_FILENAME "settings.txt" // File format (1 parameter per line): +// 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 @@ -53,6 +52,7 @@ 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 & scan uint32_t key_press_seq_ok = 0; +uint8_t save_settings = 0; char screen_buf[64]; char addr_file_name[32]; uint8_t NRF_rate = 1; // 0 - 250Kbps, 1 - 1Mbps, 2 - 2Mbps @@ -61,6 +61,7 @@ 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 +bool NRF_ERROR = 0; struct { uint8_t addr_P0[5]; // MSB first @@ -83,6 +84,8 @@ uint8_t last_packet_send_st = 0; int16_t find_channel_period = 0; // sec uint8_t menu_selected = 0; uint32_t start_time; +uint8_t view_log_decode_PCF = + 0; // view log: 1 - decode packet control field (9b) when ESB off. After pipe # (hex): #define menu_selected_max 5 enum { @@ -130,6 +133,17 @@ static void add_to_furi_str_hex_bytes(FuriString* str, char* arr, int bytes) { } while(--bytes); } +static void add_to_str_hex_bytes_shift_9b(char* out, char* arr, int bytes) { + if(bytes <= 0) return; + out += strlen(out); + arr++; // +8b + do { + snprintf(out, 4, "%02X", (((*arr) & 0x7F) << 1) | (*(arr + 1) >> 7)); + arr++; + out += 2; + } while(--bytes); +} + void clear_log() { log_arr_idx = 0; view_log_arr_idx = 0; @@ -145,43 +159,50 @@ void allocate_log_array() { clear_log(); } -void write_to_log_file(Storage* storage) { - if(log_arr_idx == 0) return; +void write_to_log_file(Storage* storage, bool f_settings) { + if(log_arr_idx == 0 && !f_settings) return; Stream* file_stream = file_stream_alloc(storage); 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); bool fl; - if(save_to_new_log) { - int cnt = 1; - do { - fl = file_stream_open( - file_stream, furi_string_get_cstr(str), FSAM_READ_WRITE, FSOM_CREATE_NEW); - if(fl) break; - 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); - furi_string_cat(str, LOG_FILEEXT); - } while(++cnt < 100); - if(!fl) { - FURI_LOG_E(TAG, "Failed to create new log file"); - notification_message(APP->notification, &sequence_blink_red_100); - } - } else { + if(f_settings) { + furi_string_cat(str, SETTINGS_FILENAME); fl = file_stream_open( - file_stream, furi_string_get_cstr(str), FSAM_READ_WRITE, FSOM_OPEN_APPEND); - if(fl) { - if(stream_size(file_stream) == 0) save_to_new_log = true; - } else - file_stream_close(file_stream); + file_stream, furi_string_get_cstr(str), FSAM_READ_WRITE, FSOM_CREATE_ALWAYS); + if(!fl) file_stream_close(file_stream); + } else { + furi_string_cat(str, LOG_FILENAME); + furi_string_cat(str, LOG_FILEEXT); + if(save_to_new_log) { + int cnt = 1; + do { + fl = file_stream_open( + file_stream, furi_string_get_cstr(str), FSAM_READ_WRITE, FSOM_CREATE_NEW); + if(fl) break; + 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); + furi_string_cat(str, LOG_FILEEXT); + } while(++cnt < 100); + if(!fl) { + FURI_LOG_E(TAG, "Failed to create new log file"); + notification_message(APP->notification, &sequence_blink_red_100); + } + } else { + fl = file_stream_open( + file_stream, furi_string_get_cstr(str), FSAM_READ_WRITE, FSOM_OPEN_APPEND); + 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_LOG_D(TAG, "Save to %s", furi_string_get_cstr(str)); + if(save_to_new_log || f_settings) { furi_string_printf( str, "%s %d\n%s %d\n%s %d\n", @@ -225,33 +246,38 @@ void write_to_log_file(Storage* storage) { 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!"); + FURI_LOG_E(TAG, "Failed to write header to file!"); notification_message(APP->notification, &sequence_blink_red_100); } } if(fl) { - int i = 0; - for(; i < log_arr_idx; i++) { - furi_string_reset(str); - add_to_furi_str_hex_bytes( - str, - (char*)APP->log_arr + i * LOG_REC_SIZE, - MIN(NRF_Payload + 1, LOG_REC_SIZE)); - furi_string_cat(str, "\n"); - if(stream_write_string(file_stream, str) != furi_string_size(str)) { - FURI_LOG_E(TAG, "Failed to write to log!"); - break; + if(f_settings) { + save_settings = 0; + if(strcmp(addr_file_name, "NONE") == 0) strcpy(addr_file_name, SETTINGS_FILENAME); + } else { + int i = 0; + for(; i < log_arr_idx; i++) { + furi_string_reset(str); + add_to_furi_str_hex_bytes( + str, + (char*)APP->log_arr + i * LOG_REC_SIZE, + MIN(NRF_Payload + 1, LOG_REC_SIZE)); + furi_string_cat(str, "\n"); + if(stream_write_string(file_stream, str) != furi_string_size(str)) { + FURI_LOG_E(TAG, "Failed to write to file!"); + break; + } } - } - if(i == log_arr_idx) { - notification_message(APP->notification, &sequence_blink_yellow_100); - FURI_LOG_D(TAG, "Log saved"); + if(i == log_arr_idx) { + notification_message(APP->notification, &sequence_blink_yellow_100); + FURI_LOG_D(TAG, "File saved"); + } + save_to_new_log = false; } } - save_to_new_log = false; file_stream_close(file_stream); } else { - FURI_LOG_E(TAG, "Failed to open log file"); + FURI_LOG_E(TAG, "Failed to open file %s", furi_string_get_cstr(str)); notification_message(APP->notification, &sequence_blink_red_100); } stream_free(file_stream); @@ -381,7 +407,7 @@ static uint8_t load_settings_file(Stream* file_stream) { a = 0; break; } - if(a) addrs.addr_count = a - '0' + 1; + if(err == 0 && a) addrs.addr_count = a - '0' + 1; } else if(line_len >= (NRF_Payload + 1) * 2) { // data if(!log_loaded) { clear_log(); @@ -421,25 +447,27 @@ static void prepare_nrf24() { 0x70 | ((NRF_CRC == 1 ? 0b1000 : NRF_CRC == 2 ? 0b1100 : 0))); // Mask all interrupts - nrf24_write_reg( - nrf24_HANDLE, REG_SETUP_RETR, NRF_ESB ? 1 : 0); // Disable Automatic Retransmission - nrf24_write_reg(nrf24_HANDLE, REG_EN_AA, NRF_ESB ? 0x3F : 0); // Auto acknowledgement + nrf24_write_reg(nrf24_HANDLE, REG_SETUP_RETR, NRF_ESB ? 1 : 0); // Automatic Retransmission + nrf24_write_reg(nrf24_HANDLE, REG_EN_AA, 0); // Disable auto acknowledgement nrf24_write_reg( nrf24_HANDLE, REG_FEATURE, - 1 + (NRF_DPL || NRF_ESB ? + 1 + (NRF_DPL ? 4 : 1)); // 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_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P0, addr, addrs.addr_len); + uint8_t tmp[5]; + nrf24_read_reg(nrf24_HANDLE, REG_RX_ADDR_P0, tmp, addrs.addr_len); + NRF_ERROR = memcmp(addr, tmp, addrs.addr_len) != 0; nrf24_write_reg(nrf24_HANDLE, RX_PW_P0, NRF_Payload); if(addrs.addr_count > 0) nrf24_write_reg( nrf24_HANDLE, REG_DYNPD, NRF_DPL ? (1 << 0) : 0); // Enable dynamic payload reg 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_buf_reg(nrf24_HANDLE, REG_RX_ADDR_P1, addr, addrs.addr_len); nrf24_write_reg(nrf24_HANDLE, RX_PW_P1, NRF_Payload); nrf24_write_reg(nrf24_HANDLE, REG_DYNPD, NRF_DPL ? (1 << 1) : 0); erx_addr |= (1 << 1); // Enable RX_P1 @@ -484,6 +512,10 @@ static void prepare_nrf24() { static void start_scanning() { prepare_nrf24(); + if(NRF_ERROR) { + FURI_LOG_E(TAG, "NRF R/W ERROR!"); + return; + } nrf24_set_rx_mode(nrf24_HANDLE); start_time = furi_get_tick(); FURI_LOG_D(TAG, "Start scan: Ch=%d Rate=%d", NRF_channel, NRF_rate); @@ -503,7 +535,7 @@ bool nrf24_read_newpacket() { log_arr_idx++; } else { if(log_to_file == 1 || log_to_file == 2) { - write_to_log_file(APP->storage); + write_to_log_file(APP->storage, false); clear_log(); } else { memmove(APP->log_arr, APP->log_arr + LOG_REC_SIZE, log_arr_idx * LOG_REC_SIZE); @@ -535,8 +567,11 @@ static void render_callback(Canvas* const canvas, void* ctx) { //canvas_draw_frame(canvas, 0, 0, 128, 64); // border around the edge of the screen if(what_doing == 0) { canvas_set_font(canvas, FontSecondary); // 8x10 font - snprintf( - screen_buf, sizeof(screen_buf), "Settings: %s", addr_file_name); // menu_selected = 0 + if(save_settings) + snprintf( + screen_buf, sizeof(screen_buf), "Save: %s", SETTINGS_FILENAME); // menu_selected = 0 + else + snprintf(screen_buf, sizeof(screen_buf), "Load: %s", addr_file_name); canvas_draw_str(canvas, 10, 10, screen_buf); snprintf(screen_buf, sizeof(screen_buf), "Ch: %d", NRF_channel); // menu_selected = 1 canvas_draw_str(canvas, 10, 20, screen_buf); @@ -577,12 +612,17 @@ static void render_callback(Canvas* const canvas, void* ctx) { log_to_file == 2 ? "Append" : "Clear"); // menu_selected = 4 canvas_draw_str(canvas, 10, 50, screen_buf); - snprintf( - screen_buf, - sizeof(screen_buf), - "%s (pipes: %d)", - what_to_do ? "Start scan" : "View log", - addrs.addr_count); // menu_selected = 5 + if(what_to_do) { + if(NRF_ERROR) + snprintf(screen_buf, sizeof(screen_buf), "nRF24L01+ R/W ERROR!"); + else + snprintf( + screen_buf, + sizeof(screen_buf), + "Start scan (pipes: %d)", + addrs.addr_count); // menu_selected = 5 + } else + snprintf(screen_buf, sizeof(screen_buf), "View log (pipes: %d)", addrs.addr_count); canvas_draw_str(canvas, 10, 60, screen_buf); canvas_draw_str(canvas, 0, menu_selected * 10 + 10, ">"); } else if(what_doing == 1) { @@ -621,16 +661,29 @@ static void render_callback(Canvas* const canvas, void* ctx) { uint8_t pipe = dpl & 7; dpl >>= 3; if(dpl == 0) dpl = 32; + if(view_log_decode_PCF && dpl == 32) dpl -= 2; int count = dpl - view_log_arr_x; uint8_t max_width = view_log_arr_x == 0 && addrs.addr_count > 1 ? - VIEW_LOG_WIDTH_B - 1 : + view_log_decode_PCF ? VIEW_LOG_WIDTH_B - 3 : + VIEW_LOG_WIDTH_B - 1 : VIEW_LOG_WIDTH_B; if(count > max_width) count = max_width; ptr += view_log_arr_x; if(count > 0) { - if(max_width < VIEW_LOG_WIDTH_B) - snprintf(screen_buf + 1, sizeof(screen_buf), "%d-", pipe); - add_to_str_hex_bytes(screen_buf, ptr, count); + if(max_width < VIEW_LOG_WIDTH_B) { + snprintf(screen_buf + 1, 10, "%X-", pipe); + if(view_log_decode_PCF) + snprintf( + screen_buf + strlen(screen_buf), + 10, + "%02X%01X-", + *ptr >> 2, + ((*ptr & 3) << 1) | (*(ptr + 1) >> 7)); + } + if(view_log_decode_PCF) + add_to_str_hex_bytes_shift_9b(screen_buf, ptr, count); + else + add_to_str_hex_bytes(screen_buf, ptr, count); } canvas_draw_str(canvas, 3 * 5, 14 + i * 7, screen_buf); } @@ -640,33 +693,37 @@ static void render_callback(Canvas* const canvas, void* ctx) { if(addrs.addr_count > 0) { snprintf(screen_buf, sizeof(screen_buf), "P0: "); add_to_str_hex_bytes(screen_buf, (char*)addrs.addr_P0, addrs.addr_len); - canvas_draw_str(canvas, 0, 10, screen_buf); + canvas_draw_str(canvas, 0, 1 * 7, screen_buf); } if(addrs.addr_count > 1) { snprintf(screen_buf, sizeof(screen_buf), "P1: "); add_to_str_hex_bytes(screen_buf, (char*)addrs.addr_P1, addrs.addr_len); - canvas_draw_str(canvas, 0, 20, screen_buf); + canvas_draw_str(canvas, 0, 2 * 7, screen_buf); } if(addrs.addr_count > 2) { - canvas_draw_str(canvas, 0, 30, "P2: "); + canvas_draw_str(canvas, 0, 3 * 7, "P2: "); snprintf(screen_buf, sizeof(screen_buf), "%02X", addrs.addr_P2); - canvas_draw_str(canvas, (4 + (addrs.addr_len - 1) * 2) * 5, 30, screen_buf); + canvas_draw_str(canvas, (4 + (addrs.addr_len - 1) * 2) * 5, 3 * 7, screen_buf); } if(addrs.addr_count > 3) { - canvas_draw_str(canvas, 0, 40, "P3: "); + canvas_draw_str(canvas, 0, 4 * 7, "P3: "); snprintf(screen_buf, sizeof(screen_buf), "%02X", addrs.addr_P3); - canvas_draw_str(canvas, (4 + (addrs.addr_len - 1) * 2) * 5, 40, screen_buf); + canvas_draw_str(canvas, (4 + (addrs.addr_len - 1) * 2) * 5, 4 * 7, screen_buf); } if(addrs.addr_count > 4) { - canvas_draw_str(canvas, 0, 50, "P4: "); + canvas_draw_str(canvas, 0, 5 * 7, "P4: "); snprintf(screen_buf, sizeof(screen_buf), "%02X", addrs.addr_P4); - canvas_draw_str(canvas, (4 + (addrs.addr_len - 1) * 2) * 5, 50, screen_buf); + canvas_draw_str(canvas, (4 + (addrs.addr_len - 1) * 2) * 5, 5 * 7, screen_buf); } if(addrs.addr_count > 5) { - canvas_draw_str(canvas, 0, 60, "P5: "); + canvas_draw_str(canvas, 0, 6 * 7, "P5: "); snprintf(screen_buf, sizeof(screen_buf), "%02X", addrs.addr_P5); - canvas_draw_str(canvas, (4 + (addrs.addr_len - 1) * 2) * 5, 60, screen_buf); + canvas_draw_str(canvas, (4 + (addrs.addr_len - 1) * 2) * 5, 6 * 7, screen_buf); } + screen_buf[0] = 'v'; + strcpy(screen_buf + 1, VERSION); + canvas_draw_str(canvas, 108, 7, screen_buf); + if(view_log_decode_PCF) canvas_draw_str(canvas, 78, 64, "Decode PCF"); } release_mutex((ValueMutex*)ctx, plugin_state); } @@ -701,17 +758,17 @@ int32_t nrf24scan_app(void* p) { FuriString* path = furi_string_alloc(); furi_string_set(path, SCAN_APP_PATH_FOLDER); furi_string_cat(path, "/"); - furi_string_cat(path, ADDR_FILENAME); + furi_string_cat(path, SETTINGS_FILENAME); if(file_stream_open(file_stream, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) { uint8_t err = load_settings_file(file_stream); if(!err) - strcpy(addr_file_name, ADDR_FILENAME); + strcpy(addr_file_name, SETTINGS_FILENAME); else snprintf(addr_file_name, sizeof(addr_file_name), "LOAD ERROR#%d", err); } else { strcpy(addr_file_name, "NONE"); } - //file_stream_close(file_stream); + file_stream_close(file_stream); stream_free(file_stream); furi_string_free(path); allocate_log_array(); @@ -756,6 +813,9 @@ int32_t nrf24scan_app(void* p) { if(event.input.type == InputTypePress || event.input.type == InputTypeRepeat) { if(what_doing == 0) { switch(menu_selected) { + case Menu_open_file: + save_settings ^= 1; + break; case Menu_enter_channel: NRF_channel += event.input.type == InputTypeRepeat ? 10 : 1; if(NRF_channel > MAX_CHANNEL) NRF_channel = 0; @@ -777,6 +837,8 @@ int32_t nrf24scan_app(void* p) { } } else if(what_doing == 1) { if(view_log_arr_x < VIEW_LOG_MAX_X) view_log_arr_x++; + } else if(what_doing == 2) { + if(NRF_ESB == 0) view_log_decode_PCF ^= 1; } } break; @@ -814,20 +876,24 @@ int32_t nrf24scan_app(void* p) { if(what_doing == 0) { switch(menu_selected) { case Menu_open_file: - file_stream = file_stream_alloc(APP->storage); - if(select_settings_file(file_stream)) { - uint8_t err = load_settings_file(file_stream); - if(!err) - save_to_new_log = true; - else - snprintf( - addr_file_name, - sizeof(addr_file_name), - "LOAD ERROR#%d", - err); - file_stream_close(file_stream); + if(save_settings) { + write_to_log_file(APP->storage, true); + } else { + file_stream = file_stream_alloc(APP->storage); + if(select_settings_file(file_stream)) { + uint8_t err = load_settings_file(file_stream); + if(!err) + save_to_new_log = true; + else + snprintf( + addr_file_name, + sizeof(addr_file_name), + "LOAD ERROR#%d", + err); + file_stream_close(file_stream); + } + stream_free(file_stream); } - stream_free(file_stream); break; case Menu_enter_channel: if(NRF_ESB) { @@ -837,6 +903,7 @@ int32_t nrf24scan_app(void* p) { NRF_DPL = 1; } else NRF_ESB = 1; + if(NRF_ESB) view_log_decode_PCF = 0; break; case Menu_enter_rate: if(++NRF_CRC > 2) NRF_CRC = 0; @@ -862,7 +929,7 @@ int32_t nrf24scan_app(void* p) { if(what_doing == 0) { if(menu_selected == Menu_log) { // Log if(log_arr_idx && (log_to_file == 1 || log_to_file == 2)) { - write_to_log_file(APP->storage); + write_to_log_file(APP->storage, false); clear_log(); } } @@ -905,7 +972,7 @@ int32_t nrf24scan_app(void* p) { } nrf24_set_idle(nrf24_HANDLE); if(log_arr_idx && (log_to_file == 1 || log_to_file == 2)) { - write_to_log_file(APP->storage); + write_to_log_file(APP->storage, false); } nrf24_deinit(); diff --git a/applications/plugins/nrf24scan/settings.txt b/applications/plugins/nrf24scan/settings.txt new file mode 100644 index 000000000..32485a14c --- /dev/null +++ b/applications/plugins/nrf24scan/settings.txt @@ -0,0 +1,9 @@ +Rate: 1 +Ch: 2 +ESB: 1 +DPL: 0 +CRC: 2 +P0: C8C8C0 +P1: C8C8C1 +P2: C2 +P2: C3