Fix Arduino example usage without progmem usage

Author: J-Rios

examples/arduino/basic_usage/src/main.cpp

@@ -76,7 +76,7 @@ void setup()
 
     // CLI init to use Serial as interface
     Cli.setup(&Serial, SERIAL_BAUDS);
-    Cli.printf(PSTR("\nCommand Line Interface is ready\n\n"));
+    Cli.printf("\nCommand Line Interface is ready\n\n");
 }
 
 void loop()
@@ -87,21 +87,21 @@ void loop()
     if(Cli.manage(&cli_read))
     {
         // Show read result element
-        Cli.printf(PSTR("Command received: %s\n"), cli_read.cmd);
-        Cli.printf(PSTR("Number of arguments: %d\n"), (int)(cli_read.argc));
+        Cli.printf("Command received: %s\n", cli_read.cmd);
+        Cli.printf("Number of arguments: %d\n"), (int)(cli_read.argc);
         for(int i = 0; i < cli_read.argc; i++)
-            Cli.printf(PSTR("    Argument %d: %s"), i, cli_read.argv[i]);
-        Cli.printf(PSTR("\n"));
+            Cli.printf("    Argument %d: %s", i, cli_read.argv[i]);
+        Cli.printf("\n");
 
         // Handle Commands
-        if(strcmp(cli_read.cmd, PSTR("help")) == 0)
+        if(strcmp(cli_read.cmd, "help") == 0)
         {
-            Cli.printf(PSTR("Available Commands:\n"));
-            Cli.printf(PSTR("  help - Current info.\n"));
-            Cli.printf(PSTR("  led [on/off] - Turn LED ON or OFF.\n"));
-            Cli.printf(PSTR("  version - Shows current firmware version.\n"));
+            Cli.printf("Available Commands:\n");
+            Cli.printf("  help - Current info.\n");
+            Cli.printf("  led [on/off] - Turn LED ON or OFF.\n");
+            Cli.printf("  version - Shows current firmware version.\n");
         }
-        else if(strcmp(cli_read.cmd, PSTR("led")) == 0)
+        else if(strcmp(cli_read.cmd, "led") == 0)
         {
             bool invalid_argv = false;
             char* led_mode = NULL;
@@ -112,30 +112,30 @@ void loop()
             else
             {
                 led_mode = cli_read.argv[0];
-                if(strcmp(led_mode, PSTR("on")) == 0)
+                if(strcmp(led_mode, "on") == 0)
                 {
-                    Cli.printf(PSTR("Turning LED ON.\n"));
+                    Cli.printf("Turning LED ON.\n");
                     digitalWrite(COMMAND_LED, HIGH);
                 }
-                else if(strcmp(led_mode, PSTR("off")) == 0)
+                else if(strcmp(led_mode, "off") == 0)
                 {
-                    Cli.printf(PSTR("Turning LED OFF.\n"));
+                    Cli.printf("Turning LED OFF.\n");
                     digitalWrite(COMMAND_LED, LOW);
                 }
                 else
                     invalid_argv = true;
             }
 
             if(invalid_argv)
-                Cli.printf(PSTR("led command needs \"on\" or \"off\" arg.\n"));
+                Cli.printf("led command needs \"on\" or \"off\" arg.\n");
         }
-        else if(strcmp(cli_read.cmd, PSTR("version")) == 0)
+        else if(strcmp(cli_read.cmd, "version") == 0)
         {
-            Cli.printf(PSTR("FW App Version: %s\n"), FW_APP_VERSION);
+            Cli.printf("FW App Version: %s\n", FW_APP_VERSION);
         }
         // ...
         else
-            Cli.printf(PSTR("Unkown command.\n"));
-        Cli.printf(PSTR("\n"));
+            Cli.printf("Unkown command.\n");
+        Cli.printf("\n");
     }
 }

examples/arduino/basic_usage_callbacks/src/main.cpp

@@ -91,14 +91,14 @@ void setup()
     Cli.setup(&Serial, SERIAL_BAUDS);
 
     // Add commands and bind callbacks to them
-    Cli.add_cmd("led", &cmd_led, PSTR("led [on/off], Turn LED ON/OFF."));
-    Cli.add_cmd("version", &cmd_version, PSTR("Shows firmware version."));
+    Cli.add_cmd("led", &cmd_led, "led [on/off], Turn LED ON/OFF.");
+    Cli.add_cmd("version", &cmd_version, "Shows firmware version.");
 
     // The "help" command is already builtin and available from the CLI, and it
     // will shows added command descriptions, but you can setup a custom one
-    Cli.add_cmd("help", &cmd_help, PSTR("Shows program help information."));
+    Cli.add_cmd("help", &cmd_help, "Shows program help information.");
 
-    Cli.printf(PSTR("\nCommand Line Interface is ready\n\n"));
+    Cli.printf("\nCommand Line Interface is ready\n\n");
 }
 
 void loop()
@@ -117,8 +117,8 @@ void loop()
 void cmd_help(MINBASECLI* Cli, int argc, char* argv[])
 {
     // Show some Info text
-    Cli->printf(PSTR("\nCustom Help Command\n"));
-    Cli->printf(PSTR("MINBASECLI basic_usage_callbacks %s\n"), FW_APP_VERSION);
+    Cli->printf("\nCustom Help Command\n");
+    Cli->printf("MINBASECLI basic_usage_callbacks %s\n", FW_APP_VERSION);
 
     // Call the builtin "help" function to show added command descriptions
     Cli->cmd_help(argc, argv);
@@ -135,25 +135,25 @@ void cmd_led(MINBASECLI* Cli, int argc, char* argv[])
         char* test_mode = argv[0];
         if(strcmp(test_mode, "on") == 0)
         {
-            Cli->printf(PSTR("Turning LED ON.\n"));
+            Cli->printf("Turning LED ON.\n");
             digitalWrite(COMMAND_LED, HIGH);
         }
         else if(strcmp(test_mode, "off") == 0)
         {
-            Cli->printf(PSTR("Turning LED OFF.\n"));
+            Cli->printf("Turning LED OFF.\n");
             digitalWrite(COMMAND_LED, LOW);
         }
         else
             { invalid_argv = true; }
     }
 
     if(invalid_argv)
-        { Cli->printf(PSTR("led command needs \"on\" or \"off\" arg.\n")); }
+        { Cli->printf("led command needs \"on\" or \"off\" arg.\n"); }
 
-    Cli->printf(PSTR("\n"));
+    Cli->printf("\n");
 }
 
 void cmd_version(MINBASECLI* Cli, int argc, char* argv[])
 {
-    Cli->printf(PSTR("FW App Version: %s\n"), FW_APP_VERSION);
+    Cli->printf("FW App Version: %s\n", FW_APP_VERSION);
 }