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

RC_Channel: rename and make enum RC_Channel::ControlType 

Type:: is too generic; get_type should probably be get_control_type
This commit is contained in:
Peter Barker 2022-02-25 17:01:06 +11:00 committed by Peter Barker
parent 4e122a3d50
commit 37af7e5166
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/RC_Channel/RC_Channel.cpp
View File

@ -116,13 +116,13 @@ RC_Channel::RC_Channel(void)
void RC_Channel::set_range(uint16_t high)
{
type_in = RC_CHANNEL_TYPE_RANGE;
type_in = ControlType::RANGE;
high_in = high;
}
void RC_Channel::set_angle(uint16_t angle)
{
type_in = RC_CHANNEL_TYPE_ANGLE;
type_in = ControlType::ANGLE;
high_in = angle;
}
@ -147,10 +147,10 @@ bool RC_Channel::update(void)
return false;
}
if (type_in == RC_CHANNEL_TYPE_RANGE) {
if (type_in == ControlType::RANGE) {
control_in = pwm_to_range();
} else {
//RC_CHANNEL_TYPE_ANGLE
// ControlType::ANGLE
control_in = pwm_to_angle();
}
@ -163,7 +163,7 @@ bool RC_Channel::update(void)
*/
int16_t RC_Channel::get_control_mid() const
{
if (type_in == RC_CHANNEL_TYPE_RANGE) {
if (type_in == ControlType::RANGE) {
int16_t r_in = (radio_min.get() + radio_max.get())/2;
int16_t radio_trim_low = radio_min + dead_zone;
@ -248,7 +248,7 @@ int16_t RC_Channel::pwm_to_range() const
int16_t RC_Channel::get_control_in_zero_dz(void) const
{
if (type_in == RC_CHANNEL_TYPE_RANGE) {
if (type_in == ControlType::RANGE) {
return pwm_to_range_dz(0);
}
return pwm_to_angle_dz(0);

10
libraries/RC_Channel/RC_Channel.h
View File

@ -17,9 +17,9 @@ public:
// Constructor
RC_Channel(void);
enum ChannelType {
RC_CHANNEL_TYPE_ANGLE = 0,
RC_CHANNEL_TYPE_RANGE = 1,
enum class ControlType {
ANGLE = 0,
RANGE = 1,
};
// setup the control preferences
@ -91,7 +91,7 @@ public:
// check if any of the trim/min/max param are configured in storage, this would indicate that the user has done a calibration at somepoint
bool configured_in_storage() { return radio_min.configured_in_storage() || radio_max.configured_in_storage() || radio_trim.configured_in_storage(); }
ChannelType get_type(void) const { return type_in; }
ControlType get_type(void) const { return type_in; }
AP_Int16 option; // e.g. activate EPM gripper / enable fence
@ -337,7 +337,7 @@ private:
AP_Int8 reversed;
AP_Int16 dead_zone;
ChannelType type_in;
ControlType type_in;
int16_t high_in;
// the input channel this corresponds to