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

PWMSim: refactor only use one output number variable

This commit is contained in:
Matthias Grob 2018-12-28 21:09:40 +01:00 committed by Lorenz Meier
parent 986e6c96b5
commit 05e45c2867
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/drivers/pwm_out_sim/PWMSim.cpp
View File

@ -237,16 +237,17 @@ PWMSim::run()
if (_mixers != nullptr) {
/* do mixing */
unsigned num_outputs = _mixers->mix(&_actuator_outputs.output[0], _num_outputs);
_actuator_outputs.noutputs = num_outputs;
_actuator_outputs.noutputs = _mixers->mix(&_actuator_outputs.output[0], _num_outputs);
/* disable unused ports by setting their output to NaN */
for (size_t i = num_outputs; i < sizeof(_actuator_outputs.output) / sizeof(_actuator_outputs.output[0]); i++) {
const size_t actuator_outputs_size = sizeof(_actuator_outputs.output) / sizeof(_actuator_outputs.output[0]);
for (size_t i = _actuator_outputs.noutputs; i < actuator_outputs_size; i++) {
_actuator_outputs.output[i] = NAN;
}
/* iterate actuators */
for (unsigned i = 0; i < num_outputs; i++) {
for (unsigned i = 0; i < _actuator_outputs.noutputs; i++) {
/* last resort: catch NaN, INF and out-of-band errors */
if (i < _actuator_outputs.noutputs &&
PX4_ISFINITE(_actuator_outputs.output[i]) &&
@ -268,14 +269,14 @@ PWMSim::run()
/* overwrite outputs in case of force_failsafe */
if (_failsafe) {
for (size_t i = 0; i < num_outputs; i++) {
for (size_t i = 0; i < _actuator_outputs.noutputs; i++) {
_actuator_outputs.output[i] = PWM_SIM_FAILSAFE_MAGIC;
}
}
/* overwrite outputs in case of lockdown */
if (_lockdown) {
for (size_t i = 0; i < num_outputs; i++) {
for (size_t i = 0; i < _actuator_outputs.noutputs; i++) {
_actuator_outputs.output[i] = 0.0;
}
}