10000 Fix board includes with component path · codetiger/circuitpython@bb75254 · GitHub
[go: up one dir, main page]
Skip to content

Commit bb75254

Browse files
tannewttannewt
committed
Fix board includes with component path
1 parent 60cd2eb commit bb75254

File tree

33 files changed

+28
-109
lines changed

33 files changed

+28
-109
lines changed

‎ports/espressif/boards/adafruit_feather_esp32_v2/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
10+
#include "driver/gpio.h"
1211
#include "common-hal/microcontroller/Pin.h"
1312

1413
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {

‎ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/board.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
10+
#include "driver/gpio.h"
1311

1412
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
1513
if (pin_number == 20) {

‎ports/espressif/boards/adafruit_feather_esp32s2/board.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
10+
#include "driver/gpio.h"
1311

1412
void board_init(void) {
1513
reset_board();

‎ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
10+
#include "driver/gpio.h"
1311

1412
void board_init(void) {
1513
reset_board();

‎ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
10+
#include "driver/gpio.h"
1311

1412
void board_init(void) {
1513
reset_board();

‎ports/espressif/boards/adafruit_itsybitsy_esp32/board.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
10+
#include "driver/gpio.h"
1311

1412
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
1513
if (pin_number == 2) {

‎ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "shared-module/displayio/__init__.h"
1414
#include "supervisor/shared/board.h"
1515

16-
#include "components/log/include/esp_log.h"
16+
#include "esp_log.h"
1717

1818
static const char *TAG = "board";
1919

‎ports/espressif/boards/adafruit_matrixportal_s3/board.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,5 @@
55
// SPDX-License-Identifier: MIT
66

77
#include "supervisor/board.h"
8-
#include "mpconfigboard.h"
9-
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
138

149
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
10+
#include "driver/gpio.h"
1311

1412
void board_init(void) {
1513
reset_board();

‎ports/espressif/boards/ai-thinker-esp32-cam/board.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88

99
#include "mpconfigboard.h"
1010
#include "shared-bindings/microcontroller/Pin.h"
11-
#include "components/driver/gpio/include/driver/gpio.h"
12-
#include "components/hal/include/hal/gpio_hal.h"
13-
#include "common-hal/microcontroller/Pin.h"
11+
#include "driver/gpio.h"
1412

1513
void board_init(void) {
1614
reset_board();

‎ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "shared-bindings/microcontroller/Pin.h"
99
#include "supervisor/board.h"
1010

11-
#include "components/driver/gpio/include/driver/gpio.h"
11+
#include "driver/gpio.h"
1212
#include "soc/usb_serial_jtag_struct.h"
1313

1414
void board_init(void) {

‎ports/espressif/boards/ai_thinker_esp32-c3s/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "shared-bindings/microcontroller/Pin.h"
99
#include "supervisor/board.h"
1010

11-
#include "components/driver/gpio/include/driver/gpio.h"
11+
#include "driver/gpio.h"
1212
#include "soc/usb_serial_jtag_struct.h"
1313

1414
void board_init(void) {

‎ports/espressif/boards/arduino_nano_esp32s3/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
10+
#include "driver/gpio.h"
1111

1212
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
1313
if (pin_number == 13) {

‎ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
10+
#include "driver/gpio.h"
1111

1212
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
1313
if (pin_number == 13) {

‎ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
10+
#include "driver/gpio.h"
1211
#include "common-hal/microcontroller/Pin.h"
1312

1413
void board_init(void) {

‎ports/espressif/boards/deneyap_kart/board.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,5 @@
55
// SPDX-License-Identifier: MIT
66

77
#include "supervisor/board.h"
8-
#include "mpconfigboard.h"
9-
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
138

149
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/espressif/boards/deneyap_kart_1a/board.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,5 @@
55
// SPDX-License-Identifier: MIT
66

77
#include "supervisor/board.h"
8-
#include "mpconfigboard.h"
9-
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
138

149
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/espressif/boards/espressif_esp32_eye/board.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
1010
#include "driver/gpio.h"
11-
#include "hal/gpio_hal.h"
1211
#include "common-hal/microcontroller/Pin.h"
1312

1413
void board_init(void) {

‎ports/espressif/boards/espressif_esp32_lyrat/board.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,5 @@
55
// SPDX-License-Identifier: MIT
66

77
#include "supervisor/board.h"
8-
#include "mpconfigboard.h"
9-
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
138

149
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/espressif/boards/lilygo_tdisplay_s3_pro/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#include "shared-module/displayio/mipi_constants.h"
1515
#include "shared-bindings/board/__init__.h"
1616

17-
#include "components/driver/gpio/include/driver/gpio.h"
18-
#include "components/hal/include/hal/gpio_hal.h"
17+
#include "driver/gpio.h"
1918
#include "common-hal/microcontroller/Pin.h"
2019

2120
uint8_t display_init_sequence[] = {

‎ports/espressif/boards/m5stack_core2/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
#include "shared-bindings/board/__init__.h"
1616

1717
#include "shared-bindings/microcontroller/Pin.h"
18-
#include "components/driver/gpio/include/driver/gpio.h"
19-
#include "components/hal/include/hal/gpio_hal.h"
18+
#include "driver/gpio.h"
2019
#include "common-hal/microcontroller/Pin.h"
2120

2221
#include "../../pmic/axp192/axp192.h"

‎ports/espressif/boards/m5stack_stick_c/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
#include "shared-module/displayio/mipi_constants.h"
1414
#include "shared-bindings/board/__init__.h"< D7AE /span>
1515
#include "shared-bindings/microcontroller/Pin.h"
16-
#include "components/driver/gpio/include/driver/gpio.h"
17-
#include "components/hal/include/hal/gpio_hal.h"
16+
#include "driver/gpio.h"
1817
#include "common-hal/microcontroller/Pin.h"
1918

2019
#include "../../pmic/axp192/axp192.h"

‎ports/espressif/boards/m5stack_stick_c_plus/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
#include "shared-module/displayio/mipi_constants.h"
1414
#include "shared-bindings/board/__init__.h"
1515
#include "shared-bindings/microcontroller/Pin.h"
16-
#include "components/driver/gpio/include/driver/gpio.h"
17-
#include "components/hal/include/hal/gpio_hal.h"
16+
#include "driver/gpio.h"
1817
#include "common-hal/microcontroller/Pin.h"
1918

2019
#include "../../pmic/axp192/axp192.h"

‎ports/espressif/boards/m5stack_timer_camera_x/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
10+
#include "driver/gpio.h"
1211
#include "common-hal/microcontroller/Pin.h"
1312

1413
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {

‎ports/espressif/boards/maker_badge/board.c

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,5 @@
55
// SPDX-License-Identifier: MIT
66

77
#include "supervisor/board.h"
8-
#include "mpconfigboard.h"
9-
#include "shared-bindings/busio/SPI.h"
10-
#include "shared-bindings/fourwire/FourWire.h"
11-
#include "shared-bindings/microcontroller/Pin.h"
12-
#include "shared-module/displayio/__init__.h"
13-
#include "supervisor/shared/board.h"
148

15-
#include "components/log/include/esp_log.h"
16-
17-
#define DELAY 0x80
18-
19-
void board_init(void) {
20-
}
21-
22-
bool board_requests_safe_mode(void) {
23-
return false;
24-
}
25-
26-
void reset_board(void) {
27-
28-
}
29-
30-
void board_deinit(void) {
31-
}
9+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/espressif/boards/seeed_xiao_esp32c6/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
#include "supervisor/board.h"
2828
#include "mpconfigboard.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
30-
#include "components/driver/gpio/include/driver/gpio.h"
31-
#include "components/hal/include/hal/gpio_hal.h"
30+
#include "driver/gpio.h"
3231
#include "common-hal/microcontroller/Pin.h"
3332

3433
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {

‎ports/espressif/boards/sensebox_mcu_esp32s2/board.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,5 @@
55
// SPDX-License-Identifier: MIT
66

77
#include "supervisor/board.h"
8-
#include "mpconfigboard.h"
9-
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
12-
#include "common-hal/microcontroller/Pin.h"
13-
14-
void board_init(void) {
15-
16-
}
17-
18-
198

209
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/espressif/boards/sqfmi_watchy/board.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
#include "shared-bindings/microcontroller/Pin.h"
1212
#include "shared-module/displayio/__init__.h"
1313
#include "supervisor/shared/board.h"
14-
#include "components/driver/gpio/include/driver/gpio.h"
15-
#include "components/hal/include/hal/gpio_hal.h"
14+
#include "driver/gpio.h"
1615

1716
#include "common-hal/microcontroller/Pin.h"
1817

19-
#include "components/log/include/esp_log.h"
18+
#include "esp_log.h"
2019
#include "supervisor/filesystem.h"
2120

2221
#define DELAY 0x80

‎ports/espressif/boards/sunton_esp32_2432S028/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
#include "shared-bindings/microcontroller/Pin.h"
1111
#include "shared-module/displayio/__init__.h"
1212
#include "shared-module/displayio/mipi_constants.h"
13-
#include "components/driver/gpio/include/driver/gpio.h"
14-
#include "components/hal/include/hal/gpio_hal.h"
13+
#include "driver/gpio.h"
1514
#include "common-hal/microcontroller/Pin.h"
1615

1716

‎ports/espressif/boards/sunton_esp32_2432S032C/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#include "supervisor/shared/board.h"
1515

1616
#include "shared-module/displayio/mipi_constants.h"
17-
#include "components/driver/gpio/include/driver/gpio.h"
18-
#include "components/hal/include/hal/gpio_hal.h"
17+
#include "driver/gpio.h"
1918
#include "common-hal/microcontroller/Pin.h"
2019

2120
#define DELAY 0x80

‎ports/espressif/boards/unexpectedmaker_tinypico/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
10+
#include "driver/gpio.h"
1211
#include "common-hal/microcontroller/Pin.h"
1312

1413
void board_init(void) {

‎ports/espressif/boards/unexpectedmaker_tinypico_nano/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
#include "supervisor/board.h"
88
#include "mpconfigboard.h"
99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "components/driver/gpio/include/driver/gpio.h"
11-
#include "components/hal/include/hal/gpio_hal.h"
10+
#include "driver/gpio.h"
1211
#include "common-hal/microcontroller/Pin.h"
1312

1413
void board_init(void) {

‎ports/espressif/boards/unexpectedmaker_tinywatch_s3/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "supervisor/board.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "components/driver/gpio/include/driver/gpio.h"
9+
#include "driver/gpio.h"
1010

1111
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
1212
// Pull USER_PWR_SHUTDOWN down (pull up shuts down power)

0 commit comments

Comments
 (0)
0