RELEASE using same values

Author: mcspr

cores/esp8266/Esp-version.cpp

@@ -20,10 +20,11 @@
 
 #include <Arduino.h>
 #include <user_interface.h>
-#include <core_version.h>
 #include <lwipopts.h>       // LWIP_HASH_STR (lwip2)
 #include <bearssl/bearssl_git.h>  // BEARSSL_GIT short hash
 
+#include <core_version.h>
+
 #define STRHELPER(x) #x
 #define STR(x) STRHELPER(x) // stringifier
 

cores/esp8266/Esp.cpp

@@ -254,7 +254,7 @@ String EspClass::getCoreVersion()
         return String(core_release);
     }
     char buf[12];
-    snprintf(buf, sizeof(buf), "%08x", core_version);
+    snprintf(buf, sizeof(buf), PSTR("%08x"), core_version);
     return String(buf);
 }
 

tools/makecorever.py

@@ -109,13 +109,8 @@ def git(*args):
 #define ARDUINO_ESP8266_REVISION  {revision}
 """
     if release:
-        if version != VERSION_UNSPECIFIED:
-            release_version = version
-        else:
-            release_version = git_desc
-
         text += rf"""
-#define ARDUINO_ESP8266_RELEASE   \"{release_version}\"
+#define ARDUINO_ESP8266_RELEASE   \"{major}.{minor}.{revision}\"
 #define ARDUINO_ESP8266_RELEASE_{major}_{minor}_{revision}
 """
     else: