Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CxPilot : CX release version changes #177

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Tools/AP_Periph/AP_Periph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include <AP_HAL/AP_HAL_Boards.h>
#include "AP_Periph.h"
#include <stdio.h>
#include <dronecan_msgs.h>
#include <GCS_MAVLink/GCS.h>

#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
#include <AP_HAL_ChibiOS/hwdef/common/stm32_util.h>
Expand Down Expand Up @@ -292,6 +294,10 @@ void AP_Periph_FW::init()
#if AP_SCRIPTING_ENABLED
scripting.init();
#endif

#ifdef AP_CUSTOM_FIRMWARE_STRING
GCS_SEND_TEXT(MAV_SEVERITY_INFO, AP_CUSTOM_FIRMWARE_STRING);
#endif
start_ms = AP_HAL::millis();
}

Expand Down
1 change: 1 addition & 0 deletions Tools/AP_Periph/AP_Periph.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include <SITL/SITL.h>
#endif
#include <AP_AHRS/AP_AHRS.h>
#include <AP_Common/CxVersion.h>

#ifdef HAL_PERIPH_ENABLE_RELAY
#ifdef HAL_PERIPH_ENABLE_PWM_HARDPOINT
Expand Down
1 change: 1 addition & 0 deletions libraries/AP_Common/AP_FWVersionDefine.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include <AP_Common/AP_FWVersion.h>
#include <AP_Vehicle/AP_Vehicle_Type.h>
#include <AP_Common/CxVersion.h>

/*
allow vendors to set AP_CUSTOM_FIRMWARE_STRING in hwdef.dat
Expand Down
5 changes: 5 additions & 0 deletions libraries/AP_Common/CxVersion.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#ifdef CARBOPILOT
#ifndef AP_CUSTOM_FIRMWARE_STRING
#define AP_CUSTOM_FIRMWARE_STRING "CxPilot-7.0.0dev"
#endif
#endif
Loading