Add ESP.getCoreVersion() and update ESP.getChipModel()

Author: me-no-dev

cores/esp32/Esp.cpp

@@ -258,7 +258,7 @@ uint32_t EspClass::getFreeSketchSpace () {
     return _partition->size;
 }
 
-uint8_t EspClass::getChipRevision(void)
+uint16_t EspClass::getChipRevision(void)
 {
     esp_chip_info_t chip_info;
     esp_chip_info(&chip_info);
@@ -306,10 +306,18 @@ const char * EspClass::getChipModel(void)
     default:
       return "ESP32-S2 (Unknown)";
     }
-#elif CONFIG_IDF_TARGET_ESP32S3
-    return "ESP32-S3";
-#elif CONFIG_IDF_TARGET_ESP32C3
-    return "ESP32-C3";
+#else
+    esp_chip_info_t chip_info;
+    esp_chip_info(&chip_info);
+    switch(chip_info.model){
+        case CHIP_ESP32S3: return "ESP32-S3";
+        case CHIP_ESP32C3: return "ESP32-C3";
+        case CHIP_ESP32H4: return "ESP32-H4";
+        case CHIP_ESP32C2: return "ESP32-C2";
+        case CHIP_ESP32C6: return "ESP32-C6";
+        case CHIP_ESP32H2: return "ESP32-H2";
+        default: return "UNKNOWN";
+    }
 #endif
 }
 
@@ -325,6 +333,11 @@ const char * EspClass::getSdkVersion(void)
     return esp_get_idf_version();
 }
 
+const char * EspClass::getCoreVersion(void)
+{
+    return ESP_ARDUINO_VERSION_STR;
+}
+
 uint32_t ESP_getFlashChipId(void)
 {
   uint32_t id = g_rom_flashchip.device_id;

cores/esp32/Esp.h

@@ -77,12 +77,14 @@ class EspClass
     uint32_t getMinFreePsram();
     uint32_t getMaxAllocPsram();
 
-    uint8_t getChipRevision();
+    uint16_t getChipRevision();
     const char * getChipModel();
     uint8_t getChipCores();
     uint32_t getCpuFreqMHz(){ return getCpuFrequencyMhz(); }
     inline uint32_t getCycleCount() __attribute__((always_inline));
-    const char * getSdkVersion();
+
+    const char * getSdkVersion(); //version of ESP-IDF
+    const char * getCoreVersion();//version of this core
 
     void deepSleep(uint32_t time_us);
 

cores/esp32/esp_arduino_version.h

@@ -41,6 +41,13 @@ extern "C" {
                                              ESP_ARDUINO_VERSION_MINOR, \
                                              ESP_ARDUINO_VERSION_PATCH)
 
+/**
+ * Current ARDUINO version, as string
+ */
+#define df2xstr(s) #s
+#define df2str(s) df2xstr(s)
+#define ESP_ARDUINO_VERSION_STR df2str(ESP_ARDUINO_VERSION_MAJOR) "." df2str(ESP_ARDUINO_VERSION_MINOR) "." df2str(ESP_ARDUINO_VERSION_PATCH)
+
 #ifdef __cplusplus
 }
 #endif