From 3593b2c6da22faff97585f8e8c2beee8eaf90d6e Mon Sep 17 00:00:00 2001 From: fvanroie Date: Fri, 22 May 2020 20:29:32 +0200 Subject: [PATCH] Update processor --- src/hasp_hal.cpp | 14 +++++++++----- src/hasp_tft.cpp | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/hasp_hal.cpp b/src/hasp_hal.cpp index 410e47c4..686ef308 100644 --- a/src/hasp_hal.cpp +++ b/src/hasp_hal.cpp @@ -126,13 +126,14 @@ String halGetChipModel() { String model((char *)0); model.reserve(128); - model = F("STM32"); -#if ESP8266 +#if defined(STM32F4xx) + model = F("STM32F4xx"); + +#elif defined(ARDUINO_ARCH_ESP8266) model = F("ESP8266"); -#endif -#if ESP32 +#elif defined(ARDUINO_ARCH_ESP32) esp_chip_info_t chip_info; esp_chip_info(&chip_info); @@ -152,7 +153,10 @@ String halGetChipModel() } model += F(" rev"); model += chip_info.revision; -#endif // ESP32 + +#else + model = F("Unknown"); +#endif return model; } diff --git a/src/hasp_tft.cpp b/src/hasp_tft.cpp index 88be8366..8453042e 100644 --- a/src/hasp_tft.cpp +++ b/src/hasp_tft.cpp @@ -57,7 +57,7 @@ void tftShowConfig(TFT_eSPI & tft) // #else // Log.verbose(F("TFT: Processor : STM%x"), tftSetup.esp); // #endif - Log.verbose(F("TFT: Processor : %s"), halGetChipModel()); + Log.verbose(F("TFT: Processor : %s"), halGetChipModel().c_str()); Log.verbose(F("TFT: CPU freq. : %i MHz"), halGetCpuFreqMHz()); #if defined(ARDUINO_ARCH_ESP8266)