zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Copter: allow for HELI_DUAL configurations

master
Andrew Tridgell 8 years ago
parent
1ad5e1db4e
commit
6bb5c16fb8
3 changed files with 31 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      ArduCopter/Copter.h
  2. 9
      ArduCopter/Parameters.cpp
  3. 38
      ArduCopter/system.cpp

3
ArduCopter/Copter.h
Unescape View File

@ -336,12 +336,13 @@ private:
// Motor Output // Motor Output
#if FRAME_CONFIG == HELI_FRAME #if FRAME_CONFIG == HELI_FRAME
#define MOTOR_CLASS AP_MotorsHeli_Single #define MOTOR_CLASS AP_MotorsHeli
#else #else
#define MOTOR_CLASS AP_MotorsMulticopter #define MOTOR_CLASS AP_MotorsMulticopter
#endif #endif
MOTOR_CLASS *motors; MOTOR_CLASS *motors;
const struct AP_Param::GroupInfo *motors_var_info;
// GPS variables // GPS variables
// Sometimes we need to remove the scaling for distance calcs // Sometimes we need to remove the scaling for distance calcs

9
ArduCopter/Parameters.cpp
Unescape View File

@ -25,6 +25,7 @@
#define GGROUP(v, name, class) { AP_PARAM_GROUP, name, Parameters::k_param_ ## v, &copter.g.v, {group_info : class::var_info} } #define GGROUP(v, name, class) { AP_PARAM_GROUP, name, Parameters::k_param_ ## v, &copter.g.v, {group_info : class::var_info} }
#define GOBJECT(v, name, class) { AP_PARAM_GROUP, name, Parameters::k_param_ ## v, (const void *)&copter.v, {group_info : class::var_info} } #define GOBJECT(v, name, class) { AP_PARAM_GROUP, name, Parameters::k_param_ ## v, (const void *)&copter.v, {group_info : class::var_info} }
#define GOBJECTPTR(v, name, class) { AP_PARAM_GROUP, name, Parameters::k_param_ ## v, (const void *)&copter.v, {group_info : class::var_info}, AP_PARAM_FLAG_POINTER } #define GOBJECTPTR(v, name, class) { AP_PARAM_GROUP, name, Parameters::k_param_ ## v, (const void *)&copter.v, {group_info : class::var_info}, AP_PARAM_FLAG_POINTER }
#define GOBJECTVARPTR(v, name, var_info_ptr) { AP_PARAM_GROUP, name, Parameters::k_param_ ## v, (const void *)&copter.v, {group_info_ptr : var_info_ptr}, AP_PARAM_FLAG_POINTER | AP_PARAM_FLAG_INFO_POINTER }
#define GOBJECTN(v, pname, name, class) { AP_PARAM_GROUP, name, Parameters::k_param_ ## pname, (const void *)&copter.v, {group_info : class::var_info} } #define GOBJECTN(v, pname, name, class) { AP_PARAM_GROUP, name, Parameters::k_param_ ## pname, (const void *)&copter.v, {group_info : class::var_info} }
const AP_Param::Info Copter::var_info[] = { const AP_Param::Info Copter::var_info[] = {
@ -779,12 +780,12 @@ const AP_Param::Info Copter::var_info[] = {
#if FRAME_CONFIG == HELI_FRAME #if FRAME_CONFIG == HELI_FRAME
// @Group: H_ // @Group: H_
// @Path: ../libraries/AP_Motors/AP_MotorsHeli_Single.cpp,../libraries/AP_Motors/AP_MotorsHeli.cpp // @Path: ../libraries/AP_Motors/AP_MotorsHeli_Single.cpp,../libraries/AP_Motors/AP_MotorsHeli_Dual.cpp,../libraries/AP_Motors/AP_MotorsHeli.cpp
GOBJECTPTR(motors, "H_", AP_MotorsHeli_Single), GOBJECTVARPTR(motors, "H_", &copter.motors_var_info),
#else #else
// @Group: MOT_ // @Group: MOT_
// @Path: ../libraries/AP_Motors/AP_MotorsMulticopter.cpp // @Path: ../libraries/AP_Motors/AP_MotorsMulticopter.cpp
GOBJECTPTR(motors, "MOT_", AP_MotorsMulticopter), GOBJECTVARPTR(motors, "MOT_", &copter.motors_var_info),
#endif #endif
// @Group: RCMAP_ // @Group: RCMAP_
@ -996,7 +997,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
// @Group: RC // @Group: RC
// @Path: ../libraries/RC_Channel/RC_Channels.cpp // @Path: ../libraries/RC_Channel/RC_Channels.cpp
AP_SUBGROUPINFO(rc_channels, "RC", 17, ParametersG2, RC_Channels), AP_SUBGROUPINFO(rc_channels, "RC", 17, ParametersG2, RC_Channels),
AP_GROUPEND AP_GROUPEND
}; };

38
ArduCopter/system.cpp
Unescape View File

@ -472,7 +472,8 @@ bool Copter::should_log(uint32_t mask)
// default frame_class to match firmware if possible // default frame_class to match firmware if possible
void Copter::set_default_frame_class() void Copter::set_default_frame_class()
{ {
if (FRAME_CONFIG == HELI_FRAME) { if (FRAME_CONFIG == HELI_FRAME &&
g2.frame_class.get() != AP_Motors::MOTOR_FRAME_HELI_DUAL) {
g2.frame_class.set(AP_Motors::MOTOR_FRAME_HELI); g2.frame_class.set(AP_Motors::MOTOR_FRAME_HELI);
} }
} }
@ -491,6 +492,7 @@ uint8_t Copter::get_frame_mav_type()
case AP_Motors::MOTOR_FRAME_OCTAQUAD: case AP_Motors::MOTOR_FRAME_OCTAQUAD:
return MAV_TYPE_OCTOROTOR; return MAV_TYPE_OCTOROTOR;
case AP_Motors::MOTOR_FRAME_HELI: case AP_Motors::MOTOR_FRAME_HELI:
case AP_Motors::MOTOR_FRAME_HELI_DUAL:
return MAV_TYPE_HELICOPTER; return MAV_TYPE_HELICOPTER;
case AP_Motors::MOTOR_FRAME_TRI: case AP_Motors::MOTOR_FRAME_TRI:
return MAV_TYPE_TRICOPTER; return MAV_TYPE_TRICOPTER;
@ -519,6 +521,8 @@ const char* Copter::get_frame_string()
return "OCTA_QUAD"; return "OCTA_QUAD";
case AP_Motors::MOTOR_FRAME_HELI: case AP_Motors::MOTOR_FRAME_HELI:
return "HELI"; return "HELI";
case AP_Motors::MOTOR_FRAME_HELI_DUAL:
return "HELI_DUAL";
case AP_Motors::MOTOR_FRAME_TRI: case AP_Motors::MOTOR_FRAME_TRI:
return "TRI"; return "TRI";
case AP_Motors::MOTOR_FRAME_SINGLE: case AP_Motors::MOTOR_FRAME_SINGLE:
@ -538,8 +542,6 @@ const char* Copter::get_frame_string()
*/ */
void Copter::allocate_motors(void) void Copter::allocate_motors(void)
{ {
const struct AP_Param::GroupInfo *var_info;
switch ((AP_Motors::motor_frame_class)g2.frame_class.get()) { switch ((AP_Motors::motor_frame_class)g2.frame_class.get()) {
#if FRAME_CONFIG != HELI_FRAME #if FRAME_CONFIG != HELI_FRAME
case AP_Motors::MOTOR_FRAME_QUAD: case AP_Motors::MOTOR_FRAME_QUAD:
@ -549,30 +551,36 @@ void Copter::allocate_motors(void)
case AP_Motors::MOTOR_FRAME_OCTAQUAD: case AP_Motors::MOTOR_FRAME_OCTAQUAD:
default: default:
motors = new AP_MotorsMatrix(MAIN_LOOP_RATE); motors = new AP_MotorsMatrix(MAIN_LOOP_RATE);
var_info = AP_MotorsMatrix::var_info; motors_var_info = AP_MotorsMatrix::var_info;
break; break;
case AP_Motors::MOTOR_FRAME_TRI: case AP_Motors::MOTOR_FRAME_TRI:
motors = new AP_MotorsTri(MAIN_LOOP_RATE); motors = new AP_MotorsTri(MAIN_LOOP_RATE);
var_info = AP_MotorsTri::var_info; motors_var_info = AP_MotorsTri::var_info;
AP_Param::set_frame_type_flags(AP_PARAM_FRAME_TRICOPTER); AP_Param::set_frame_type_flags(AP_PARAM_FRAME_TRICOPTER);
break; break;
case AP_Motors::MOTOR_FRAME_SINGLE: case AP_Motors::MOTOR_FRAME_SINGLE:
motors = new AP_MotorsSingle(MAIN_LOOP_RATE); motors = new AP_MotorsSingle(MAIN_LOOP_RATE);
var_info = AP_MotorsSingle::var_info; motors_var_info = AP_MotorsSingle::var_info;
break; break;
case AP_Motors::MOTOR_FRAME_COAX: case AP_Motors::MOTOR_FRAME_COAX:
motors = new AP_MotorsCoax(MAIN_LOOP_RATE); motors = new AP_MotorsCoax(MAIN_LOOP_RATE);
var_info = AP_MotorsCoax::var_info; motors_var_info = AP_MotorsCoax::var_info;
break; break;
case AP_Motors::MOTOR_FRAME_TAILSITTER: case AP_Motors::MOTOR_FRAME_TAILSITTER:
motors = new AP_MotorsTailsitter(MAIN_LOOP_RATE); motors = new AP_MotorsTailsitter(MAIN_LOOP_RATE);
var_info = AP_MotorsTailsitter::var_info; motors_var_info = AP_MotorsTailsitter::var_info;
break; break;
#else // FRAME_CONFIG == HELI_FRAME #else // FRAME_CONFIG == HELI_FRAME
case AP_Motors::MOTOR_FRAME_HELI_DUAL:
motors = new AP_MotorsHeli_Dual(MAIN_LOOP_RATE);
motors_var_info = AP_MotorsHeli_Dual::var_info;
AP_Param::set_frame_type_flags(AP_PARAM_FRAME_HELI);
break;
case AP_Motors::MOTOR_FRAME_HELI: case AP_Motors::MOTOR_FRAME_HELI:
default: default:
motors = new AP_MotorsHeli_Single(MAIN_LOOP_RATE); motors = new AP_MotorsHeli_Single(MAIN_LOOP_RATE);
var_info = AP_MotorsHeli_Single::var_info; motors_var_info = AP_MotorsHeli_Single::var_info;
AP_Param::set_frame_type_flags(AP_PARAM_FRAME_HELI); AP_Param::set_frame_type_flags(AP_PARAM_FRAME_HELI);
break; break;
#endif #endif
@ -580,24 +588,26 @@ void Copter::allocate_motors(void)
if (motors == nullptr) { if (motors == nullptr) {
AP_HAL::panic("Unable to allocate FRAME_CLASS=%u", (unsigned)g2.frame_class.get()); AP_HAL::panic("Unable to allocate FRAME_CLASS=%u", (unsigned)g2.frame_class.get());
} }
AP_Param::load_object_from_eeprom(motors, var_info); AP_Param::load_object_from_eeprom(motors, motors_var_info);
AP_AHRS_View *ahrs_view = ahrs.create_view(ROTATION_NONE); AP_AHRS_View *ahrs_view = ahrs.create_view(ROTATION_NONE);
if (ahrs_view == nullptr) { if (ahrs_view == nullptr) {
AP_HAL::panic("Unable to allocate AP_AHRS_View"); AP_HAL::panic("Unable to allocate AP_AHRS_View");
} }
const struct AP_Param::GroupInfo *ac_var_info;
#if FRAME_CONFIG != HELI_FRAME #if FRAME_CONFIG != HELI_FRAME
attitude_control = new AC_AttitudeControl_Multi(*ahrs_view, aparm, *motors, MAIN_LOOP_SECONDS); attitude_control = new AC_AttitudeControl_Multi(*ahrs_view, aparm, *motors, MAIN_LOOP_SECONDS);
var_info = AC_AttitudeControl_Multi::var_info; ac_var_info = AC_AttitudeControl_Multi::var_info;
#else #else
attitude_control = new AC_AttitudeControl_Heli(*ahrs_view, aparm, *motors, MAIN_LOOP_SECONDS); attitude_control = new AC_AttitudeControl_Heli(*ahrs_view, aparm, *motors, MAIN_LOOP_SECONDS);
var_info = AC_AttitudeControl_Heli::var_info; ac_var_info = AC_AttitudeControl_Heli::var_info;
#endif #endif
if (attitude_control == nullptr) { if (attitude_control == nullptr) {
AP_HAL::panic("Unable to allocate AttitudeControl"); AP_HAL::panic("Unable to allocate AttitudeControl");
} }
AP_Param::load_object_from_eeprom(attitude_control, var_info); AP_Param::load_object_from_eeprom(attitude_control, ac_var_info);
pos_control = new AC_PosControl(*ahrs_view, inertial_nav, *motors, *attitude_control, pos_control = new AC_PosControl(*ahrs_view, inertial_nav, *motors, *attitude_control,
g.p_alt_hold, g.p_vel_z, g.pid_accel_z, g.p_alt_hold, g.p_vel_z, g.pid_accel_z,

Write Preview
Loading…
Cancel
Save