From efdc7daf960bb83ca7feae7a13de7a9b78b615d5 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 12 Sep 2017 11:28:42 -0700 Subject: [PATCH] AntennaTracker: do not include version.h/ap_version.h The interface provided by each vehicle should be used to get the version. The user of the macro has been converted to use that interface. --- AntennaTracker/GCS_Mavlink.cpp | 1 - AntennaTracker/system.cpp | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/AntennaTracker/GCS_Mavlink.cpp b/AntennaTracker/GCS_Mavlink.cpp index 51b7378b0b..c101e7869d 100644 --- a/AntennaTracker/GCS_Mavlink.cpp +++ b/AntennaTracker/GCS_Mavlink.cpp @@ -1,7 +1,6 @@ #include "GCS_Mavlink.h" #include "Tracker.h" -#include "version.h" // default sensors are present and healthy: gyro, accelerometer, barometer, rate_control, attitude_stabilization, yaw_position, altitude control, x/y position control, motor_control #define MAVLINK_SENSOR_PRESENT_DEFAULT (MAV_SYS_STATUS_SENSOR_3D_GYRO | MAV_SYS_STATUS_SENSOR_3D_ACCEL | MAV_SYS_STATUS_SENSOR_ABSOLUTE_PRESSURE | MAV_SYS_STATUS_SENSOR_ANGULAR_RATE_CONTROL | MAV_SYS_STATUS_SENSOR_ATTITUDE_STABILIZATION | MAV_SYS_STATUS_SENSOR_YAW_POSITION | MAV_SYS_STATUS_SENSOR_Z_ALTITUDE_CONTROL | MAV_SYS_STATUS_SENSOR_XY_POSITION_CONTROL | MAV_SYS_STATUS_SENSOR_MOTOR_OUTPUTS) diff --git a/AntennaTracker/system.cpp b/AntennaTracker/system.cpp index 97d5467413..2d7b3e2800 100644 --- a/AntennaTracker/system.cpp +++ b/AntennaTracker/system.cpp @@ -1,5 +1,4 @@ #include "Tracker.h" -#include "version.h" // mission storage static const StorageAccess wp_storage(StorageManager::StorageMission); @@ -14,9 +13,9 @@ void Tracker::init_tracker() // initialise console serial port serial_manager.init_console(); - hal.console->printf("\n\nInit " THISFIRMWARE - "\n\nFree RAM: %u\n", - hal.util->available_memory()); + hal.console->printf("\n\nInit %s\n\nFree RAM: %u\n", + fwver.fw_string, + hal.util->available_memory()); // Check the EEPROM format version before loading any parameters from EEPROM load_parameters();