Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-10 18:08:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_AVR: AnalogIn returns new ADCSource each time a channel is requested

Browse Source 
* fixes a bug where multiple sources created as pin -1, then change to
  appropriate pin on mavlink messages. Make treat each creation as distinct
  object.
This commit is contained in:
Pat Hickey 2012-12-17 16:32:51 -08:00 committed by Andrew Tridgell
parent d5a46ca1e3
commit 087b1fa196
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/AP_HAL_AVR/AnalogIn.h
View File

@ -55,7 +55,6 @@ public:
AP_HAL::AnalogSource* channel(int16_t n, float prescale); AP_HAL::AnalogSource* channel(int16_t n, float prescale);
protected: protected:
static ADCSource* _find_or_create_channel(int16_t num, float scale);
static ADCSource* _create_channel(int16_t num, float scale); static ADCSource* _create_channel(int16_t num, float scale);
static void _register_channel(ADCSource*); static void _register_channel(ADCSource*);
static void _timer_event(uint32_t); static void _timer_event(uint32_t);

11
libraries/AP_HAL_AVR/AnalogIn_Common.cpp
View File

@ -31,15 +31,6 @@ void AVRAnalogIn::init(void* machtnichts) {
_register_channel(&_vcc); _register_channel(&_vcc);
} }
ADCSource* AVRAnalogIn::_find_or_create_channel(int16_t pin, float scale) {
for(int16_t i = 0; i < _num_channels; i++) {
if (_channels[i]->_pin == pin) {
return _channels[i];
}
}
return _create_channel(pin, scale);
}
ADCSource* AVRAnalogIn::_create_channel(int16_t chnum, float scale) { ADCSource* AVRAnalogIn::_create_channel(int16_t chnum, float scale) {
ADCSource *ch = new ADCSource(chnum, scale); ADCSource *ch = new ADCSource(chnum, scale);
_register_channel(ch); _register_channel(ch);
@ -121,7 +112,7 @@ AP_HAL::AnalogSource* AVRAnalogIn::channel(int16_t ch, float scale) {
if (ch == ANALOG_INPUT_BOARD_VCC) { if (ch == ANALOG_INPUT_BOARD_VCC) {
return &_vcc; return &_vcc;
} else { } else {
return _find_or_create_channel(ch, scale); return _create_channel(ch, scale);
} }
} }