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

Copter: move SINGLE parameters to start at 75

Browse Source
This commit is contained in:
Randy Mackay 2013-11-12 22:52:41 +09:00
parent e138a12f80
commit 898fa2f2a1
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ArduCopter/Parameters.h
View File

@ -99,6 +99,14 @@ public:
k_param_fence,
k_param_gps_glitch, // 70
//
// 75: Singlecopter
//
k_param_single_servo_1 = 75,
k_param_single_servo_2,
k_param_single_servo_3,
k_param_single_servo_4, // 78
//
// 80: Heli
//
@ -261,16 +269,6 @@ public:
k_param_acro_balance_pitch,
k_param_acro_yaw_p, // 244
//
//245: Singlecopter
//
k_param_single_servo_1 = 245, //
k_param_single_servo_2,
k_param_single_servo_3,
k_param_single_servo_4,
// 254,255: reserved
};

23
ArduCopter/Parameters.pde
View File

@ -948,7 +948,6 @@ const AP_Param::Info var_info[] PROGMEM = {
// variables not in the g class which contain EEPROM saved variables
// variables not in the g class which contain EEPROM saved variables
#if CAMERA == ENABLED
// @Group: CAM_
// @Path: ../libraries/AP_Camera/AP_Camera.cpp
@ -1037,10 +1036,24 @@ const AP_Param::Info var_info[] PROGMEM = {
// @Group: H_
// @Path: ../libraries/AP_Motors/AP_MotorsHeli.cpp
GOBJECT(motors, "H_", AP_MotorsHeli),
#elif FRAME_CONFIG == SINGLE_FRAME
// @Group: H_
// @Path: ../libraries/AP_Motors/AP_MotorsHeli.cpp
GOBJECT(motors, "MOT_", AP_MotorsSingle),
#elif FRAME_CONFIG == SINGLE_FRAME
// @Group: SS1_
// @Path: ../libraries/RC_Channel/RC_Channel.cpp
GGROUP(single_servo_1, "SS1_", RC_Channel),
// @Group: SS2_
// @Path: ../libraries/RC_Channel/RC_Channel.cpp
GGROUP(single_servo_2, "SS2_", RC_Channel),
// @Group: SS3_
// @Path: ../libraries/RC_Channel/RC_Channel.cpp
GGROUP(single_servo_3, "SS3_", RC_Channel),
// @Group: SS4_
// @Path: ../libraries/RC_Channel/RC_Channel.cpp
GGROUP(single_servo_4, "SS4_", RC_Channel),
// @Group: H_
// @Path: ../libraries/AP_Motors/AP_MotorsHeli.cpp
GOBJECT(motors, "MOT_", AP_MotorsSingle),
#else
// @Group: MOT_
// @Path: ../libraries/AP_Motors/AP_Motors_Class.cpp