From 6b1f59372c10fabda5fd74ded59fcb00150c90e4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Nov 2013 22:29:29 +1100
Subject: [PATCH] Copter: show git and firmware version in tlog

---
 ArduCopter/GCS_Mavlink.pde |  4 +++-
 ArduCopter/Log.pde         |  3 ++-
 ArduCopter/config.h        | 10 ++++++++++
 ArduCopter/system.pde      |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ArduCopter/GCS_Mavlink.pde b/ArduCopter/GCS_Mavlink.pde
index 26edf454d7..544360fec8 100644
--- a/ArduCopter/GCS_Mavlink.pde
+++ b/ArduCopter/GCS_Mavlink.pde
@@ -1478,8 +1478,10 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
         mavlink_msg_param_request_list_decode(msg, &packet);
         if (mavlink_check_target(packet.target_system,packet.target_component)) break;
 
-        // Start sending parameters - next call to ::update will kick the first one out
+        // mark the firmware version in the tlog
+        send_text_P(SEVERITY_LOW, PSTR(FIRMWARE_STRING));
 
+        // Start sending parameters - next call to ::update will kick the first one out
         _queued_parameter = AP_Param::first(&_queued_parameter_token, &_queued_parameter_type);
         _queued_parameter_index = 0;
         _queued_parameter_count = _count_parameters();
diff --git a/ArduCopter/Log.pde b/ArduCopter/Log.pde
index ea815b4580..90ecd4ff6a 100644
--- a/ArduCopter/Log.pde
+++ b/ArduCopter/Log.pde
@@ -832,7 +832,7 @@ static void Log_Read(uint16_t log_num, uint16_t start_page, uint16_t end_page)
     cliSerial->printf_P(PSTR((AIRFRAME_NAME)));
  #endif
 
-    cliSerial->printf_P(PSTR("\n" THISFIRMWARE
+    cliSerial->printf_P(PSTR("\n" FIRMWARE_STRING
                              "\nFree RAM: %u\n"),
                         (unsigned) memcheck_available_memory());
 
@@ -851,6 +851,7 @@ static void start_logging()
     if (g.log_bitmask != 0 && !ap.logging_started) {
         ap.logging_started = true;
         DataFlash.StartNewLog(sizeof(log_structure)/sizeof(log_structure[0]), log_structure);
+        DataFlash.Log_Write_Message_P(PSTR(FIRMWARE_STRING));
     }
 }
 
diff --git a/ArduCopter/config.h b/ArduCopter/config.h
index 5e206a8f90..705bb93099 100644
--- a/ArduCopter/config.h
+++ b/ArduCopter/config.h
@@ -1053,4 +1053,14 @@
   #  define CLI_ENABLED           ENABLED
 #endif
 
+/*
+  build a firmware version string.
+  GIT_VERSION comes from Makefile builds
+*/
+#ifndef GIT_VERSION
+#define FIRMWARE_STRING THISFIRMWARE
+#else
+#define FIRMWARE_STRING THISFIRMWARE " (" GIT_VERSION ")"
+#endif
+
 #endif // __ARDUCOPTER_CONFIG_H__
diff --git a/ArduCopter/system.pde b/ArduCopter/system.pde
index d3eab2e6c4..cbf66e577d 100644
--- a/ArduCopter/system.pde
+++ b/ArduCopter/system.pde
@@ -103,7 +103,7 @@ static void init_ardupilot()
     hal.uartB->begin(38400, 256, 16);
 #endif
 
-    cliSerial->printf_P(PSTR("\n\nInit " THISFIRMWARE
+    cliSerial->printf_P(PSTR("\n\nInit " FIRMWARE_STRING
                          "\n\nFree RAM: %u\n"),
                     memcheck_available_memory());