@@ -44,7 +44,7 @@ const char SettingsFld_ReadBatch[] = "RBatch:";
4444const char SettingsFld_WriteBatch [] = "WBatch:" ;
4545const char SettingsFld_SetBatch [] = "SBatch:" ;
4646const char SettingsFld_Listen [] = "Listen:" ;
47- const char SettingsFld_ReadRepeatPeriod [] = "Read repeat:" ;
47+ const char SettingsFld_ListenRepeatPeriod [] = "Listen repeat:" ;
4848const char AskQuestion_Save [] = "SAVE BATCH?" ;
4949#define Settings_i 'i'
5050#define Settings_n 'n'
@@ -95,7 +95,7 @@ uint8_t NRF_last_packet_send_st = 0;
9595uint8_t NRF_resend = 1 ; // number of transaction attempts
9696int8_t NRF_repeat = 0 ; // count number of repeated requests (until < NRF_resend)
9797uint32_t NRF_time ;
98- uint16_t ReadRepeatPeriod = 10 ; // s
98+ uint16_t ListenRepeatPeriod = 10 ; // s
9999bool ReadRepeat = false;
100100uint32_t delay_between_pkt = 10 ;// ms
101101
@@ -854,8 +854,8 @@ static uint8_t load_settings_file() {
854854 NRF_resend = str_to_int (p + sizeof (SettingsFld_Resend ));
855855 } else if (strncmp (p , SettingsFld_Delay , sizeof (SettingsFld_Delay )- 1 ) == 0 ) {
856856 delay_between_pkt = str_to_int (p + sizeof (SettingsFld_Delay ));
857- } else if (strncmp (p , SettingsFld_ReadRepeatPeriod , sizeof (SettingsFld_ReadRepeatPeriod )- 1 ) == 0 ) {
858- ReadRepeatPeriod = str_to_int (p + sizeof (SettingsFld_ReadRepeatPeriod ));
857+ } else if (strncmp (p , SettingsFld_ListenRepeatPeriod , sizeof (SettingsFld_ListenRepeatPeriod )- 1 ) == 0 ) {
858+ ListenRepeatPeriod = str_to_int (p + sizeof (SettingsFld_ListenRepeatPeriod ));
859859 } else if (strncmp (p , SettingsFld_Payload , sizeof (SettingsFld_Payload )- 1 ) == 0 ) {
860860 p += sizeof (SettingsFld_Payload );
861861 payload_fields = 0 ;
@@ -1000,6 +1000,18 @@ static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queu
10001000 furi_message_queue_put (event_queue , & event , FuriWaitForever );
10011001}
10021002
1003+ void display_remove_asterisk (char * fsp , uint8_t vx )
1004+ {
1005+ char * p2 = strchr (fsp , '*' );
1006+ if (p2 ) { // remove '*' or '*n'
1007+ int pos = p2 - fsp ;
1008+ if ((pos -= vx ) < 0 ) pos = 0 ;
1009+ char c = * (p2 + 1 );
1010+ if (* (screen_buf + pos ))
1011+ memmove (screen_buf + pos , screen_buf + pos + (c == ':' || c == '=' ? 1 : 2 ), FONT_5x7_SCREEN_WIDTH + 1 + 2 - pos );
1012+ }
1013+ }
1014+
10031015void render_display_list (Canvas * const canvas , FuriString * * * fsa , char delim , uint16_t view_pos , uint16_t max_i )
10041016{
10051017 uint16_t page = view_pos & ~7 ;
@@ -1010,12 +1022,11 @@ void render_display_list(Canvas* const canvas, FuriString ***fsa, char delim, ui
10101022 p = (char * ) furi_string_get_cstr ((* fsa )[page + i ]);
10111023 end = strchr (p , delim );
10121024 if (end ) {
1013- if (* (end - 1 ) == '*' ) end -- ; // skip *
1014- else if (* (end - 2 ) == '*' ) end -= 2 ; // skip *?
10151025 len = MIN (end - p , view_x );
10161026 len = MIN (end - p - len , FONT_5x7_SCREEN_WIDTH );
10171027 strncpy (screen_buf , p + view_x , len );
10181028 screen_buf [len ] = '\0' ;
1029+ display_remove_asterisk (p , MIN (end - p , view_x ));
10191030 canvas_draw_str (canvas , 5 , y , screen_buf );
10201031 }
10211032 if ((view_pos & 7 ) == i ) {
@@ -1025,16 +1036,6 @@ void render_display_list(Canvas* const canvas, FuriString ***fsa, char delim, ui
10251036 }
10261037}
10271038
1028- void display_remove_asterisk (char * fsp , uint8_t vx )
1029- {
1030- char * p2 = strchr (fsp , '*' );
1031- if (p2 ) { // remove '*' or '*n'
1032- int pos = p2 - fsp ;
1033- if ((pos -= vx ) < 0 ) pos = 0 ;
1034- memmove (screen_buf + pos , screen_buf + pos + (* (p2 + 1 ) == ':' ? 1 : 2 ), FONT_5x7_SCREEN_WIDTH + 1 + 2 );
1035- }
1036- }
1037-
10381039void display_edit_ttf_font (Canvas * const canvas , uint8_t start_x , uint8_t start_y )
10391040{
10401041 screen_buf [0 ] = * Edit_pos ; screen_buf [1 ] = '\0' ;
@@ -1392,7 +1393,7 @@ int32_t nrf24batch_app(void* p) {
13921393 FuriLogLevel = furi_log_get_level ();
13931394 if (FuriLogLevel == FuriLogLevelDebug ) furi_hal_uart_set_br (FuriHalUartIdUSART1 , 1843200 );
13941395 }
1395- if (what_doing == 2 && rw_type == rwt_read_cmd && ReadRepeat && furi_get_tick () - NRF_time > (uint32_t )(ReadRepeatPeriod * 1000 )) {
1396+ if (what_doing == 2 && rw_type == rwt_read_cmd && ReadRepeat && furi_get_tick () - NRF_time > (uint32_t )(ListenRepeatPeriod * 1000 )) {
13961397 ERR = 0 ;
13971398 free_Log ();
13981399 Run_Read_cmd (Read_cmd [view_cmd [rwt_read_cmd ]]);
0 commit comments