From 1f7ee552112d750732e6ac786ba0ec1a608913d5 Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Tue, 10 Jul 2018 18:26:13 -0700 Subject: [PATCH] AP_HAL_Linux: Remove GPIO::analogPinToDigitalPin() --- libraries/AP_HAL_Linux/GPIO_BBB.cpp | 6 ------ libraries/AP_HAL_Linux/GPIO_BBB.h | 1 - libraries/AP_HAL_Linux/GPIO_RPI.cpp | 5 ----- libraries/AP_HAL_Linux/GPIO_RPI.h | 1 - libraries/AP_HAL_Linux/GPIO_Sysfs.cpp | 5 ----- libraries/AP_HAL_Linux/GPIO_Sysfs.h | 5 ----- 6 files changed, 23 deletions(-) diff --git a/libraries/AP_HAL_Linux/GPIO_BBB.cpp b/libraries/AP_HAL_Linux/GPIO_BBB.cpp index d64473c97d..5a33829ffa 100644 --- a/libraries/AP_HAL_Linux/GPIO_BBB.cpp +++ b/libraries/AP_HAL_Linux/GPIO_BBB.cpp @@ -77,12 +77,6 @@ void GPIO_BBB::pinMode(uint8_t pin, uint8_t output) } } -int8_t GPIO_BBB::analogPinToDigitalPin(uint8_t pin) -{ - return -1; -} - - uint8_t GPIO_BBB::read(uint8_t pin) { uint8_t bank = pin/32; diff --git a/libraries/AP_HAL_Linux/GPIO_BBB.h b/libraries/AP_HAL_Linux/GPIO_BBB.h index 0df7c128d5..8d8e7a74a5 100644 --- a/libraries/AP_HAL_Linux/GPIO_BBB.h +++ b/libraries/AP_HAL_Linux/GPIO_BBB.h @@ -122,7 +122,6 @@ public: GPIO_BBB(); void init(); void pinMode(uint8_t pin, uint8_t output); - int8_t analogPinToDigitalPin(uint8_t pin); uint8_t read(uint8_t pin); void write(uint8_t pin, uint8_t value); void toggle(uint8_t pin); diff --git a/libraries/AP_HAL_Linux/GPIO_RPI.cpp b/libraries/AP_HAL_Linux/GPIO_RPI.cpp index 62b866e265..bc43148a93 100644 --- a/libraries/AP_HAL_Linux/GPIO_RPI.cpp +++ b/libraries/AP_HAL_Linux/GPIO_RPI.cpp @@ -91,11 +91,6 @@ void GPIO_RPI::pinMode(uint8_t pin, uint8_t output, uint8_t alt) } } -int8_t GPIO_RPI::analogPinToDigitalPin(uint8_t pin) -{ - return -1; -} - uint8_t GPIO_RPI::read(uint8_t pin) { uint32_t value = GPIO_GET(pin); diff --git a/libraries/AP_HAL_Linux/GPIO_RPI.h b/libraries/AP_HAL_Linux/GPIO_RPI.h index 59dc3ae808..7b0759a14d 100644 --- a/libraries/AP_HAL_Linux/GPIO_RPI.h +++ b/libraries/AP_HAL_Linux/GPIO_RPI.h @@ -49,7 +49,6 @@ public: void init(); void pinMode(uint8_t pin, uint8_t output); void pinMode(uint8_t pin, uint8_t output, uint8_t alt); - int8_t analogPinToDigitalPin(uint8_t pin); uint8_t read(uint8_t pin); void write(uint8_t pin, uint8_t value); void toggle(uint8_t pin); diff --git a/libraries/AP_HAL_Linux/GPIO_Sysfs.cpp b/libraries/AP_HAL_Linux/GPIO_Sysfs.cpp index 44406090fa..f682013335 100644 --- a/libraries/AP_HAL_Linux/GPIO_Sysfs.cpp +++ b/libraries/AP_HAL_Linux/GPIO_Sysfs.cpp @@ -171,11 +171,6 @@ void GPIO_Sysfs::toggle(uint8_t vpin) write(vpin, !read(vpin)); } -int8_t GPIO_Sysfs::analogPinToDigitalPin(uint8_t vpin) -{ - return -1; -} - AP_HAL::DigitalSource* GPIO_Sysfs::channel(uint16_t vpin) { assert_vpin(vpin, n_pins, nullptr); diff --git a/libraries/AP_HAL_Linux/GPIO_Sysfs.h b/libraries/AP_HAL_Linux/GPIO_Sysfs.h index 46bcc7ef89..5ff2f34e60 100644 --- a/libraries/AP_HAL_Linux/GPIO_Sysfs.h +++ b/libraries/AP_HAL_Linux/GPIO_Sysfs.h @@ -49,11 +49,6 @@ public: */ AP_HAL::DigitalSource *channel(uint16_t vpin) override; - /* - * Currently this function always returns -1. - */ - int8_t analogPinToDigitalPin(uint8_t vpin) override; - /* * Currently this function always returns false. */