mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-03 06:28:27 -04:00
Sub: Update to match Copter changes.
This commit is contained in:
parent
bd596c8ead
commit
85f972ec65
@ -41,6 +41,7 @@ const AP_Param::Info Sub::var_info[] = {
|
||||
// @DisplayName: Eeprom format version number
|
||||
// @Description: This value is incremented when changes are made to the eeprom format
|
||||
// @User: Advanced
|
||||
// @ReadOnly: True
|
||||
GSCALAR(format_version, "SYSID_SW_MREV", 0),
|
||||
|
||||
// @Param: SYSID_SW_TYPE
|
||||
@ -48,6 +49,7 @@ const AP_Param::Info Sub::var_info[] = {
|
||||
// @Description: This is used by the ground station to recognise the software type (eg ArduPlane vs ArduCopter)
|
||||
// @Values: 0:ArduPlane,4:AntennaTracker,10:Copter,20:Rover
|
||||
// @User: Advanced
|
||||
// @ReadOnly: True
|
||||
GSCALAR(software_type, "SYSID_SW_TYPE", Parameters::k_software_type),
|
||||
|
||||
// @Param: SYSID_THISMAV
|
||||
|
@ -1,7 +1,6 @@
|
||||
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
|
||||
|
||||
#ifndef PARAMETERS_H
|
||||
#define PARAMETERS_H
|
||||
#pragma once
|
||||
|
||||
#include <AP_Common/AP_Common.h>
|
||||
|
||||
@ -586,5 +585,3 @@ public:
|
||||
|
||||
extern const AP_Param::Info var_info[];
|
||||
|
||||
#endif // PARAMETERS_H
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
|
||||
|
||||
#ifndef _SUB_H
|
||||
#define _SUB_H
|
||||
#pragma once
|
||||
|
||||
#define THISFIRMWARE "ArduSub V3.4-dev"
|
||||
#define FIRMWARE_VERSION 3,4,0,FIRMWARE_VERSION_TYPE_DEV
|
||||
@ -1027,5 +1026,3 @@ extern Sub sub;
|
||||
|
||||
using AP_HAL::millis;
|
||||
using AP_HAL::micros;
|
||||
|
||||
#endif // _SUB_H_
|
||||
|
@ -1,7 +1,7 @@
|
||||
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
|
||||
//
|
||||
#ifndef __ARDUCOPTER_CONFIG_H__
|
||||
#define __ARDUCOPTER_CONFIG_H__
|
||||
#pragma once
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@ -708,5 +708,3 @@
|
||||
#else
|
||||
#define FIRMWARE_STRING THISFIRMWARE " (" GIT_VERSION ")"
|
||||
#endif
|
||||
|
||||
#endif // __ARDUCOPTER_CONFIG_H__
|
||||
|
@ -1,7 +1,6 @@
|
||||
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
|
||||
|
||||
#ifndef _DEFINES_H
|
||||
#define _DEFINES_H
|
||||
#pragma once
|
||||
|
||||
#include <AP_HAL/AP_HAL_Boards.h>
|
||||
|
||||
@ -444,5 +443,3 @@ enum ThrowModeState {
|
||||
|
||||
// for PILOT_THR_BHV parameter
|
||||
#define THR_BEHAVE_FEEDBACK_FROM_MID_STICK (1<<0)
|
||||
|
||||
#endif // _DEFINES_H
|
||||
|
Loading…
Reference in New Issue
Block a user