cleanup headers

rtlopez · Nov 5, 2024 · 244de0e · 244de0e
1 parent ae4a90a
commit 244de0e
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 20 deletions.
diff --git a/lib/EspWire/src/EspWire.cpp b/lib/EspWire/src/EspWire.cpp
@@ -26,7 +26,6 @@ extern "C" {
   #include <string.h>
   #include <inttypes.h>
 }
-
 #include "esp_twi.h"
 #include "EspWire.h"
 

diff --git a/lib/EspWire/src/EspWire.h b/lib/EspWire/src/EspWire.h
@@ -25,9 +25,7 @@
 #define EspTwoWire_h
 
 #include <cinttypes>
-#ifndef UNIT_TEST
-#include <Stream.h>
-#endif
+#include <Arduino.h>
 
 #define ESPWIRE_BUFFER_LENGTH 64
 

diff --git a/lib/EspWire/src/esp_twi.cpp b/lib/EspWire/src/esp_twi.cpp
@@ -18,15 +18,11 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#include <Arduino.h>
 #include "esp_twi.h"
 #if defined(ESP32C3)
   #include <soc/cpu.h>
 #endif
-#ifndef UNIT_TEST
-#include <pins_arduino.h>
-#include <wiring_private.h>
-#else
-#endif
 
 uint16_t esp_twi_dcount = 18;
 static unsigned char esp_twi_sda, esp_twi_scl;

diff --git a/lib/EspWire/src/esp_twi.h b/lib/EspWire/src/esp_twi.h
@@ -20,7 +20,6 @@
 */
 #ifndef ESP_TWI_H
 #define ESP_TWI_H
-#include <Arduino.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/Espfc/src/Buzzer.cpp b/lib/Espfc/src/Buzzer.cpp
@@ -1,4 +1,3 @@
-//#include <Arduino.h>
 #include "Buzzer.h"
 #include "Hal/Gpio.h"
 

diff --git a/lib/Espfc/src/Device/FlashDevice.h b/lib/Espfc/src/Device/FlashDevice.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#include <Arduino.h>
-#include <platform.h>
 #include <algorithm>
-#include "esp_partition.h"
+#include <esp_partition.h>
 
 namespace Espfc {
 

diff --git a/lib/Espfc/src/ModelState.h b/lib/Espfc/src/ModelState.h
@@ -1,8 +1,6 @@
 #ifndef _ESPFC_MODEL_STATE_H_
 #define _ESPFC_MODEL_STATE_H_
 
-#include <Arduino.h>
-
 #ifndef UNIT_TEST
 #include <IPAddress.h>
 #endif

diff --git a/lib/betaflight/src/platform_cpp.cpp b/lib/betaflight/src/platform_cpp.cpp
@@ -1,5 +1,4 @@
-#include <Arduino.h>
-#include <platform.h>
+#include "platform.h"
 #include "Device/SerialDevice.h"
 #include "EscDriver.h"
 #include "Hal/Gpio.h"
@@ -14,11 +13,11 @@ void IOConfigGPIO(IO_t pin, uint8_t mode)
 {
     switch(mode) {
         case IOCFG_IPU:
-            ::pinMode(pin, INPUT_PULLUP);
+            Espfc::Hal::Gpio::pinMode(pin, INPUT_PULLUP);
             break;
         case IOCFG_OUT_PP:
         case IOCFG_AF_PP:
-            ::pinMode(pin, OUTPUT);
+            Espfc::Hal::Gpio::pinMode(pin, OUTPUT);
             break;
     }
 }