From d26e6e3189791b4d74326b175881518adff430db Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Fri, 10 Jan 2025 20:25:06 -0300 Subject: [PATCH 1/3] fix(arduino): include order pins_arduino first --- cores/esp32/Arduino.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h index ab7e497dcf6..d21089cc3fe 100644 --- a/cores/esp32/Arduino.h +++ b/cores/esp32/Arduino.h @@ -33,7 +33,6 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/semphr.h" -#include "esp32-hal.h" #include "esp8266-compat.h" #include "soc/gpio_reg.h" @@ -41,6 +40,10 @@ #include "binary.h" #include "extra_attr.h" +#include "pins_arduino.h" +#include "io_pin_remap.h" +#include "esp32-hal.h" + #define PI 3.1415926535897932384626433832795 #define HALF_PI 1.5707963267948966192313216916398 #define TWO_PI 6.283185307179586476925286766559 @@ -248,8 +251,4 @@ void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0); void noTone(uint8_t _pin); #endif /* __cplusplus */ - -#include "pins_arduino.h" -#include "io_pin_remap.h" - #endif /* _ESP32_CORE_ARDUINO_H_ */ From 152556dab0ac07dc9250892278928132f8f7399a Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Fri, 10 Jan 2025 20:26:27 -0300 Subject: [PATCH 2/3] fix(arduino): include order pins_arduino first --- cores/esp32/esp32-hal-gpio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp32/esp32-hal-gpio.h b/cores/esp32/esp32-hal-gpio.h index 4547d90cc56..9fce4368c22 100644 --- a/cores/esp32/esp32-hal-gpio.h +++ b/cores/esp32/esp32-hal-gpio.h @@ -24,9 +24,9 @@ extern "C" { #endif +#include "pins_arduino.h" #include "esp32-hal.h" #include "soc/soc_caps.h" -#include "pins_arduino.h" #include "driver/gpio.h" #if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3) From 63cb1e2a4d3c7f5e10cc1493e5f78916505f980d Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Fri, 10 Jan 2025 20:27:32 -0300 Subject: [PATCH 3/3] fix(arduino): include order pins_arduino first --- cores/esp32/FirmwareMSC.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp32/FirmwareMSC.cpp b/cores/esp32/FirmwareMSC.cpp index c408f52fcdb..2e944ad4df3 100644 --- a/cores/esp32/FirmwareMSC.cpp +++ b/cores/esp32/FirmwareMSC.cpp @@ -19,8 +19,8 @@ #include "esp_partition.h" #include "esp_ota_ops.h" #include "esp_image_format.h" -#include "esp32-hal.h" #include "pins_arduino.h" +#include "esp32-hal.h" #include "firmware_msc_fat.h" #include "spi_flash_mmap.h"