Skip to content
This repository has been archived by the owner on Jul 28, 2024. It is now read-only.

Commit

Permalink
ability to change address and channel
Browse files Browse the repository at this point in the history
  • Loading branch information
@vad7
vad7 committed Mar 3, 2023
1 parent 3c96191 commit 0cbad41
Show file tree
Hide file tree
Showing 2 changed files with 161 additions and 80 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Flipper Zero application for nRF24L01 external board. Sends batch commands.
Можно использовать для настройки или чтения данных с удаленного устройства. На удаленной стороне требуется поддержка, ссылка на код для микроконтроллера AVR ниже.<br>
<br>
Сначала выбирается файл настройки с описанием команд.
Можно отредактировать адрес и номер канала.
Затем стрелками влево или вправо выбирается нужный режим - Пакетное чтение (Read Batch), Чтение по одной команде (Read cmd), Пакетная запись (Write Batch).
<br><br>
Есть два вида команд: запрос-ответ и запись.<br>
Expand Down
240 changes: 160 additions & 80 deletions nrf24batch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
#define TAG "nrf24batch"
#define VERSION "1.2"

#define SCAN_APP_PATH_FOLDER "/ext/nrf24batch"
#define LOG_FILENAME "log"
#define LOG_FILEEXT ".txt"
#define NRF_READ_TIMEOUT 300UL // ms
#define WORK_PERIOD 2 // ms, Timer period
#define SCAN_APP_PATH_FOLDER "/ext/nrf24batch"
#define LOG_FILEEXT ".txt"
#define NRF_READ_TIMEOUT 300UL // ms
#define WORK_PERIOD 2 // ms, Timer period
#define MAX_CHANNEL 125
#define FONT_5x7_SCREEN_WIDTH 25

const char SettingsFld_Info[] = "Info:";
const char SettingsFld_Ch[] = "Ch:";
Expand All @@ -43,7 +44,6 @@ const char AskQuestion_Save[] = "SAVE BATCH?";
#define Settings_i 'i'
#define Settings_n 'n'
#define VAR_EMPTY ((int32_t)0x80000000)
#define FONT_5x7_SCREEN_WIDTH 25

nRF24Batch* APP;
uint8_t what_doing = 0; // 0 - setup, 1 - cmd list, 2 - view send cmd
Expand Down Expand Up @@ -86,6 +86,7 @@ uint8_t NRF_last_packet_send_st = 0;
uint8_t NRF_resend = 1; // number of transaction attempts
uint8_t NRF_repeat = 0; // count number of repeated requests (until < NRF_resend)
uint32_t NRF_time;
uint32_t delay_between_pkt = 10;// ms

uint8_t addr[5]; // nRF24 address, MSB first
uint8_t addr_len; // 2..5
Expand All @@ -96,11 +97,12 @@ uint8_t payload_fields = 0;
uint8_t payload_size = 0; // bytes
uint16_t view_Batch = 0; // view pos in Batch or inside WriteBatch (Log[view_Batch])
uint16_t view_WriteBatch = 0; // view pos of WriteBatch list
uint32_t delay_between_pkt = 10;// ms
uint8_t setup_cursor = 0; // cursor position on Setup scr
uint8_t Edit = 0;
char *Edit_pos;
char *Edit_start;
bool Edit_hex; // 0 - decimal, 1 - hex
bool Edited = false;
bool Edited = false; // list of cmds edited

