aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Motors: MotorsTri does not need its own var_info now

Browse Source
This commit is contained in:
Andrew Tridgell 2017-01-20 11:24:05 +11:00
parent 332820aa88
commit a6ecb94d24
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/AP_Motors/AP_MotorsTri.cpp
View File

@ -25,17 +25,6 @@
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
const AP_Param::GroupInfo AP_MotorsTri::var_info[] = {
// variables from parent vehicle
AP_NESTEDGROUPINFO(AP_MotorsMulticopter, 0),
// parameters 1 ~ 29 were reserved for tradheli
// parameters 30 ~ 39 reserved for tricopter
// parameters 40 ~ 49 for single copter and coax copter (these have identical parameter files)
AP_GROUPEND
};
// init // init
void AP_MotorsTri::init(motor_frame_class frame_class, motor_frame_type frame_type) void AP_MotorsTri::init(motor_frame_class frame_class, motor_frame_type frame_type)
{ {

4
libraries/AP_Motors/AP_MotorsTri.h
View File

@ -21,7 +21,6 @@ public:
AP_MotorsTri(uint16_t loop_rate, uint16_t speed_hz = AP_MOTORS_SPEED_DEFAULT) : AP_MotorsTri(uint16_t loop_rate, uint16_t speed_hz = AP_MOTORS_SPEED_DEFAULT) :
AP_MotorsMulticopter(loop_rate, speed_hz) AP_MotorsMulticopter(loop_rate, speed_hz)
{ {
AP_Param::setup_object_defaults(this, var_info);
}; };
// init // init
@ -48,9 +47,6 @@ public:
// this can be used to ensure other pwm outputs (i.e. for servos) do not conflict // this can be used to ensure other pwm outputs (i.e. for servos) do not conflict
virtual uint16_t get_motor_mask(); virtual uint16_t get_motor_mask();
// var_info for holding Parameter information
static const struct AP_Param::GroupInfo var_info[];
protected: protected:
// output - sends commands to the motors // output - sends commands to the motors
void output_armed_stabilizing(); void output_armed_stabilizing();