aboutsummaryrefslogtreecommitdiff
path: root/apps/drivers
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2012-12-28 16:44:17 -0800
committerpx4dev <px4@purgatory.org>2012-12-28 16:44:17 -0800
commitf0da789626c32695e670b55dab29283eed4a05c6 (patch)
tree397438376e917e7681d99acda8606227f59adbb6 /apps/drivers
parent3c865c726110e74f22becb427e561799fa082250 (diff)
downloadpx4-firmware-f0da789626c32695e670b55dab29283eed4a05c6.tar.gz
px4-firmware-f0da789626c32695e670b55dab29283eed4a05c6.tar.bz2
px4-firmware-f0da789626c32695e670b55dab29283eed4a05c6.zip
Remove the unused complex-multirotor setup ioctl, since it's not implemented anywhere.
Diffstat (limited to 'apps/drivers')
-rw-r--r--apps/drivers/drv_mixer.h18
-rw-r--r--apps/drivers/hil/hil.cpp5
-rw-r--r--apps/drivers/px4fmu/fmu.cpp5
-rw-r--r--apps/drivers/px4io/px4io.cpp5
4 files changed, 0 insertions, 33 deletions
diff --git a/apps/drivers/drv_mixer.h b/apps/drivers/drv_mixer.h
index 793e86b32..498ca9836 100644
--- a/apps/drivers/drv_mixer.h
+++ b/apps/drivers/drv_mixer.h
@@ -100,24 +100,6 @@ struct mixer_simple_s {
*/
#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
*/
diff --git a/apps/drivers/hil/hil.cpp b/apps/drivers/hil/hil.cpp
index 67b16aa42..0780f3bb2 100644
--- a/apps/drivers/hil/hil.cpp
+++ b/apps/drivers/hil/hil.cpp
@@ -577,11 +577,6 @@ HIL::pwm_ioctl(file *filp, int cmd, unsigned long arg)
break;
}
- case MIXERIOCADDMULTIROTOR:
- /* XXX not yet supported */
- ret = -ENOTTY;
- break;
-
case MIXERIOCLOADFILE: {
const char *path = (const char *)arg;
diff --git a/apps/drivers/px4fmu/fmu.cpp b/apps/drivers/px4fmu/fmu.cpp
index a995f6214..e21250727 100644
--- a/apps/drivers/px4fmu/fmu.cpp
+++ b/apps/drivers/px4fmu/fmu.cpp
@@ -544,11 +544,6 @@ PX4FMU::pwm_ioctl(file *filp, int cmd, unsigned long arg)
break;
}
- case MIXERIOCADDMULTIROTOR:
- /* XXX not yet supported */
- ret = -ENOTTY;
- break;
-
case MIXERIOCLOADFILE: {
const char *path = (const char *)arg;
diff --git a/apps/drivers/px4io/px4io.cpp b/apps/drivers/px4io/px4io.cpp
index 9f3dba047..d185a1ac4 100644
--- a/apps/drivers/px4io/px4io.cpp
+++ b/apps/drivers/px4io/px4io.cpp
@@ -609,11 +609,6 @@ PX4IO::ioctl(file *filep, int cmd, unsigned long arg)
}
break;
- case MIXERIOCADDMULTIROTOR:
- /* XXX not yet supported */
- ret = -ENOTTY;
- break;
-
case MIXERIOCLOADFILE: {
MixerGroup *newmixers;
const char *path = (const char *)arg;