APMrover2: move version to a static member

We should never include version.h or ap_version.h headers directly
on a header since this will trigger a complete rebuild of the
codebase when we commit to the repository. The ap_version.h header
is auto-generated containing information from the current commit.

If we include it in a header, every other file that ends up including
that header (directly or indirectly) will need to be rebuilt. No
ccache's cache beats having to do nothing when the header is just
not included.

version.h contains information that is kept on a struct inside
each vehicle. Rather than using the macros from each vehicle,
the getter should be preferred, which returns an AP_FWVersion
referente.
This commit is contained in:
Lucas De Marchi 2017-09-12 11:25:20 -07:00
parent ecd204c45c
commit 0c49b7a973
3 changed files with 45 additions and 13 deletions

View File

@ -17,7 +17,10 @@
*/
#include "Rover.h"
#define FORCE_VERSION_H_INCLUDE
#include "version.h"
#undef FORCE_VERSION_H_INCLUDE
Rover::Rover(void) :
param_loader(var_info),

View File

@ -92,7 +92,6 @@
#include "Parameters.h"
#include "GCS_Mavlink.h"
#include "GCS_Rover.h"
#include "version.h"
class Rover : public AP_HAL::HAL::Callbacks {
public:
@ -119,18 +118,7 @@ public:
void loop(void) override;
private:
const AP_FWVersion fwver {
major: FW_MAJOR,
minor: FW_MINOR,
patch: FW_PATCH,
fw_type: FW_TYPE,
#ifndef GIT_VERSION
fw_string: THISFIRMWARE
#else
fw_string: THISFIRMWARE " (" GIT_VERSION ")"
#endif
};
static const AP_FWVersion fwver;
// must be the first AP_Param variable declared to ensure its
// constructor runs before the constructors of the other AP_Param

41
APMrover2/version.cpp Normal file
View File

@ -0,0 +1,41 @@
/*
* This file is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This file is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Rover.h"
#define FORCE_VERSION_H_INCLUDE
#include "version.h"
#undef FORCE_VERSION_H_INCLUDE
#include <AP_Common/AP_FWVersion.h>
const AP_FWVersion Rover::fwver{
.major = FW_MAJOR,
.minor = FW_MINOR,
.patch = FW_PATCH,
.fw_type = FW_TYPE,
#ifndef GIT_VERSION
.fw_string = THISFIRMWARE,
#else
.fw_string = THISFIRMWARE " (" GIT_VERSION ")",
.fw_hash_str = GIT_VERSION,
#endif
#ifdef PX4_GIT_VERSION
.middleware_hash_str = PX4_GIT_VERSION,
#endif
#ifdef NUTTX_GIT_VERSION
.os_hash_str = NUTTX_GIT_VERSION,
#endif
};