Browse Source

Plane: set os_sw_version to date fw was compiled

Also avoids non-trivial-designator compilation error
master
Peter Barker 7 years ago committed by Andrew Tridgell
parent
commit
53d2a6c1e2
  1. 16
      ArduPlane/version.cpp

16
ArduPlane/version.cpp

@ -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 "Plane.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
@ -25,17 +23,27 @@ const AP_FWVersion AP_FWVersion::fwver{
.major = FW_MAJOR, .major = FW_MAJOR,
.minor = FW_MINOR, .minor = FW_MINOR,
.patch = FW_PATCH, .patch = FW_PATCH,
.fw_type = (enum FIRMWARE_VERSION_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
}; };

Loading…
Cancel
Save