Browse Source

AP_HAL_SITL: AnalogIn minor fixes

change pin to int16_t to match real implementation and prevent casting.
make constructor explicit
mission-4.1.18
Pierre Kancir 8 years ago committed by Francisco Ferreira
parent
commit
5b2b4430b3
  1. 2
      libraries/AP_HAL_SITL/AnalogIn.cpp
  2. 8
      libraries/AP_HAL_SITL/AnalogIn.h

2
libraries/AP_HAL_SITL/AnalogIn.cpp

@ -9,7 +9,7 @@ using namespace HALSITL; @@ -9,7 +9,7 @@ using namespace HALSITL;
extern const AP_HAL::HAL& hal;
ADCSource::ADCSource(SITL_State *sitlState, uint8_t pin) :
ADCSource::ADCSource(SITL_State *sitlState, int16_t pin) :
_sitlState(sitlState),
_pin(pin)
{}

8
libraries/AP_HAL_SITL/AnalogIn.h

@ -9,7 +9,7 @@ class HALSITL::ADCSource : public AP_HAL::AnalogSource { @@ -9,7 +9,7 @@ class HALSITL::ADCSource : public AP_HAL::AnalogSource {
public:
friend class HALSITL::AnalogIn;
/* pin designates the ADC input number */
ADCSource(SITL_State *sitlState, uint8_t pin);
ADCSource(SITL_State *sitlState, int16_t pin);
/* implement AnalogSource virtual api: */
float read_average();
@ -25,16 +25,14 @@ public: @@ -25,16 +25,14 @@ public:
private:
SITL_State *_sitlState;
uint8_t _pin;
int16_t _pin;
};
/* AnalogIn : a concrete class providing the implementations of the
* timer event and the AP_HAL::AnalogIn interface */
class HALSITL::AnalogIn : public AP_HAL::AnalogIn {
public:
AnalogIn(SITL_State *sitlState) {
_sitlState = sitlState;
}
explicit AnalogIn(SITL_State *sitlState): _sitlState(sitlState) {}
void init();
AP_HAL::AnalogSource* channel(int16_t n);
float board_voltage(void) {

Loading…
Cancel
Save