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

Global: use ap_version.h 

This header is used by waf to contain the generated version macros,
particularly using the git hash. For waf it's better to be in a separate
header since it then can keep track of changes on it a trigger
recompilation.

For the make build system, a dummy ap_version.h file has been added in
the missing/ folder so both implementations can co-exist.
This commit is contained in:
Lucas De Marchi 2016-05-05 19:18:36 -03:00
parent 9e3ec3a16d
commit fea084a596
7 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APMrover2/version.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "ap_version.h"
#define THISFIRMWARE "ArduRover v3.0.0" #define THISFIRMWARE "ArduRover v3.0.0"
#define FIRMWARE_VERSION 3,0,0,FIRMWARE_VERSION_TYPE_OFFICIAL #define FIRMWARE_VERSION 3,0,0,FIRMWARE_VERSION_TYPE_OFFICIAL

2
AntennaTracker/version.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "ap_version.h"
#define THISFIRMWARE "AntennaTracker V0.7.6" #define THISFIRMWARE "AntennaTracker V0.7.6"
#define FIRMWARE_VERSION 0,7,6,FIRMWARE_VERSION_TYPE_DEV #define FIRMWARE_VERSION 0,7,6,FIRMWARE_VERSION_TYPE_DEV

2
ArduCopter/version.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "ap_version.h"
#define THISFIRMWARE "APM:Copter V3.4-dev" #define THISFIRMWARE "APM:Copter V3.4-dev"
#define FIRMWARE_VERSION 3,4,0,FIRMWARE_VERSION_TYPE_DEV #define FIRMWARE_VERSION 3,4,0,FIRMWARE_VERSION_TYPE_DEV

2
ArduPlane/version.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "ap_version.h"
#define THISFIRMWARE "ArduPlane V3.6.0beta1" #define THISFIRMWARE "ArduPlane V3.6.0beta1"
#define FIRMWARE_VERSION 3,6,0,FIRMWARE_VERSION_TYPE_BETA #define FIRMWARE_VERSION 3,6,0,FIRMWARE_VERSION_TYPE_BETA

1
libraries/AP_Common/missing/ap_version.h Normal file
View File

@ -0,0 +1 @@
/* Placeholder header for make build system */

1
libraries/DataFlash/DFMessageWriter.cpp
View File

@ -1,3 +1,4 @@
#include "ap_version.h"
#include "DFMessageWriter.h" #include "DFMessageWriter.h"
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

5
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -16,13 +16,14 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "GCS.h"
#include <AP_AHRS/AP_AHRS.h> #include <AP_AHRS/AP_AHRS.h>
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_OpticalFlow/AP_OpticalFlow.h> #include <AP_OpticalFlow/AP_OpticalFlow.h>
#include <AP_Vehicle/AP_Vehicle.h> #include <AP_Vehicle/AP_Vehicle.h>
#include "ap_version.h"
#include "GCS.h"
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
uint32_t GCS_MAVLINK::last_radio_status_remrssi_ms; uint32_t GCS_MAVLINK::last_radio_status_remrssi_ms;