From 4820e0b2c74276732142156980f2622c376e52b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mayoral=20Vilches?= Date: Thu, 31 Dec 2015 00:38:56 +0100 Subject: [PATCH] HAL_Linux: AnalogIn_PXF changes in AnalogIn Recent changes in AP_HAL::AnalogIn have made the previous code not valid anymore. This commit fixes the init() method and adds common headers. --- libraries/AP_HAL_Linux/AnalogIn_PXF.cpp | 2 +- libraries/AP_HAL_Linux/AnalogIn_PXF.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/AP_HAL_Linux/AnalogIn_PXF.cpp b/libraries/AP_HAL_Linux/AnalogIn_PXF.cpp index 640177e551..ff678e6a54 100644 --- a/libraries/AP_HAL_Linux/AnalogIn_PXF.cpp +++ b/libraries/AP_HAL_Linux/AnalogIn_PXF.cpp @@ -131,7 +131,7 @@ void PXFAnalogSource::set_settle_time(uint16_t settle_time_ms) PXFAnalogIn::PXFAnalogIn() {} -void PXFAnalogIn::init(void* machtnichts) +void PXFAnalogIn::init() {} diff --git a/libraries/AP_HAL_Linux/AnalogIn_PXF.h b/libraries/AP_HAL_Linux/AnalogIn_PXF.h index 2c362b3f03..0307e9bcbb 100644 --- a/libraries/AP_HAL_Linux/AnalogIn_PXF.h +++ b/libraries/AP_HAL_Linux/AnalogIn_PXF.h @@ -3,6 +3,8 @@ #define __AP_HAL_PXF_ANALOGIN_H__ #include "AP_HAL_Linux.h" +#include + #include #include #include @@ -45,7 +47,7 @@ private: class PXFAnalogIn : public AP_HAL::AnalogIn { public: PXFAnalogIn(); - void init(void* implspecific); + void init(); AP_HAL::AnalogSource* channel(int16_t n); // we don't yet know how to get the board voltage