diff options
| author | px4dev <px4@purgatory.org> | 2012-12-29 16:22:30 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-12-29 16:22:30 -0800 |
| commit | b8250de1e67f63f9ca3b990e016744584a328922 (patch) | |
| tree | db55eae92e1d3cb73d1b5ad50bc133450b93ed22 /apps/systemlib/mixer | |
| parent | d81edb09cf29dd36d50ce7a7bcf55631fecc470f (diff) | |
| download | px4-firmware-b8250de1e67f63f9ca3b990e016744584a328922.tar.gz px4-firmware-b8250de1e67f63f9ca3b990e016744584a328922.tar.bz2 px4-firmware-b8250de1e67f63f9ca3b990e016744584a328922.zip | |
Assorted compile fixes.
Diffstat (limited to 'apps/systemlib/mixer')
| -rw-r--r-- | apps/systemlib/mixer/mixer.h | 2 | ||||
| -rw-r--r-- | apps/systemlib/mixer/mixer_simple.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/systemlib/mixer/mixer.h b/apps/systemlib/mixer/mixer.h index 26ba5db7e..00ddf1581 100644 --- a/apps/systemlib/mixer/mixer.h +++ b/apps/systemlib/mixer/mixer.h @@ -368,7 +368,7 @@ public: * @return A new SimpleMixer instance, or nullptr if one could not be * allocated. */ - static SimpleMixer *pwm_input(Mixer::ControlCallback *control_cb, + static SimpleMixer *pwm_input(Mixer::ControlCallback control_cb, uintptr_t cb_handle, unsigned input, uint16_t min, diff --git a/apps/systemlib/mixer/mixer_simple.cpp b/apps/systemlib/mixer/mixer_simple.cpp index 05de1f6e0..048fba148 100644 --- a/apps/systemlib/mixer/mixer_simple.cpp +++ b/apps/systemlib/mixer/mixer_simple.cpp @@ -201,7 +201,7 @@ out: } SimpleMixer * -SimpleMixer::pwm_input(Mixer::ControlCallback *control_cb, uintptr_t cb_handle, unsigned input, uint16_t min, uint16_t mid, uint16_t max) +SimpleMixer::pwm_input(Mixer::ControlCallback control_cb, uintptr_t cb_handle, unsigned input, uint16_t min, uint16_t mid, uint16_t max) { SimpleMixer *sm = nullptr; mixer_simple_s *mixinfo = nullptr; @@ -233,8 +233,8 @@ SimpleMixer::pwm_input(Mixer::ControlCallback *control_cb, uintptr_t cb_handle, mixinfo->controls[0].scaler.negative_scale = 1.0f; mixinfo->controls[0].scaler.positive_scale = 1.0f; mixinfo->controls[0].scaler.offset = -mid; - mixinfo->controls[0].scaler.lower_limit = -(mid - min); - mixinfo->controls[0].scaler.upper_limit = (max - mid); + mixinfo->controls[0].scaler.min_output = -(mid - min); + mixinfo->controls[0].scaler.max_output = (max - mid); mixinfo->output_scaler.negative_scale = 500.0f / (mid - min); mixinfo->output_scaler.positive_scale = 500.0f / (max - mid); |