Browse Source

AP_Common: include integer version of hash in FWVersion struct

gps-1.3.1
Peter Barker 3 years ago committed by Andrew Tridgell
parent
commit
8814486572
  1. 1
      libraries/AP_Common/AP_FWVersion.h
  2. 5
      libraries/AP_Common/AP_FWVersionDefine.h

1
libraries/AP_Common/AP_FWVersion.h

@ -28,6 +28,7 @@ public:
const uint32_t os_sw_version; const uint32_t os_sw_version;
const char *fw_string; const char *fw_string;
const char *fw_hash_str; const char *fw_hash_str;
const uint32_t fw_hash;
const char *fw_string_original; const char *fw_string_original;
const char *fw_short_string; const char *fw_short_string;
const char *middleware_name; const char *middleware_name;

5
libraries/AP_Common/AP_FWVersionDefine.h

@ -59,6 +59,11 @@ const AP_FWVersion AP_FWVersion::fwver{
#else #else
.fw_string = ACTIVE_FWSTR " (" GIT_VERSION ")", .fw_string = ACTIVE_FWSTR " (" GIT_VERSION ")",
.fw_hash_str = GIT_VERSION, .fw_hash_str = GIT_VERSION,
#endif
#ifndef GIT_VERSION_INT
.fw_hash = 0,
#else
.fw_hash = GIT_VERSION_INT,
#endif #endif
.fw_string_original = ORIGINAL_FWSTR, .fw_string_original = ORIGINAL_FWSTR,
.fw_short_string = ACTIVE_FWSTR, .fw_short_string = ACTIVE_FWSTR,

Loading…
Cancel
Save