Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rover: set os_sw_version to date fw was compiled 

Also avoids non-trivial-designator compilation error
This commit is contained in:
Peter Barker 2017-11-27 12:26:48 +11:00 committed by Andrew Tridgell
parent 53d2a6c1e2
commit ced80adaa5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
APMrover2/version.cpp
View File

@ -13,8 +13,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Rover.h"
#define FORCE_VERSION_H_INCLUDE #define FORCE_VERSION_H_INCLUDE
#include "version.h" #include "version.h"
#undef FORCE_VERSION_H_INCLUDE #undef FORCE_VERSION_H_INCLUDE
@ -28,14 +26,24 @@ const AP_FWVersion AP_FWVersion::fwver{
.fw_type = FW_TYPE, .fw_type = FW_TYPE,
#ifndef GIT_VERSION #ifndef GIT_VERSION
.fw_string = THISFIRMWARE, .fw_string = THISFIRMWARE,
.fw_hash_str = "",
#else #else
.fw_string = THISFIRMWARE " (" GIT_VERSION ")", .fw_string = THISFIRMWARE " (" GIT_VERSION ")",
.fw_hash_str = GIT_VERSION, .fw_hash_str = GIT_VERSION,
#endif #endif
#ifdef CHIBIOS_GIT_VERSION
.middleware_name = nullptr, .middleware_name = nullptr,
.middleware_hash_str = nullptr, .middleware_hash_str = nullptr,
#ifdef CHIBIOS_GIT_VERSION
.os_name = "ChibiOS", .os_name = "ChibiOS",
.os_hash_str = CHIBIOS_GIT_VERSION, .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 #endif
}; };