Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 0773dd7

Browse files
Bugfix/include order (#10841)
* fix(arduino): include order pins_arduino first * fix(arduino): include order pins_arduino first * fix(arduino): include order pins_arduino first
1 parent 4c36c89 commit 0773dd7

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

‎cores/esp32/Arduino.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,17 @@
3333
#include "freertos/FreeRTOS.h"
3434
#include "freertos/task.h"
3535
#include "freertos/semphr.h"
36-
#include "esp32-hal.h"
3736
#include "esp8266-compat.h"
3837
#include "soc/gpio_reg.h"
3938

4039
#include "stdlib_noniso.h"
4140
#include "binary.h"
4241
#include "extra_attr.h"
4342

43+
#include "pins_arduino.h"
44+
#include "io_pin_remap.h"
45+
#include "esp32-hal.h"
46+
4447
#define PI 3.1415926535897932384626433832795
4548
#define HALF_PI 1.5707963267948966192313216916398
4649
#define TWO_PI 6.283185307179586476925286766559
@@ -248,8 +251,4 @@ void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
248251
void noTone(uint8_t _pin);
249252

250253
#endif /* __cplusplus */
251-
252-
#include "pins_arduino.h"
253-
#include "io_pin_remap.h"
254-
255254
#endif /* _ESP32_CORE_ARDUINO_H_ */

‎cores/esp32/FirmwareMSC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include "esp_partition.h"
2020
#include "esp_ota_ops.h"
2121
#include "esp_image_format.h"
22-
#include "esp32-hal.h"
2322
#include "pins_arduino.h"
23+
#include "esp32-hal.h"
2424
#include "firmware_msc_fat.h"
2525
#include "spi_flash_mmap.h"
2626

‎cores/esp32/esp32-hal-gpio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
extern "C" {
2525
#endif
2626

27+
#include "pins_arduino.h"
2728
#include "esp32-hal.h"
2829
#include "soc/soc_caps.h"
29-
#include "pins_arduino.h"
3030
#include "driver/gpio.h"
3131

3232
#if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3)

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /