jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update processor

Browse Source
This commit is contained in:
fvanroie 2020-05-22 20:29:32 +02:00
parent f565ebab28
commit 3593b2c6da
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hasp_hal.cpp
View File

@ -126,13 +126,14 @@ String halGetChipModel()
{ {
String model((char *)0); String model((char *)0);
model.reserve(128); model.reserve(128);
model = F("STM32");
#if ESP8266 #if defined(STM32F4xx)
model = F("STM32F4xx");
#elif defined(ARDUINO_ARCH_ESP8266)
model = F("ESP8266"); model = F("ESP8266");
#endif
#if ESP32 #elif defined(ARDUINO_ARCH_ESP32)
esp_chip_info_t chip_info; esp_chip_info_t chip_info;
esp_chip_info(&chip_info); esp_chip_info(&chip_info);
@ -152,7 +153,10 @@ String halGetChipModel()
} }
model += F(" rev"); model += F(" rev");
model += chip_info.revision; model += chip_info.revision;
#endif // ESP32
#else
model = F("Unknown");
#endif
return model; return model;
} }

2
src/hasp_tft.cpp
View File

@ -57,7 +57,7 @@ void tftShowConfig(TFT_eSPI & tft)
// #else // #else
// Log.verbose(F("TFT: Processor : STM%x"), tftSetup.esp); // Log.verbose(F("TFT: Processor : STM%x"), tftSetup.esp);
// #endif // #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()); Log.verbose(F("TFT: CPU freq. : %i MHz"), halGetCpuFreqMHz());
#if defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP8266)