Merge remote-tracking branch 'OFW/dev' into dev [ci skip]

applications/services/cli/application.fam

@@ -22,7 +22,7 @@ App(
     entry_point="cli_vcp_srv",
     stack_size=1024,
     order=10,
-    sdk_headers=["cli_vcp.h"],
+    sdk_headers=["cli_vcp.h", "cli.h"],
     sources=["cli_vcp.c"],
 )
 

applications/services/cli/cli.h

@@ -0,0 +1,13 @@
+#pragma once
+
+/* 
+ * Compatibility header for ease of porting existing apps.
+ *  In short: 
+ *   Cli* is replaced with with CliRegistry*
+ *   cli_* functions are replaced with cli_registry_* functions
+ *   (i.e., cli_add_command() is now cli_registry_add_command())
+*/
+
+#include <toolbox/cli/cli_registry.h>
+
+#define RECORD_CLI "cli"

applications/services/cli/cli_main_commands.h

@@ -1,9 +1,9 @@
 #pragma once
 
+#include "cli.h"
 #include <toolbox/cli/cli_command.h>
 #include <toolbox/cli/cli_registry.h>
 
-#define RECORD_CLI "cli"
-#define CLI_APPID  "cli"
+#define CLI_APPID "cli"
 
 void cli_main_commands_init(CliRegistry* registry);