Browse Source

Copter: remove dup definition of FRAME_ORIENTATION

Ideally the frame orientation parameter should be moved to the motors
class
master
Randy Mackay 11 years ago
parent
commit
dee5fb212a
  1. 2
      ArduCopter/Parameters.pde
  2. 3
      ArduCopter/config.h
  3. 4
      ArduCopter/defines.h

2
ArduCopter/Parameters.pde

@ -399,7 +399,7 @@ const AP_Param::Info var_info[] PROGMEM = { @@ -399,7 +399,7 @@ const AP_Param::Info var_info[] PROGMEM = {
// @Description: Controls motor mixing for multicopters. Not used for Tri or Traditional Helicopters.
// @Values: 0:Plus, 1:X, 2:V, 3:H
// @User: Standard
GSCALAR(frame_orientation, "FRAME", FRAME_ORIENTATION),
GSCALAR(frame_orientation, "FRAME", AP_MOTORS_X_FRAME),
// @Param: CH7_OPT
// @DisplayName: Channel 7 option

3
ArduCopter/config.h

@ -100,9 +100,6 @@ @@ -100,9 +100,6 @@
#ifndef FRAME_CONFIG
# define FRAME_CONFIG QUAD_FRAME
#endif
#ifndef FRAME_ORIENTATION
# define FRAME_ORIENTATION X_FRAME
#endif
/////////////////////////////////////////////////////////////////////////////////
// TradHeli defaults

4
ArduCopter/defines.h

@ -90,10 +90,6 @@ @@ -90,10 +90,6 @@
#define OCTA_QUAD_FRAME 7
#define SINGLE_FRAME 8
#define PLUS_FRAME 0
#define X_FRAME 1
#define V_FRAME 2
// Internal defines, don't edit and expect things to work
// -------------------------------------------------------

Loading…
Cancel
Save