dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Assorted compile fixes.

This commit is contained in:
px4dev 2012-12-29 16:22:30 -08:00
parent d81edb09cf
commit b8250de1e6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/systemlib/mixer/mixer.h
View File

@ -368,7 +368,7 @@ public:
* @return A new SimpleMixer instance, or nullptr if one could not be * @return A new SimpleMixer instance, or nullptr if one could not be
* allocated. * allocated.
*/ */
static SimpleMixer *pwm_input(Mixer::ControlCallback *control_cb, static SimpleMixer *pwm_input(Mixer::ControlCallback control_cb,
uintptr_t cb_handle, uintptr_t cb_handle,
unsigned input, unsigned input,
uint16_t min, uint16_t min,

6
apps/systemlib/mixer/mixer_simple.cpp
View File

@ -201,7 +201,7 @@ out:
} }
SimpleMixer * 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; SimpleMixer *sm = nullptr;
mixer_simple_s *mixinfo = 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.negative_scale = 1.0f;
mixinfo->controls[0].scaler.positive_scale = 1.0f; mixinfo->controls[0].scaler.positive_scale = 1.0f;
mixinfo->controls[0].scaler.offset = -mid; mixinfo->controls[0].scaler.offset = -mid;
mixinfo->controls[0].scaler.lower_limit = -(mid - min); mixinfo->controls[0].scaler.min_output = -(mid - min);
mixinfo->controls[0].scaler.upper_limit = (max - mid); mixinfo->controls[0].scaler.max_output = (max - mid);
mixinfo->output_scaler.negative_scale = 500.0f / (mid - min); mixinfo->output_scaler.negative_scale = 500.0f / (mid - min);
mixinfo->output_scaler.positive_scale = 500.0f / (max - mid); mixinfo->output_scaler.positive_scale = 500.0f / (max - mid);