From: Ivan Grokhotkov <ivan@espressif.com>
Date: Thu, 6 Dec 2018 07:01:32 +0000 (+0800)
Subject: examples/console: don’t use raw string literals in C code
X-Git-Tag: v3.3-beta1~6^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94f2dd27d4329ff63875a0456f92994f9db34ba1;p=esp-idf

examples/console: don’t use raw string literals in C code

Raw string literals are a C++ feature, and GCC supports them for C as
an extension. Clang doesn’t support them.

Ref LLVM-11
---

diff --git a/examples/system/console/components/cmd_system/cmd_system.c b/examples/system/console/components/cmd_system/cmd_system.c
index 46d265a037..80fecee015 100644
--- a/examples/system/console/components/cmd_system/cmd_system.c
+++ b/examples/system/console/components/cmd_system/cmd_system.c
@@ -37,7 +37,6 @@ static void register_version();
 static void register_restart();
 static void register_deep_sleep();
 static void register_light_sleep();
-static void register_make();
 #if WITH_TASKS_INFO
 static void register_tasks();
 #endif
@@ -50,7 +49,6 @@ void register_system()
     register_restart();
     register_deep_sleep();
     register_light_sleep();
-    register_make();
 #if WITH_TASKS_INFO
     register_tasks();
 #endif
@@ -342,108 +340,3 @@ static void register_light_sleep()
     ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
 }
 
-/** This command helps maintain sanity when testing console example from a console */
-
-static int make(int argc, char **argv)
-{
-    int count = REG_READ(RTC_CNTL_STORE0_REG);
-    if (++count >= 3) {
-        printf("This is not the console you are looking for.\n");
-        return 0;
-    }
-    REG_WRITE(RTC_CNTL_STORE0_REG, count);
-
-    const char *make_output =
-        R"(LD build/console.elf
-esptool.py v2.1-beta1
-)";
-
-    const char* flash_output[] = {
-R"(Flashing binaries to serial port (*) (app at offset 0x10000)...
-esptool.py v2.1-beta1
-Connecting....
-)",
-R"(Chip is ESP32D0WDQ6 (revision 0)
-Uploading stub...
-Running stub...
-Stub running...
-Changing baud rate to 921600
-Changed.
-Configuring flash size...
-Auto-detected Flash size: 4MB
-Flash params set to 0x0220
-Compressed 15712 bytes to 9345...
-)",
-R"(Wrote 15712 bytes (9345 compressed) at 0x00001000 in 0.1 seconds (effective 1126.9 kbit/s)...
-Hash of data verified.
-Compressed 333776 bytes to 197830...
-)",
-R"(Wrote 333776 bytes (197830 compressed) at 0x00010000 in 3.3 seconds (effective 810.3 kbit/s)...
-Hash of data verified.
-Compressed 3072 bytes to 82...
-)",
-R"(Wrote 3072 bytes (82 compressed) at 0x00008000 in 0.0 seconds (effective 1588.4 kbit/s)...
-Hash of data verified.
-Leaving...
-Hard resetting...
-)"
-    };
-
-    const char* monitor_output =
-R"(MONITOR
-)" LOG_COLOR_W R"(--- idf_monitor on (*) 115200 ---
---- Quit: Ctrl+] | Menu: Ctrl+T | Help: Ctrl+T followed by Ctrl+H --
-)" LOG_RESET_COLOR;
-
-    bool need_make = false;
-    bool need_flash = false;
-    bool need_monitor = false;
-    for (int i = 1; i < argc; ++i) {
-        if (strcmp(argv[i], "all") == 0) {
-            need_make = true;
-        } else if (strcmp(argv[i], "flash") == 0) {
-            need_make = true;
-            need_flash = true;
-        } else if (strcmp(argv[i], "monitor") == 0) {
-            need_monitor = true;
-        } else if (argv[i][0] == '-') {
-            /* probably -j option */
-        } else if (isdigit((int) argv[i][0])) {
-            /* might be an argument to -j */
-        } else {
-            printf("make: *** No rule to make target `%s'.  Stop.\n", argv[i]);
-            /* Technically this is an error, but let's not spoil the output */
-            return 0;
-        }
-    }
-    if (argc == 1) {
-        need_make = true;
-    }
-    if (need_make) {
-        printf("%s", make_output);
-    }
-    if (need_flash) {
-        size_t n_items = sizeof(flash_output) / sizeof(flash_output[0]);
-        for (int i = 0; i < n_items; ++i) {
-            printf("%s", flash_output[i]);
-            vTaskDelay(200/portTICK_PERIOD_MS);
-        }
-    }
-    if (need_monitor) {
-        printf("%s", monitor_output);
-        esp_restart();
-    }
-    return 0;
-}
-
-static void register_make()
-{
-    const esp_console_cmd_t cmd = {
-        .command = "make",
-        .help = NULL, /* hide from 'help' output */
-        .hint = "all | flash | monitor",
-        .func = &make,
-    };
-    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
-}
-