Merge pull request #3232 from mobrembski/fix_no_compiletime_defines_in_esp32

Fixed compile-time defines not working in ESP32 platform

Author: TD-er

src/src/Helpers/CompiletimeDefines.cpp

@@ -13,11 +13,11 @@
 #endif // ifndef SET_BUILD_GIT_HEAD
 
 String get_binary_filename() {
-  #ifndef CORE_POST_2_5_0
-    return F("firmware.bin");
-  #else
+ #if !defined(CORE_POST_2_5_0) && !defined(ESP32)
+   return F("firmware.bin");
+ #else
     return F(SET_BUILD_BINARY_FILENAME);
-  #endif
+ #endif
 }
 
 String get_build_time() {
@@ -39,17 +39,17 @@ String get_build_origin() {
 }
 
 String get_build_platform() {
-  #ifndef CORE_POST_2_5_0
+ #if !defined(CORE_POST_2_5_0) && !defined(ESP32)
     return "";
   #else
     return F(SET_BUILD_PLATFORM);
-  #endif
+ #endif
 }
 
 String get_git_head() {
-  #ifndef CORE_POST_2_5_0
-    return "";
-  #else
+ #if !defined(CORE_POST_2_5_0) && !defined(ESP32)
+   return "";
+ #else
     return F(SET_BUILD_GIT_HEAD);
-  #endif
+ #endif
 }

tools/pio/generate-compiletime-defines.py

@@ -17,7 +17,8 @@ def get_git_description():
     try:
         from pygit2 import Repository
         try:
-            return Repository('.').head.shorthand
+            repo = Repository('.')
+            return "'{0}_{1}'".format(repo.head.shorthand, repo.revparse_single('HEAD').short_id)
         except:
             return 'No_.git_dir'
     except ImportError:
@@ -79,4 +80,4 @@ def gen_compiletime_defines(node):
 print("\u001b[32m ------------------------------- \u001b[0m")
 
 
-env.AddBuildMiddleware(gen_compiletime_defines)
+env.AddBuildMiddleware(gen_compiletime_defines)