AP_Periph: use ArduPilot version system

this will allow build_binaries to find the version
This commit is contained in:
Andrew Tridgell 2019-10-25 12:05:30 +11:00
parent 9a176526d7
commit 1352557ebb
4 changed files with 71 additions and 11 deletions

View File

@ -5,6 +5,7 @@
#include <AP_Baro/AP_Baro.h>
#include <AP_Airspeed/AP_Airspeed.h>
#include <AP_RangeFinder/AP_RangeFinder.h>
#include <AP_Common/AP_FWVersion.h>
#if defined(HAL_PERIPH_NEOPIXEL_COUNT) || defined(HAL_PERIPH_ENABLE_NCP5623_LED)
#define AP_PERIPH_HAVE_LED
@ -13,13 +14,6 @@
#include "Parameters.h"
#include "ch.h"
#ifndef CAN_APP_VERSION_MAJOR
#define CAN_APP_VERSION_MAJOR 1
#endif
#ifndef CAN_APP_VERSION_MINOR
#define CAN_APP_VERSION_MINOR 0
#endif
/*
app descriptor compatible with MissionPlanner
*/
@ -29,8 +23,8 @@ struct app_descriptor {
uint32_t image_crc2 = 0;
uint32_t image_size = 0;
uint32_t git_hash = 0;
uint8_t version_major = CAN_APP_VERSION_MAJOR;
uint8_t version_minor = CAN_APP_VERSION_MINOR;
uint8_t version_major = AP::fwversion().major;
uint8_t version_minor = AP::fwversion().minor;
uint8_t reserved[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
};
extern const struct app_descriptor app_descriptor;

View File

@ -110,8 +110,8 @@ static void handle_get_node_info(CanardInstance* ins,
node_status.uptime_sec = AP_HAL::millis() / 1000U;
pkt.status = node_status;
pkt.software_version.major = CAN_APP_VERSION_MAJOR;
pkt.software_version.minor = CAN_APP_VERSION_MINOR;
pkt.software_version.major = AP::fwversion().major;
pkt.software_version.minor = AP::fwversion().minor;
pkt.software_version.optional_field_flags = UAVCAN_PROTOCOL_SOFTWAREVERSION_OPTIONAL_FIELD_FLAG_VCS_COMMIT | UAVCAN_PROTOCOL_SOFTWAREVERSION_OPTIONAL_FIELD_FLAG_IMAGE_CRC;
pkt.software_version.vcs_commit = app_descriptor.git_hash;
uint32_t *crc = (uint32_t *)&pkt.software_version.image_crc;

View File

@ -0,0 +1,49 @@
/*
* 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/>.
*/
#define FORCE_VERSION_H_INCLUDE
#include "version.h"
#undef FORCE_VERSION_H_INCLUDE
#include <AP_Common/AP_FWVersion.h>
const AP_FWVersion AP_FWVersion::fwver{
.major = FW_MAJOR,
.minor = FW_MINOR,
.patch = FW_PATCH,
.fw_type = FW_TYPE,
#ifndef GIT_VERSION
.fw_string = THISFIRMWARE,
.fw_hash_str = "",
#else
.fw_string = THISFIRMWARE " (" GIT_VERSION ")",
.fw_hash_str = GIT_VERSION,
#endif
.middleware_name = nullptr,
.middleware_hash_str = nullptr,
#ifdef CHIBIOS_GIT_VERSION
.os_name = "ChibiOS",
.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
};

17
Tools/AP_Periph/version.h Normal file
View File

@ -0,0 +1,17 @@
#pragma once
#ifndef FORCE_VERSION_H_INCLUDE
#error version.h should never be included directly. You probably want to include AP_Common/AP_FWVersion.h
#endif
#include "ap_version.h"
#define THISFIRMWARE "AP_Periph V1.0dev"
// the following line is parsed by the autotest scripts
#define FIRMWARE_VERSION 1,0,0,FIRMWARE_VERSION_TYPE_DEV
#define FW_MAJOR 1
#define FW_MINOR 0
#define FW_PATCH 0
#define FW_TYPE FIRMWARE_VERSION_TYPE_DEV