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

Remove unnecessary C++11 usage in UAVCAN

This commit is contained in:
Lorenz Meier 2016-08-18 21:43:58 +02:00
parent 818840b576
commit 192cde408a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/uavcan/actuators/esc.cpp
View File

@ -39,7 +39,6 @@
#include "esc.hpp"
#include <systemlib/err.h>
#include <algorithm>
#define MOTOR_BIT(x) (1<<(x))
@ -118,7 +117,10 @@ void UavcanEscController::update_outputs(float *outputs, unsigned num_outputs)
float scaled = (outputs[i] + 1.0F) * 0.5F * cmd_max;
// trim negative values back to minimum
scaled = std::max(cmd_min, scaled);
if (scaled < cmd_min) {
scaled = cmd_min;
perf_count(_perfcnt_scaling_error);
}
if (scaled > cmd_max) {
scaled = cmd_max;