Browse Source

Remove the unused complex-multirotor setup ioctl, since it's not implemented anywhere.

sbg
px4dev 12 years ago
parent
commit
f0da789626
  1. 18
      apps/drivers/drv_mixer.h
  2. 5
      apps/drivers/hil/hil.cpp
  3. 5
      apps/drivers/px4fmu/fmu.cpp
  4. 5
      apps/drivers/px4io/px4io.cpp

18
apps/drivers/drv_mixer.h

@ -100,24 +100,6 @@ struct mixer_simple_s {
*/ */
#define MIXERIOCADDSIMPLE _MIXERIOC(2) #define MIXERIOCADDSIMPLE _MIXERIOC(2)
/** multirotor output definition */
struct mixer_rotor_output_s {
float angle; /**< rotor angle clockwise from forward in radians */
float distance; /**< motor distance from centre in arbitrary units */
};
/** multirotor mixer */
struct mixer_multirotor_s {
uint8_t rotor_count;
struct mixer_control_s controls[4]; /**< controls are roll, pitch, yaw, thrust */
struct mixer_rotor_output_s rotors[0]; /**< actual size of the array is set by rotor_count */
};
/**
* Add a multirotor mixer in (struct mixer_multirotor_s *)arg
*/
#define MIXERIOCADDMULTIROTOR _MIXERIOC(3)
/** /**
* Add mixers(s) from a the file in (const char *)arg * Add mixers(s) from a the file in (const char *)arg
*/ */

5
apps/drivers/hil/hil.cpp

@ -577,11 +577,6 @@ HIL::pwm_ioctl(file *filp, int cmd, unsigned long arg)
break; break;
} }
case MIXERIOCADDMULTIROTOR:
/* XXX not yet supported */
ret = -ENOTTY;
break;
case MIXERIOCLOADFILE: { case MIXERIOCLOADFILE: {
const char *path = (const char *)arg; const char *path = (const char *)arg;

5
apps/drivers/px4fmu/fmu.cpp

@ -544,11 +544,6 @@ PX4FMU::pwm_ioctl(file *filp, int cmd, unsigned long arg)
break; break;
} }
case MIXERIOCADDMULTIROTOR:
/* XXX not yet supported */
ret = -ENOTTY;
break;
case MIXERIOCLOADFILE: { case MIXERIOCLOADFILE: {
const char *path = (const char *)arg; const char *path = (const char *)arg;

5
apps/drivers/px4io/px4io.cpp

@ -609,11 +609,6 @@ PX4IO::ioctl(file *filep, int cmd, unsigned long arg)
} }
break; break;
case MIXERIOCADDMULTIROTOR:
/* XXX not yet supported */
ret = -ENOTTY;
break;
case MIXERIOCLOADFILE: { case MIXERIOCLOADFILE: {
MixerGroup *newmixers; MixerGroup *newmixers;
const char *path = (const char *)arg; const char *path = (const char *)arg;

Loading…
Cancel
Save