Stream* file_stream = NULL;
FuriString *ReadDefault = NULL;
Expand Down Expand Up @@ -895,23 +897,46 @@ 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, 6 lines
snprintf(screen_buf, sizeof(screen_buf), "Open: %s", file_name);
canvas_draw_str(canvas, 10, 10, screen_buf);
snprintf(screen_buf, sizeof(screen_buf), "%s: %s", addr_len ? "File" : "Open", file_name);
canvas_draw_str(canvas, 8, 10, screen_buf);
if(addr_len) {
canvas_draw_str(canvas, 10, 22, Info);
strcpy(screen_buf, "Address: ");
add_to_str_hex_bytes(screen_buf, addr, addr_len);
canvas_draw_str(canvas, 10, 32, screen_buf);
snprintf(screen_buf, sizeof(screen_buf), "Ch: %d, Rate: %d", NRF_channel, NRF_rate);
canvas_draw_str(canvas, 10, 42, screen_buf);
if(Edit) {
screen_buf[0] = *Edit_pos; screen_buf[1] = '\0';
int n = canvas_string_width(canvas, screen_buf);
int len = Edit_pos - Edit_start;
memcpy(screen_buf, Edit_start, len);
screen_buf[len] = '\0';
int x = setup_cursor == 1 ? 45 : 55;
x += canvas_string_width(canvas, screen_buf);
int len2 = strlen(Edit_pos);
memcpy(screen_buf + len, Edit_pos, len2);
screen_buf[len + len2] = '\0';
int y = 10 + setup_cursor * 10;
if(setup_cursor == 1) canvas_draw_str(canvas, 45, 20, screen_buf);
else if(setup_cursor == 2) canvas_draw_str(canvas, 55, 30, screen_buf);
canvas_draw_line(canvas, x + (len ? 1 : 0), y + 1, x + n + (*Edit_pos == '1' && len ? 1 : 0), y + 1);
}
if(!Edit || setup_cursor != 1) {
screen_buf[0] = '\0';
add_to_str_hex_bytes(screen_buf, addr, addr_len);
canvas_draw_str(canvas, 45, 20, screen_buf);
}
if(!Edit || setup_cursor != 2) {
snprintf(screen_buf, sizeof(screen_buf), "%d", NRF_channel);
canvas_draw_str(canvas, 55, 30, screen_buf);
}
canvas_draw_str(canvas, 8, 20, "Address:");
snprintf(screen_buf, sizeof(screen_buf), "Rate: %d, Ch:", NRF_rate);
canvas_draw_str(canvas, 8, 30, screen_buf);
snprintf(screen_buf, sizeof(screen_buf), "RB: %d, R: %d, WB: %d", ReadBatch_cmd_Total, Read_cmd_Total, WriteBatch_cmd_Total);
canvas_draw_str(canvas, 10, 52, screen_buf);
//canvas_draw_str(canvas, 10, 60, screen_buf);
canvas_draw_str(canvas, 8, 40, screen_buf);
canvas_draw_str(canvas, 0, 64, Info);
canvas_draw_str(canvas, 0, 10 + setup_cursor * 10, ">");
} else {
snprintf(screen_buf, sizeof(screen_buf), "Ver. %s, vad7", VERSION);
canvas_draw_str(canvas, 10, 60, screen_buf);
canvas_draw_str(canvas, 0, 10, ">");
}
canvas_draw_str(canvas, 0, 10, ">");
} else if(what_doing == 1){
canvas_set_font(canvas, FontBatteryPercent); // 5x7 font, 9 lines, 25 cols
if(rw_type == rwt_read_batch) {
Expand Down Expand Up @@ -1111,33 +1136,45 @@ int32_t nrf24batch_app(void* p) {
case InputKeyUp:
if(event.input.type == InputTypeShort || event.input.type == InputTypeRepeat) {
if(!ask_question) {
if(what_doing == 0) {
if(Edit) {
if(*Edit_pos < '9') (*Edit_pos)++;
else if(Edit_hex) {
if(*Edit_pos == '9') *Edit_pos = 'A';
else if((*Edit_pos & ~0x20) < 'F') (*Edit_pos)++;
} else if(Edit_pos > Edit_start && *(Edit_pos - 1) < '9') {
*Edit_pos = '0';
(*(Edit_pos - 1))++;
}
} else if(what_doing == 0) {
if(addr_len) {
if(setup_cursor > 0) setup_cursor--; else setup_cursor = 2;
}
} else if(what_doing == 1) {
if(view_cmd[rw_type]) view_cmd[rw_type]--;
} else if(what_doing == 2) {
if(Edit) {
if(*Edit_pos < '9') (*Edit_pos)++;
else if(Edit_hex) {
if(*Edit_pos == '9') *Edit_pos = 'A';
else if((*Edit_pos & ~0x20) < 'F') (*Edit_pos)++;
}
} else if(view_Batch) view_Batch--;
if(view_Batch) view_Batch--;
}
}
}
break;
case InputKeyDown:
if(event.input.type == InputTypeShort || event.input.type == InputTypeRepeat) {
if(!ask_question) {
if(what_doing == 0) {
what_doing = 1;
if(Edit) {
if(Edit_hex && (*Edit_pos & ~0x20) == 'A') (*Edit_pos) = '9';
else if(*Edit_pos > '0') (*Edit_pos)--;
else if(!Edit_hex && Edit_pos > Edit_start && *(Edit_pos - 1) > '0') {
*Edit_pos = '9';
(*(Edit_pos - 1))--;
}
} else if(what_doing == 0) {
if(addr_len) {
if(setup_cursor < 2) setup_cursor++; else setup_cursor = 0;
}
} else if(what_doing == 1) {
if(view_cmd[rw_type] + 1 < (rw_type == rwt_read_batch ? ReadBatch_cmd_Total : rw_type == rwt_read_cmd ? Read_cmd_Total : WriteBatch_cmd_Total)) view_cmd[rw_type]++;
} else if(what_doing == 2) {
if(Edit) {
if(Edit_hex && (*Edit_pos & ~0x20) == 'A') (*Edit_pos) = '9';
else if(*Edit_pos > '0') (*Edit_pos)--;
} else if(view_Batch < Log_Total - 1) view_Batch++;
if(view_Batch < Log_Total - 1) view_Batch++;
}
}
}
Expand All @@ -1146,17 +1183,21 @@ int32_t nrf24batch_app(void* p) {
if(event.input.type == InputTypeShort || event.input.type == InputTypeRepeat) {
if(ask_question) {
if(event.input.type == InputTypeShort) ask_question_answer ^= 1;
} else if(Edit) {
if(Edit_pos > Edit_start) {
if(is_digit(Edit_pos - 1, Edit_hex)) Edit_pos--;
else if(*(Edit_pos - 1) == 'x' && *(Edit_pos - 3) == ',') Edit_pos -= 4;
else if(*(Edit_pos - 1) == ',') Edit_pos -= 2;
}
} else if(what_doing == 0) {
rw_type = rwt_write_batch;
what_doing = 1;
} else if(what_doing == 1) {
if(event.input.type == InputTypeShort) {
if(--rw_type > rwt_write_batch) rw_type = rwt_write_batch;
} else if(view_x) view_x--;
} else if(what_doing == 2) {
if(Edit) {
if(is_digit(Edit_pos - 1, Edit_hex)) Edit_pos--;
else if(*(Edit_pos - 1) == 'x' && *(Edit_pos - 3) == ',') Edit_pos -= 4;
else if(*(Edit_pos - 1) == ',') Edit_pos -= 2;
} else if(view_x) view_x--;
if(view_x) view_x--;
}
} else if(event.input.type == InputTypeLong) {
if(!ask_question && view_x == 0 && what_doing == 2 && (rw_type == rwt_write_batch || rw_type == rwt_read_batch)
Expand All @@ -1170,20 +1211,21 @@ int32_t nrf24batch_app(void* p) {
if(event.input.type == InputTypeShort || event.input.type == InputTypeRepeat) {
if(ask_question) {
ask_question_answer ^= 1;
} else if(Edit) {
if(is_digit(Edit_pos + 1, Edit_hex)) Edit_pos++;
else if(*(Edit_pos + 1) == ',') {
Edit_pos += 2;
if(*(Edit_pos + 1) == 'x') Edit_pos += 2;
}
} else if(what_doing == 0) {
rw_type = rwt_read_batch;
what_doing = 1;
} else if(what_doing == 1) {
if(event.input.type == InputTypeShort) {
if(++rw_type > rwt_write_batch) rw_type = rwt_read_batch;
} else view_x++;
} else if(what_doing == 2) {
if(Edit) {
if(is_digit(Edit_pos + 1, Edit_hex)) Edit_pos++;
else if(*(Edit_pos + 1) == ',') {
Edit_pos += 2;
if(*(Edit_pos + 1) == 'x') Edit_pos += 2;
}
} else view_x++;
view_x++;
}
}
break;
Expand Down Expand Up @@ -1217,11 +1259,49 @@ int32_t nrf24batch_app(void* p) {
}
}
ask_question = 0;
} else if(Edit) { // insert digit
if(what_doing == 0) {
if(strlen(Edit_start) < (setup_cursor == 1 ? 5 * 2 : 3)) {
memmove(Edit_pos + 1, Edit_pos, strlen(Edit_pos) + 1);
*Edit_pos = '0';
}
} else {
FuriString *fs = Log[view_Batch];
FuriString *ns = furi_string_alloc();
if(ns) {
uint16_t len = Edit_pos - (char*)furi_string_get_cstr(fs);
furi_string_set_n(ns, fs, 0, len);
furi_string_cat_str(ns, "0");
furi_string_cat_str(ns, Edit_pos);
furi_string_free(fs);
Log[view_Batch] = ns;
Edit_pos = (char*)furi_string_get_cstr(ns) + len;
}
}
} else if(what_doing == 0) {
file_stream_close(file_stream);
if(select_settings_file()) {
uint8_t err = load_settings_file();
if(err) snprintf(file_name, sizeof(file_name), "LOAD ERROR #%d", err);
if(setup_cursor == 0) { // open file
file_stream_close(file_stream);
if(select_settings_file()) {
uint8_t err = load_settings_file();
if(err) snprintf(file_name, sizeof(file_name), "LOAD ERROR #%d", err);
}
} else if(setup_cursor == 1) { // change address
char *ebuf = (char*)payload;
ebuf[0] = '\0';
add_to_str_hex_bytes(ebuf, addr, addr_len);
Edit_hex = true;
Edit_pos = ebuf + strlen(ebuf) - 1;
Edit_start = ebuf;
Edit = 1;
NRF_INITED = false;
} else if(setup_cursor == 2) { // change channel
char *ebuf = (char*)payload;
snprintf(ebuf, sizeof(payload), "%d", NRF_channel);
Edit_hex = false;
Edit_pos = ebuf + strlen(ebuf) - 1;
Edit_start = ebuf;
Edit = 1;
NRF_INITED = false;
}
} else if(what_doing == 1) {
if(rw_type == rwt_read_batch) {
Expand Down Expand Up @@ -1256,19 +1336,7 @@ int32_t nrf24batch_app(void* p) {
ask_question = ask_save_batch;
ask_question_answer = 0;
} else if(rw_type == rwt_write_batch) {
if(Edit) { // insert digit
FuriString *fs = Log[view_Batch];
FuriString *ns = furi_string_alloc();
if(ns) {
uint16_t len = Edit_pos - (char*)furi_string_get_cstr(fs);
furi_string_set_n(ns, fs, 0, len);
furi_string_cat_str(ns, "0");
furi_string_cat_str(ns, Edit_pos);
furi_string_free(fs);
Log[view_Batch] = ns;
Edit_pos = (char*)furi_string_get_cstr(ns) + len;
}
} else {
if(!Edit) {
Edit = 1;
Edited = true;
Edit_hex = 0;
Expand All @@ -1281,25 +1349,30 @@ int32_t nrf24batch_app(void* p) {
p += 2;
Edit_hex = 1; // hex
}
Edit_pos = p;
Edit_start = Edit_pos = p;
} else Edit = 0;
}
}
}
}
} else if(event.input.type == InputTypeLong) {
if(what_doing == 2 && Log_Total) {
if(rw_type == rwt_write_batch) {
if(Edit) { // delete
FuriString *fs = Log[view_Batch];
if(is_digit(Edit_pos + 1, Edit_hex) || is_digit(Edit_pos - 1, Edit_hex)) {
memmove(Edit_pos, Edit_pos + 1, strlen(Edit_pos));
furi_string_left(fs, furi_string_size(fs) - 1);
}
} else {
ask_question = ask_write_batch;
ask_question_answer = 0;
if(Edit) { // delete
if(what_doing == 0) {
if(strlen(Edit_start) > 1) {
memmove(Edit_pos, Edit_pos + 1, strlen(Edit_pos) + 1);
if(*Edit_pos == '\0') Edit_pos--;
}
} else {
FuriString *fs = Log[view_Batch];
if(is_digit(Edit_pos + 1, Edit_hex) || (Edit_pos > Edit_start && is_digit(Edit_pos - 1, Edit_hex))) {
memmove(Edit_pos, Edit_pos + 1, strlen(Edit_pos));
furi_string_left(fs, furi_string_size(fs) - 1);
}
}
} else if(what_doing == 2 && Log_Total) {
if(rw_type == rwt_write_batch) {
ask_question = ask_write_batch;
ask_question_answer = 0;
} else if(rw_type == rwt_read_batch) {
ask_question = ask_save_batch;
ask_question_answer = 0;
Expand All @@ -1314,15 +1387,22 @@ int32_t nrf24batch_app(void* p) {
ask_question = ask_exit;
} else processing = false;
} else if(event.input.type == InputTypeShort) {
if(Edit) Edit = 0;
else if(ask_question) ask_question = 0;
else {
if(ask_question) ask_question = 0;
else if(Edit) {
if(what_doing == 0) {
if(setup_cursor == 1) {
addr_len = ConvertHexToArray((char*)payload, addr, 5);
} else if(setup_cursor == 2) {
NRF_channel = str_to_int((char*)payload);
if(NRF_channel > MAX_CHANNEL) NRF_channel = MAX_CHANNEL;
}
}
Edit = 0;
} else {
if(what_doing == 2 && Edited) {
ask_question = ask_return;
ask_question_answer = 1;
} else if(what_doing == 0) {
processing = false;
} else {
} else if(what_doing != 0) {
if(what_doing) what_doing--;
if(what_doing == 0) rw_type = rwt_read_batch;
if(what_doing <= 1) view_x = 0;
Expand Down

0 comments on commit 0cbad41

Please sign in to comment.