diff options
author | px4dev <px4@purgatory.org> | 2012-08-05 02:09:11 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2012-08-05 14:13:33 -0700 |
commit | 9804776a0c8bd67d4a533e3302f1a598c35b868b (patch) | |
tree | f91736f146ac44b3db2e94d3b8162bc168926963 /apps/px4 | |
parent | 145a6c4c49b1aac9a8b8065ac5e48ba50754ba7f (diff) | |
download | px4-firmware-9804776a0c8bd67d4a533e3302f1a598c35b868b.tar.gz px4-firmware-9804776a0c8bd67d4a533e3302f1a598c35b868b.tar.bz2 px4-firmware-9804776a0c8bd67d4a533e3302f1a598c35b868b.zip |
Checkpoint: more work in progress on mixer load/save
Diffstat (limited to 'apps/px4')
-rw-r--r-- | apps/px4/fmu/fmu.cpp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/apps/px4/fmu/fmu.cpp b/apps/px4/fmu/fmu.cpp index ff47261e7..8e468c012 100644 --- a/apps/px4/fmu/fmu.cpp +++ b/apps/px4/fmu/fmu.cpp @@ -110,13 +110,14 @@ FMUServo::FMUServo(Mode mode) : _task_should_exit(false), _armed(false) { - for (unsigned i = 0; i < 4; i++) + for (unsigned i = 0; i < _max_actuators; i++) _mixer[i] = nullptr; } FMUServo::~FMUServo() { if (_task != -1) { + /* task should wake up every 100ms or so at least */ _task_should_exit = true; @@ -168,8 +169,6 @@ FMUServo::task_main_trampoline(int argc, char *argv[]) void FMUServo::task_main() { - log("ready"); - /* configure for PWM output */ switch (_mode) { case MODE_2PWM: @@ -217,7 +216,7 @@ FMUServo::task_main() /* do we have a control update? */ if (fds[0].revents & POLLIN) { - struct actuator_controls ac; + struct actuator_controls_s ac; /* get controls */ orb_copy(ORB_ID(actuator_controls), _t_actuators, &ac); @@ -239,7 +238,7 @@ FMUServo::task_main() /* how about an arming update? */ if (fds[1].revents & POLLIN) { - struct actuator_armed aa; + struct actuator_armed_s aa; /* get new value */ orb_copy(ORB_ID(actuator_armed), _t_armed, &aa); @@ -329,6 +328,12 @@ FMUServo::ioctl(struct file *filp, int cmd, unsigned long arg) case MIXERIOCGETMIXER(0): channel = cmd - MIXERIOCGETMIXER(0); + /* if no mixer is assigned, we return ENOENT */ + if (_mixer[channel] == nullptr) { + ret = -ENOENT; + break; + } + /* caller's MixInfo */ mi = (struct MixInfo *)arg; @@ -350,10 +355,14 @@ FMUServo::ioctl(struct file *filp, int cmd, unsigned long arg) /* FALLTHROUGH */ case MIXERIOCSETMIXER(1): case MIXERIOCSETMIXER(0): - channel = cmd - MIXERIOCGETMIXER(0); + channel = cmd - MIXERIOCSETMIXER(0); - /* caller- supplied mixer */ + /* get the caller-supplied mixer and check */ mm = (struct MixMixer *)arg; + if (mixer_check(mm, NUM_ACTUATOR_CONTROLS)) { + ret = -EINVAL; + break; + } /* allocate local storage and copy from the caller*/ if (mm != nullptr) { @@ -382,13 +391,13 @@ FMUServo::ioctl(struct file *filp, int cmd, unsigned long arg) namespace { enum PortMode { + PORT_MODE_UNSET = 0, PORT_FULL_GPIO, PORT_FULL_SERIAL, PORT_FULL_PWM, PORT_GPIO_AND_SERIAL, PORT_PWM_AND_SERIAL, PORT_PWM_AND_GPIO, - PORT_MODE_UNSET }; PortMode g_port_mode; @@ -476,7 +485,7 @@ fmu_new_mode(PortMode new_mode) } // namespace -extern "C" int fmu_main(int argc, char *argv[]); +extern "C" __EXPORT int fmu_main(int argc, char *argv[]); int fmu_main(int argc, char *argv[]) |