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

AP_RPM: rename px4-pwm to just pwm

This commit is contained in:
Randy Mackay 2019-10-17 15:04:59 +09:00
parent 35b993b220
commit 353cb648f6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_RPM/AP_RPM.cpp
View File

@ -24,7 +24,7 @@ const AP_Param::GroupInfo AP_RPM::var_info[] = {
// @Param: _TYPE
// @DisplayName: RPM type
// @Description: What type of RPM sensor is connected
// @Values: 0:None,1:PX4-PWM,2:AUXPIN
// @Values: 0:None,1:PWM,2:AUXPIN
// @User: Standard
AP_GROUPINFO("_TYPE", 0, AP_RPM, _type[0], 0),
@ -67,7 +67,7 @@ const AP_Param::GroupInfo AP_RPM::var_info[] = {
// @Param: 2_TYPE
// @DisplayName: Second RPM type
// @Description: What type of RPM sensor is connected
// @Values: 0:None,1:PX4-PWM,2:AUXPIN
// @Values: 0:None,1:PWM,2:AUXPIN
// @User: Advanced
AP_GROUPINFO("2_TYPE", 10, AP_RPM, _type[1], 0),
@ -111,8 +111,8 @@ void AP_RPM::init(void)
for (uint8_t i=0; i<RPM_MAX_INSTANCES; i++) {
uint8_t type = _type[i];
if (type == RPM_TYPE_PX4_PWM) {
// on non-PX4 treat PX4-pin as AUXPIN option, for upgrade
if (type == RPM_TYPE_PWM) {
// PWM option same as PIN option, for upgrade
type = RPM_TYPE_PIN;
}
if (type == RPM_TYPE_PIN) {

2
libraries/AP_RPM/AP_RPM.h
View File

@ -38,7 +38,7 @@ public:
// RPM driver types
enum RPM_Type {
RPM_TYPE_NONE = 0,
RPM_TYPE_PX4_PWM = 1,
RPM_TYPE_PWM = 1,
RPM_TYPE_PIN = 2
};