diff options
author | px4dev <px4@purgatory.org> | 2012-08-04 20:05:47 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2012-08-05 14:13:33 -0700 |
commit | 145a6c4c49b1aac9a8b8065ac5e48ba50754ba7f (patch) | |
tree | e335a9579f8a86500d245daf38a29604ebdd379b /apps/px4/fmu | |
parent | 62e18b580cc56ecabf0a586ab64efbcd1c4139ba (diff) | |
download | px4-firmware-145a6c4c49b1aac9a8b8065ac5e48ba50754ba7f.tar.gz px4-firmware-145a6c4c49b1aac9a8b8065ac5e48ba50754ba7f.tar.bz2 px4-firmware-145a6c4c49b1aac9a8b8065ac5e48ba50754ba7f.zip |
Work in progress; standard mixer API and utility
Diffstat (limited to 'apps/px4/fmu')
-rw-r--r-- | apps/px4/fmu/Makefile | 4 | ||||
-rw-r--r-- | apps/px4/fmu/fmu.cpp | 75 |
2 files changed, 76 insertions, 3 deletions
diff --git a/apps/px4/fmu/Makefile b/apps/px4/fmu/Makefile index 7f1f836e3..831774872 100644 --- a/apps/px4/fmu/Makefile +++ b/apps/px4/fmu/Makefile @@ -35,4 +35,8 @@ # Interface driver for the PX4FMU board # +APPNAME = fmu +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 + include $(APPDIR)/mk/app.mk diff --git a/apps/px4/fmu/fmu.cpp b/apps/px4/fmu/fmu.cpp index 6c7d9f742..ff47261e7 100644 --- a/apps/px4/fmu/fmu.cpp +++ b/apps/px4/fmu/fmu.cpp @@ -40,6 +40,7 @@ #include <sys/types.h> #include <stdint.h> #include <stdbool.h> +#include <stdlib.h> #include <semaphore.h> #include <string.h> #include <fcntl.h> @@ -54,6 +55,7 @@ #include <drivers/device/device.h> #include <drivers/drv_pwm_output.h> #include <drivers/drv_gpio.h> +#include <drivers/drv_mixer.h> #include <uORB/topics/actuator_controls.h> #include <systemlib/mixer.h> @@ -76,6 +78,8 @@ public: virtual int init(); private: + static const unsigned _max_actuators = 4; + Mode _mode; int _task; int _t_actuators; @@ -85,7 +89,7 @@ private: volatile bool _task_should_exit; bool _armed; - MixMixer *_mixer[4]; + MixMixer *_mixer[_max_actuators]; static void task_main_trampoline(int argc, char *argv[]); void task_main(); @@ -262,6 +266,9 @@ int FMUServo::ioctl(struct file *filp, int cmd, unsigned long arg) { int ret = OK; + int channel; + struct MixInfo *mi; + struct MixMixer *mm, *tmm; switch (cmd) { case PWM_SERVO_ARM: @@ -282,7 +289,7 @@ FMUServo::ioctl(struct file *filp, int cmd, unsigned long arg) case PWM_SERVO_SET(0): case PWM_SERVO_SET(1): if (arg < 2100) { - int channel = cmd - PWM_SERVO_SET(0); + channel = cmd - PWM_SERVO_SET(0); up_pwm_servo_set(channel, arg); } else { ret = -EINVAL; @@ -298,11 +305,73 @@ FMUServo::ioctl(struct file *filp, int cmd, unsigned long arg) /* FALLTHROUGH */ case PWM_SERVO_GET(0): case PWM_SERVO_GET(1): { - int channel = cmd - PWM_SERVO_SET(0); + channel = cmd - PWM_SERVO_SET(0); *(servo_position_t *)arg = up_pwm_servo_get(channel); break; } + case MIXERIOCGETMIXERCOUNT: + if (_mode == MODE_4PWM) { + *(unsigned *)arg = 4; + } else { + *(unsigned *)arg = 2; + } + break; + + case MIXERIOCGETMIXER(3): + case MIXERIOCGETMIXER(2): + if (_mode != MODE_4PWM) { + ret = -EINVAL; + break; + } + /* FALLTHROUGH */ + case MIXERIOCGETMIXER(1): + case MIXERIOCGETMIXER(0): + channel = cmd - MIXERIOCGETMIXER(0); + + /* caller's MixInfo */ + mi = (struct MixInfo *)arg; + + /* if MixInfo claims to be big enough, copy mixer info */ + if (mi->num_controls >= _mixer[channel]->control_count) { + memcpy(&mi->mixer, _mixer[channel], MIXER_SIZE(_mixer[channel]->control_count)); + } else { + /* just update MixInfo with actual size of the mixer */ + mi->mixer.control_count = _mixer[channel]->control_count; + } + break; + + case MIXERIOCSETMIXER(3): + case MIXERIOCSETMIXER(2): + if (_mode != MODE_4PWM) { + ret = -EINVAL; + break; + } + /* FALLTHROUGH */ + case MIXERIOCSETMIXER(1): + case MIXERIOCSETMIXER(0): + channel = cmd - MIXERIOCGETMIXER(0); + + /* caller- supplied mixer */ + mm = (struct MixMixer *)arg; + + /* allocate local storage and copy from the caller*/ + if (mm != nullptr) { + tmm = (struct MixMixer *)malloc(MIXER_SIZE(mm->control_count)); + memcpy(tmm, mm, MIXER_SIZE(mm->control_count)); + } else { + tmm = nullptr; + } + + /* swap in new mixer for old */ + mm = _mixer[channel]; + _mixer[channel] = tmm; + + /* if there was an old mixer, free it */ + if (mm != nullptr) + free(mm); + break; + default: ret = -ENOTTY; break; |