From 798f5e6826bad842139c491a3b54a2eb226591a2 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 31 Oct 2016 21:32:15 +0100
Subject: [PATCH] Display commit on radio

This makes it easier to diagnose which exact version is on a radio when dealing with build from source version
---
 cmake/Macros.cmake  | 4 ++--
 radio/src/stamp.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
index 689626b2d..76f5cc874 100644
--- a/cmake/Macros.cmake
+++ b/cmake/Macros.cmake
@@ -27,10 +27,10 @@ endmacro(now)
 
 macro(git_id RESULT)
   if(WIN32)
-    execute_process(COMMAND "cmd" " /C git --git-dir=${PROJECT_SOURCE_DIR}/.git rev-parse HEAD" OUTPUT_VARIABLE ${RESULT})
+    execute_process(COMMAND "cmd" " /C git --git-dir=${PROJECT_SOURCE_DIR}/.git rev-parse --short=8 HEAD" OUTPUT_VARIABLE ${RESULT})
     string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})
   elseif(UNIX)
-    execute_process(COMMAND "git" "--git-dir=${PROJECT_SOURCE_DIR}/.git" "rev-parse" "HEAD" OUTPUT_VARIABLE ${RESULT})
+    execute_process(COMMAND "git" "--git-dir=${PROJECT_SOURCE_DIR}/.git" "rev-parse" "--short=8" "HEAD" OUTPUT_VARIABLE ${RESULT})
     string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})
   else(WIN32)
     message(SEND_ERROR "Git ID implemented")
diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp
index ca65e5c26..fb022f364 100644
--- a/radio/src/stamp.cpp
+++ b/radio/src/stamp.cpp
@@ -37,12 +37,12 @@
 #endif
 
 #if defined(COLORLCD)
-  const pm_char vers_stamp[] PROGMEM =   "VERS" TAB ": " "opentx-" FLAVOUR "-" VERSION;
+  const pm_char vers_stamp[] PROGMEM =   "VERS" TAB ": " "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")";
   const pm_char date_stamp[] PROGMEM =   "DATE" TAB ": " DATE;
   const pm_char time_stamp[] PROGMEM =   "TIME" TAB ": " TIME;
   const pm_char eeprom_stamp[] PROGMEM = "EEPR" TAB ": " EEPROM_STR;
 #elif defined(PCBTARANIS)
-  const pm_char vers_stamp[] PROGMEM = "FW\037\033: " "opentx-" FLAVOUR "\036VERS\037\033: " VERSION "\036DATE\037\033: " DATE " " TIME "\036EEPR\037\033: " EEPROM_STR;
+  const pm_char vers_stamp[] PROGMEM = "FW\037\033: " "opentx-" FLAVOUR "\036VERS\037\033: " VERSION " (" GIT_STR ")" "\036DATE\037\033: " DATE " " TIME "\036EEPR\037\033: " EEPROM_STR;
 #else
   const pm_char vers_stamp[] PROGMEM = "FW\037\033: " "opentx-" FLAVOUR "\036VERS\037\033: " VERSION "\036DATE\037\033: " DATE "\036TIME\037\033: " TIME "\036EEPR\037\033: " EEPROM_STR;
 #endif