[FL-2260] IR CLI commands merge (#996)

Co-authored-by: あく <alleteam@gmail.com>

applications/irda/cli/irda_cli.cpp

@@ -13,6 +13,17 @@
 #include <sys/types.h>
 #include "../helpers/irda_parser.h"
 
+static void irda_cli_start_ir_rx(Cli* cli, string_t args);
+static void irda_cli_start_ir_tx(Cli* cli, string_t args);
+
+static const struct {
+    const char* cmd;
+    void (*process_function)(Cli* cli, string_t args);
+} irda_cli_commands[] = {
+    {.cmd = "rx", .process_function = irda_cli_start_ir_rx},
+    {.cmd = "tx", .process_function = irda_cli_start_ir_tx},
+};
+
 static void signal_received_callback(void* context, IrdaWorkerSignal* received_signal) {
     furi_assert(received_signal);
     char buf[100];
@@ -48,12 +59,7 @@ static void signal_received_callback(void* context, IrdaWorkerSignal* received_s
     }
 }
 
-void irda_cli_start_ir_rx(Cli* cli, string_t args, void* context) {
+static void irda_cli_start_ir_rx(Cli* cli, string_t args) {
-    if(furi_hal_irda_is_busy()) {
-        printf("IRDA is busy. Exit.");
-        return;
-    }
-
     IrdaWorker* worker = irda_worker_alloc();
     irda_worker_rx_start(worker);
     irda_worker_rx_set_received_signal_callback(worker, signal_received_callback, cli);
@@ -68,7 +74,9 @@ void irda_cli_start_ir_rx(Cli* cli, string_t args, void* context) {
 }
 
 static void irda_cli_print_usage(void) {
-    printf("Usage:\r\n\tir_tx <protocol> <address> <command>\r\n");
+    printf("Usage:\r\n");
+    printf("\tir rx\r\n");
+    printf("\tir tx <protocol> <address> <command>\r\n");
     printf("\t<command> and <address> are hex-formatted\r\n");
     printf("\tAvailable protocols:");
     for(int i = 0; irda_is_protocol_valid((IrdaProtocol)i); ++i) {
@@ -131,12 +139,7 @@ static bool parse_signal_raw(
     return irda_parser_is_raw_signal_valid(*frequency, *duty_cycle, *timings_cnt);
 }
 
-void irda_cli_start_ir_tx(Cli* cli, string_t args, void* context) {
+static void irda_cli_start_ir_tx(Cli* cli, string_t args) {
-    if(furi_hal_irda_is_busy()) {
-        printf("IRDA is busy. Exit.");
-        return;
-    }
-
     IrdaMessage message;
     const char* str = string_get_cstr(args);
     uint32_t frequency;
@@ -156,11 +159,38 @@ void irda_cli_start_ir_tx(Cli* cli, string_t args, void* context) {
     free(timings);
 }
 
+static void irda_cli_start_ir(Cli* cli, string_t args, void* context) {
+    if(furi_hal_irda_is_busy()) {
+        printf("IRDA is busy. Exit.");
+        return;
+    }
+
+    size_t i = 0;
+    for(; i < COUNT_OF(irda_cli_commands); ++i) {
+        size_t size = strlen(irda_cli_commands[i].cmd);
+        bool cmd_found = !strncmp(string_get_cstr(args), irda_cli_commands[i].cmd, size);
+        if(cmd_found) {
+            if(string_size(args) == size) {
+                break;
+            }
+            if(string_get_cstr(args)[size] == ' ') {
+                string_right(args, size);
+                break;
+            }
+        }
+    }
+
+    if(i < COUNT_OF(irda_cli_commands)) {
+        irda_cli_commands[i].process_function(cli, args);
+    } else {
+        irda_cli_print_usage();
+    }
+}
+
 extern "C" void irda_on_system_start() {
 #ifdef SRV_CLI
     Cli* cli = (Cli*)furi_record_open("cli");
-    cli_add_command(cli, "ir_rx", CliCommandFlagDefault, irda_cli_start_ir_rx, NULL);
+    cli_add_command(cli, "ir", CliCommandFlagDefault, irda_cli_start_ir, NULL);
-    cli_add_command(cli, "ir_tx", CliCommandFlagDefault, irda_cli_start_ir_tx, NULL);
     furi_record_close("cli");
 #endif
 }

applications/irda/helpers/irda_parser.cpp

@@ -96,26 +96,30 @@ bool irda_parser_is_parsed_signal_valid(const IrdaMessage* signal) {
         result = false;
     }
 
-    uint32_t address_length = irda_get_protocol_address_length(signal->protocol);
+    if(result) {
-    uint32_t address_mask = (1LU << address_length) - 1;
+        uint32_t address_length = irda_get_protocol_address_length(signal->protocol);
-    if(signal->address != (signal->address & address_mask)) {
+        uint32_t address_mask = (1LU << address_length) - 1;
-        FURI_LOG_E(
+        if(signal->address != (signal->address & address_mask)) {
-            TAG,
+            FURI_LOG_E(
-            "Address is out of range (mask 0x%08lX): 0x%lX\r\n",
+                TAG,
-            address_mask,
+                "Address is out of range (mask 0x%08lX): 0x%lX\r\n",
-            signal->address);
+                address_mask,
-        result = false;
+                signal->address);
+            result = false;
+        }
     }
 
-    uint32_t command_length = irda_get_protocol_command_length(signal->protocol);
+    if(result) {
-    uint32_t command_mask = (1LU << command_length) - 1;
+        uint32_t command_length = irda_get_protocol_command_length(signal->protocol);
-    if(signal->command != (signal->command & command_mask)) {
+        uint32_t command_mask = (1LU << command_length) - 1;
-        FURI_LOG_E(
+        if(signal->command != (signal->command & command_mask)) {
-            TAG,
+            FURI_LOG_E(
-            "Command is out of range (mask 0x%08lX): 0x%lX\r\n",
+                TAG,
-            command_mask,
+                "Command is out of range (mask 0x%08lX): 0x%lX\r\n",
-            signal->command);
+                command_mask,
-        result = false;
+                signal->command);
+            result = false;
+        }
     }
 
     return result;

lib/irda/encoder_decoder/irda.c

@@ -268,9 +268,11 @@ IrdaProtocol irda_get_protocol_by_name(const char* protocol_name) {
 
 static const IrdaProtocolSpecification* irda_get_spec_by_protocol(IrdaProtocol protocol) {
     int index = irda_find_index_by_protocol(protocol);
-    furi_check(index >= 0);
+    const IrdaProtocolSpecification* spec = NULL;
-    const IrdaProtocolSpecification* spec =
+    if(index >= 0) {
-        irda_encoder_decoder[index].get_protocol_spec(protocol);
+        spec = irda_encoder_decoder[index].get_protocol_spec(protocol);
+    }
+
     furi_assert(spec);
     return spec;
 }