From bbbd90c4308bf84f0525426edb908a3e19927940 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 29 Apr 2013 15:05:53 +0900 Subject: [PATCH] AP_HAL: rename RCInput's valid() fn to valid_channels --- libraries/AP_HAL/RCInput.h | 2 +- libraries/AP_HAL_AVR/RCInput.h | 10 +++++----- libraries/AP_HAL_AVR/RCInput_APM1.cpp | 16 ++++++++-------- libraries/AP_HAL_AVR/RCInput_APM2.cpp | 16 ++++++++-------- libraries/AP_HAL_AVR_SITL/RCInput.cpp | 2 +- libraries/AP_HAL_AVR_SITL/RCInput.h | 2 +- libraries/AP_HAL_Empty/RCInput.cpp | 2 +- libraries/AP_HAL_Empty/RCInput.h | 2 +- libraries/AP_HAL_PX4/RCInput.cpp | 2 +- libraries/AP_HAL_PX4/RCInput.h | 2 +- libraries/AP_HAL_SMACCM/RCInput.cpp | 2 +- libraries/AP_HAL_SMACCM/RCInput.h | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/libraries/AP_HAL/RCInput.h b/libraries/AP_HAL/RCInput.h index 60884453ce..1d5f64fb59 100644 --- a/libraries/AP_HAL/RCInput.h +++ b/libraries/AP_HAL/RCInput.h @@ -23,7 +23,7 @@ public: * Could be less than or greater than 8 depending on your incoming radio * or PPM stream */ - virtual uint8_t valid() = 0; + virtual uint8_t valid_channels() = 0; /* Read a single channel at a time */ virtual uint16_t read(uint8_t ch) = 0; diff --git a/libraries/AP_HAL_AVR/RCInput.h b/libraries/AP_HAL_AVR/RCInput.h index 8346b291f0..3b03d696fe 100644 --- a/libraries/AP_HAL_AVR/RCInput.h +++ b/libraries/AP_HAL_AVR/RCInput.h @@ -17,13 +17,13 @@ public: void init(void* isrregistry); /** - * valid(): + * valid_channels(): * Return the number of currently valid channels. * Typically 0 (no valid radio channels) or 8 (implementation-defined) * Could be less than or greater than 8 depending on your incoming radio * or PPM stream */ - uint8_t valid(); + uint8_t valid_channels(); /** * read(uint8_t): @@ -58,7 +58,7 @@ private: static void _timer4_capt_cb(void); /* private variables to communicate with input capture isr */ static volatile uint16_t _pulse_capt[AVR_RC_INPUT_NUM_CHANNELS]; - static volatile uint8_t _valid; + static volatile uint8_t _valid_channels; /* override state */ uint16_t _override[AVR_RC_INPUT_NUM_CHANNELS]; @@ -67,7 +67,7 @@ private: class AP_HAL_AVR::APM2RCInput : public AP_HAL::RCInput { /* Pass in a AP_HAL_AVR::ISRRegistry* as void*. */ void init(void* isrregistry); - uint8_t valid(); + uint8_t valid_channels(); uint16_t read(uint8_t ch); uint8_t read(uint16_t* periods, uint8_t len); bool set_overrides(int16_t *overrides, uint8_t len); @@ -78,7 +78,7 @@ private: static void _timer5_capt_cb(void); /* private variables to communicate with input capture isr */ static volatile uint16_t _pulse_capt[AVR_RC_INPUT_NUM_CHANNELS]; - static volatile uint8_t _valid; + static volatile uint8_t _valid_channels; /* override state */ uint16_t _override[AVR_RC_INPUT_NUM_CHANNELS]; diff --git a/libraries/AP_HAL_AVR/RCInput_APM1.cpp b/libraries/AP_HAL_AVR/RCInput_APM1.cpp index 491ba01183..ebdc163917 100644 --- a/libraries/AP_HAL_AVR/RCInput_APM1.cpp +++ b/libraries/AP_HAL_AVR/RCInput_APM1.cpp @@ -15,7 +15,7 @@ extern const HAL& hal; /* private variables to communicate with input capture isr */ volatile uint16_t APM1RCInput::_pulse_capt[AVR_RC_INPUT_NUM_CHANNELS] = {0}; -volatile uint8_t APM1RCInput::_valid = 0; +volatile uint8_t APM1RCInput::_valid_channels = 0; /* private callback for input capture ISR */ void APM1RCInput::_timer4_capt_cb(void) { @@ -34,7 +34,7 @@ void APM1RCInput::_timer4_capt_cb(void) { if (pulse_width > 8000) { // sync pulse detected. Pass through values if at least a minimum number of channels received if( channel_ctr >= AVR_RC_INPUT_MIN_CHANNELS ) { - _valid = channel_ctr; + _valid_channels = channel_ctr; } channel_ctr = 0; } else { @@ -42,7 +42,7 @@ void APM1RCInput::_timer4_capt_cb(void) { _pulse_capt[channel_ctr] = pulse_width; channel_ctr++; if (channel_ctr == AVR_RC_INPUT_NUM_CHANNELS) { - _valid = AVR_RC_INPUT_NUM_CHANNELS; + _valid_channels = AVR_RC_INPUT_NUM_CHANNELS; } } } @@ -77,7 +77,7 @@ void APM1RCInput::init(void* _isrregistry) { TIMSK4 |= _BV(ICIE4); } -uint8_t APM1RCInput::valid() { return _valid; } +uint8_t APM1RCInput::valid_channels() { return _valid_channels; } /* constrain captured pulse to be between min and max pulsewidth. */ @@ -94,7 +94,7 @@ uint16_t APM1RCInput::read(uint8_t ch) { cli(); uint16_t capt = _pulse_capt[ch]; sei(); - _valid = 0; + _valid_channels = 0; /* scale _pulse_capt from 0.5us units to 1us units. */ uint16_t pulse = constrain_pulse(capt >> 1); /* Check for override */ @@ -121,8 +121,8 @@ uint8_t APM1RCInput::read(uint16_t* periods, uint8_t len) { periods[i] = _override[i]; } } - uint8_t v = _valid; - _valid = 0; + uint8_t v = _valid_channels; + _valid_channels = 0; return v; } @@ -139,7 +139,7 @@ bool APM1RCInput::set_override(uint8_t channel, int16_t override) { if (channel < AVR_RC_INPUT_NUM_CHANNELS) { _override[channel] = override; if (override != 0) { - _valid = 1; + _valid_channels = 1; return true; } } diff --git a/libraries/AP_HAL_AVR/RCInput_APM2.cpp b/libraries/AP_HAL_AVR/RCInput_APM2.cpp index 2d23663f55..31c4f2d46f 100644 --- a/libraries/AP_HAL_AVR/RCInput_APM2.cpp +++ b/libraries/AP_HAL_AVR/RCInput_APM2.cpp @@ -15,7 +15,7 @@ extern const HAL& hal; /* private variables to communicate with input capture isr */ volatile uint16_t APM2RCInput::_pulse_capt[AVR_RC_INPUT_NUM_CHANNELS] = {0}; -volatile uint8_t APM2RCInput::_valid = 0; +volatile uint8_t APM2RCInput::_valid_channels = 0; /* private callback for input capture ISR */ void APM2RCInput::_timer5_capt_cb(void) { @@ -34,7 +34,7 @@ void APM2RCInput::_timer5_capt_cb(void) { if (pulse_width > 8000) { // sync pulse detected. Pass through values if at least a minimum number of channels received if( channel_ctr >= AVR_RC_INPUT_MIN_CHANNELS ) { - _valid = channel_ctr; + _valid_channels = channel_ctr; } channel_ctr = 0; } else { @@ -42,7 +42,7 @@ void APM2RCInput::_timer5_capt_cb(void) { _pulse_capt[channel_ctr] = pulse_width; channel_ctr++; if (channel_ctr == AVR_RC_INPUT_NUM_CHANNELS) { - _valid = AVR_RC_INPUT_NUM_CHANNELS; + _valid_channels = AVR_RC_INPUT_NUM_CHANNELS; } } } @@ -77,7 +77,7 @@ void APM2RCInput::init(void* _isrregistry) { TIMSK5 |= _BV(ICIE5); } -uint8_t APM2RCInput::valid() { return _valid; } +uint8_t APM2RCInput::valid_channels() { return _valid_channels; } /* constrain captured pulse to be between min and max pulsewidth. */ static inline uint16_t constrain_pulse(uint16_t p) { @@ -94,7 +94,7 @@ uint16_t APM2RCInput::read(uint8_t ch) { cli(); uint16_t capt = _pulse_capt[ch]; sei(); - _valid = 0; + _valid_channels = 0; /* scale _pulse_capt from 0.5us units to 1us units. */ uint16_t pulse = constrain_pulse(capt >> 1); /* Check for override */ @@ -121,8 +121,8 @@ uint8_t APM2RCInput::read(uint16_t* periods, uint8_t len) { periods[i] = _override[i]; } } - uint8_t v = _valid; - _valid = 0; + uint8_t v = _valid_channels; + _valid_channels = 0; return v; } @@ -139,7 +139,7 @@ bool APM2RCInput::set_override(uint8_t channel, int16_t override) { if (channel < AVR_RC_INPUT_NUM_CHANNELS) { _override[channel] = override; if (override != 0) { - _valid = 1; + _valid_channels = 1; return true; } } diff --git a/libraries/AP_HAL_AVR_SITL/RCInput.cpp b/libraries/AP_HAL_AVR_SITL/RCInput.cpp index 041b4f328f..2acbfe2505 100644 --- a/libraries/AP_HAL_AVR_SITL/RCInput.cpp +++ b/libraries/AP_HAL_AVR_SITL/RCInput.cpp @@ -12,7 +12,7 @@ void SITLRCInput::init(void* machtnichts) clear_overrides(); } -uint8_t SITLRCInput::valid() { +uint8_t SITLRCInput::valid_channels() { return _sitlState->pwm_valid; } diff --git a/libraries/AP_HAL_AVR_SITL/RCInput.h b/libraries/AP_HAL_AVR_SITL/RCInput.h index 34a4b69330..0c92151f23 100644 --- a/libraries/AP_HAL_AVR_SITL/RCInput.h +++ b/libraries/AP_HAL_AVR_SITL/RCInput.h @@ -12,7 +12,7 @@ public: _sitlState = sitlState; } void init(void* machtnichts); - uint8_t valid(); + uint8_t valid_channels(); uint16_t read(uint8_t ch); uint8_t read(uint16_t* periods, uint8_t len); diff --git a/libraries/AP_HAL_Empty/RCInput.cpp b/libraries/AP_HAL_Empty/RCInput.cpp index 6c8b23e320..811812921d 100644 --- a/libraries/AP_HAL_Empty/RCInput.cpp +++ b/libraries/AP_HAL_Empty/RCInput.cpp @@ -8,7 +8,7 @@ EmptyRCInput::EmptyRCInput() void EmptyRCInput::init(void* machtnichts) {} -uint8_t EmptyRCInput::valid() { +uint8_t EmptyRCInput::valid_channels() { return 0; } diff --git a/libraries/AP_HAL_Empty/RCInput.h b/libraries/AP_HAL_Empty/RCInput.h index a584091b4c..6e8cedff6f 100644 --- a/libraries/AP_HAL_Empty/RCInput.h +++ b/libraries/AP_HAL_Empty/RCInput.h @@ -8,7 +8,7 @@ class Empty::EmptyRCInput : public AP_HAL::RCInput { public: EmptyRCInput(); void init(void* machtnichts); - uint8_t valid(); + uint8_t valid_channels(); uint16_t read(uint8_t ch); uint8_t read(uint16_t* periods, uint8_t len); diff --git a/libraries/AP_HAL_PX4/RCInput.cpp b/libraries/AP_HAL_PX4/RCInput.cpp index 89de14b581..14344c1ecc 100644 --- a/libraries/AP_HAL_PX4/RCInput.cpp +++ b/libraries/AP_HAL_PX4/RCInput.cpp @@ -19,7 +19,7 @@ void PX4RCInput::init(void* unused) clear_overrides(); } -uint8_t PX4RCInput::valid() +uint8_t PX4RCInput::valid_channels() { return _rcin.timestamp != _last_read || _override_valid; } diff --git a/libraries/AP_HAL_PX4/RCInput.h b/libraries/AP_HAL_PX4/RCInput.h index 759e66b8f6..c1384f216c 100644 --- a/libraries/AP_HAL_PX4/RCInput.h +++ b/libraries/AP_HAL_PX4/RCInput.h @@ -9,7 +9,7 @@ class PX4::PX4RCInput : public AP_HAL::RCInput { public: void init(void* machtnichts); - uint8_t valid(); + uint8_t valid_channels(); uint16_t read(uint8_t ch); uint8_t read(uint16_t* periods, uint8_t len); diff --git a/libraries/AP_HAL_SMACCM/RCInput.cpp b/libraries/AP_HAL_SMACCM/RCInput.cpp index 2b70bccf2e..4179aa9016 100644 --- a/libraries/AP_HAL_SMACCM/RCInput.cpp +++ b/libraries/AP_HAL_SMACCM/RCInput.cpp @@ -29,7 +29,7 @@ void SMACCMRCInput::init(void *unused) clear_overrides(); } -uint8_t SMACCMRCInput::valid() +uint8_t SMACCMRCInput::valid_channels() { // If any of the overrides are positive, we have valid data. for (int i = 0; i < SMACCM_RCINPUT_CHANNELS; ++i) diff --git a/libraries/AP_HAL_SMACCM/RCInput.h b/libraries/AP_HAL_SMACCM/RCInput.h index 495e6f719d..40637d1287 100644 --- a/libraries/AP_HAL_SMACCM/RCInput.h +++ b/libraries/AP_HAL_SMACCM/RCInput.h @@ -10,7 +10,7 @@ class SMACCM::SMACCMRCInput : public AP_HAL::RCInput { public: SMACCMRCInput(); void init(void *unused); - uint8_t valid(); + uint8_t valid_channels(); uint16_t read(uint8_t ch); uint8_t read(uint16_t* periods, uint8_t len);