diff options
| author | px4dev <px4@purgatory.org> | 2012-12-29 17:15:48 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-12-29 17:15:48 -0800 |
| commit | 85375c2201e6b9fe4737cb85b462c0aef8d271ca (patch) | |
| tree | 775072bbc976a8a995a0993cda257c6ccaceb171 /apps/px4io/mixer.cpp | |
| parent | b8250de1e67f63f9ca3b990e016744584a328922 (diff) | |
| download | px4-firmware-85375c2201e6b9fe4737cb85b462c0aef8d271ca.tar.gz px4-firmware-85375c2201e6b9fe4737cb85b462c0aef8d271ca.tar.bz2 px4-firmware-85375c2201e6b9fe4737cb85b462c0aef8d271ca.zip | |
Rename the FMU->IO output controls to reflect the fact that they are controls, not servo values.
Diffstat (limited to 'apps/px4io/mixer.cpp')
| -rw-r--r-- | apps/px4io/mixer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/px4io/mixer.cpp b/apps/px4io/mixer.cpp index 0fd4ac717..52666ae39 100644 --- a/apps/px4io/mixer.cpp +++ b/apps/px4io/mixer.cpp @@ -85,7 +85,7 @@ mixer_tick(void) */ if (system_state.mixer_use_fmu) { /* we have recent control data from the FMU */ - control_count = PX4IO_OUTPUT_CHANNELS; + control_count = PX4IO_CONTROL_CHANNELS; control_values = &system_state.fmu_channel_data[0]; /* check that we are receiving fresh data from the FMU */ @@ -170,7 +170,6 @@ mixer_callback(uintptr_t handle, return -1; /* scale from current PWM units (1000-2000) to mixer input values */ - /* XXX this presents some ugly problems w.r.t failsafe and R/C input scaling that have to be addressed */ control = ((float)control_values[control_index] - 1500.0f) / 500.0f; return 0; |