Merge branch 'master' of github.com:PX4/Firmware into driver_framework

This commit is contained in:
Lorenz Meier
2015-11-21 11:20:27 +01:00
5 changed files with 97 additions and 70 deletions
+2 -1
View File
@@ -474,8 +474,9 @@ PWMSim::task_main()
}
/* do mixing */
actuator_outputs_s outputs;
actuator_outputs_s outputs = {};
num_outputs = _mixers->mix(&outputs.output[0], num_outputs, NULL);
outputs.noutputs = num_outputs;
outputs.timestamp = hrt_absolute_time();
/* disable unused ports by setting their output to NaN */