Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Motors: add and use AP_RPM_ENABLED 

... and backend-specific equivalents
This commit is contained in:
Peter Barker 2022-07-15 21:53:41 +10:00 committed by Andrew Tridgell
parent 7eedc88646
commit d21aa2a1ed
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Motors/AP_MotorsHeli_RSC.cpp
View File

@ -234,6 +234,7 @@ void AP_MotorsHeli_RSC::set_throttle_curve()
void AP_MotorsHeli_RSC::output(RotorControlState state) void AP_MotorsHeli_RSC::output(RotorControlState state)
{ {
// _rotor_RPM available to the RSC output // _rotor_RPM available to the RSC output
#if AP_RPM_ENABLED
const AP_RPM *rpm = AP_RPM::get_singleton(); const AP_RPM *rpm = AP_RPM::get_singleton();
if (rpm != nullptr) { if (rpm != nullptr) {
if (!rpm->get_rpm(0, _rotor_rpm)) { if (!rpm->get_rpm(0, _rotor_rpm)) {
@ -244,6 +245,9 @@ void AP_MotorsHeli_RSC::output(RotorControlState state)
// No RPM because pointer is null // No RPM because pointer is null
_rotor_rpm = -1; _rotor_rpm = -1;
} }
#else
_rotor_rpm = -1;
#endif
float dt; float dt;
uint64_t now = AP_HAL::micros64(); uint64_t now = AP_HAL::micros64();