From e60f92cb43f8569aac9e35dc0be81f1f6bc74b94 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 27 Nov 2017 12:28:09 +1100 Subject: [PATCH] Tracker: set os_sw_version to date fw was compiled Also avoids non-trivial-designator compilation error --- AntennaTracker/version.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/AntennaTracker/version.cpp b/AntennaTracker/version.cpp index 5c2e4a2050..e616abd704 100644 --- a/AntennaTracker/version.cpp +++ b/AntennaTracker/version.cpp @@ -12,7 +12,6 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -#include "Tracker.h" #define FORCE_VERSION_H_INCLUDE #include "version.h" @@ -27,14 +26,24 @@ const AP_FWVersion AP_FWVersion::fwver{ .fw_type = FW_TYPE, #ifndef GIT_VERSION .fw_string = THISFIRMWARE, + .fw_hash_str = "", #else .fw_string = THISFIRMWARE " (" GIT_VERSION ")", .fw_hash_str = GIT_VERSION, #endif -#ifdef CHIBIOS_GIT_VERSION .middleware_name = nullptr, .middleware_hash_str = nullptr, +#ifdef CHIBIOS_GIT_VERSION .os_name = "ChibiOS", .os_hash_str = CHIBIOS_GIT_VERSION, +#else + .os_name = nullptr, + .os_hash_str = nullptr, +#endif +#ifdef BUILD_DATE_YEAR + // encode build date in os_sw_version + .os_sw_version = (BUILD_DATE_YEAR*100*100) + (BUILD_DATE_MONTH*100) + BUILD_DATE_DAY, +#else + .os_sw_version = 0, #endif };