From f7d80ed9da6122acc2b96f6350628fa9fa7b1b29 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 20 Sep 2019 17:07:34 +1000 Subject: [PATCH] Hello world example: Print ESP32-S2 Beta for esp32s2beta target --- components/esp_common/include/esp_system.h | 2 +- .../get-started/hello_world/main/hello_world_main.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/components/esp_common/include/esp_system.h b/components/esp_common/include/esp_system.h index 7d161f7212..46c2b88350 100644 --- a/components/esp_common/include/esp_system.h +++ b/components/esp_common/include/esp_system.h @@ -237,7 +237,7 @@ esp_err_t esp_derive_local_mac(uint8_t* local_mac, const uint8_t* universal_mac) */ typedef enum { CHIP_ESP32 = 1, //!< ESP32 - CHIP_ESP32S2BETA = 2, //!< ESP32S2BETA + CHIP_ESP32S2BETA = 2, //!< ESP32-S2 Beta } esp_chip_model_t; /* Chip feature flags, used in esp_chip_info_t */ diff --git a/examples/get-started/hello_world/main/hello_world_main.c b/examples/get-started/hello_world/main/hello_world_main.c index 7bb54d2fde..2586eb1a84 100644 --- a/examples/get-started/hello_world/main/hello_world_main.c +++ b/examples/get-started/hello_world/main/hello_world_main.c @@ -7,11 +7,19 @@ CONDITIONS OF ANY KIND, either express or implied. */ #include +#include "sdkconfig.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "esp_system.h" #include "esp_spi_flash.h" +#ifdef CONFIG_IDF_TARGET_ESP32 +#define CHIP_NAME "ESP32" +#endif + +#ifdef CONFIG_IDF_TARGET_ESP32S2BETA +#define CHIP_NAME "ESP32-S2 Beta" +#endif void app_main(void) { @@ -20,7 +28,8 @@ void app_main(void) /* Print chip information */ esp_chip_info_t chip_info; esp_chip_info(&chip_info); - printf("This is ESP32 chip with %d CPU cores, WiFi%s%s, ", + printf("This is %s chip with %d CPU cores, WiFi%s%s, ", + CHIP_NAME, chip_info.cores, (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");