Merge remote-tracking branch 'ofw/dev' into mntm-dev

This commit is contained in:
Willy-JL
2024-10-14 23:44:44 +01:00
167 changed files with 6280 additions and 2155 deletions

View File

@@ -2,6 +2,7 @@
#include <furi.h>
#include <cli/cli.h>
#include <cli/cli_ansi.h>
#include <toolbox/args.h>
static void input_cli_usage(void) {
@@ -73,12 +74,12 @@ static void input_cli_keyboard(Cli* cli, FuriString* args, FuriPubSub* event_pub
FuriPubSub* ascii_pubsub = furi_record_open(RECORD_ASCII_EVENTS);
while(cli_is_connected(cli)) {
char in_chr = cli_getc(cli);
if(in_chr == CliSymbolAsciiETX) break;
if(in_chr == CliKeyETX) break;
InputKey send_key = InputKeyMAX;
uint8_t send_ascii = AsciiValueNUL;
switch(in_chr) {
case CliSymbolAsciiEsc: // Escape code for arrows
case CliKeyEsc: // Escape code for arrows
if(!cli_read(cli, (uint8_t*)&in_chr, 1) || in_chr != '[') break;
if(!cli_read(cli, (uint8_t*)&in_chr, 1)) break;
if(in_chr >= 'A' && in_chr <= 'D') { // Arrows = Dpad
@@ -89,8 +90,8 @@ static void input_cli_keyboard(Cli* cli, FuriString* args, FuriPubSub* event_pub
}
}
break;
case CliSymbolAsciiBackspace: // (minicom) Backspace = Back
case CliSymbolAsciiDel: // (putty/picocom) Backspace = Back
case CliKeyBackspace: // (minicom) Backspace = Back
case CliKeyDEL: // (putty/picocom) Backspace = Back
if(hold) {
send_key = InputKeyBack;
} else {
@@ -104,14 +105,14 @@ static void input_cli_keyboard(Cli* cli, FuriString* args, FuriPubSub* event_pub
send_ascii = AsciiValueESC;
}
break;
case CliSymbolAsciiCR: // Enter = Ok
case CliKeyCR: // Enter = Ok
if(hold) {
send_key = InputKeyOk;
} else {
send_ascii = AsciiValueCR;
}
break;
case CliSymbolAsciiSpace: // Space = Toggle hold next key
case CliKeySpace: // Space = Toggle hold next key
if(hold) {
send_ascii = ' ';
} else {