djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix builds

Browse Source 
* Disable bleio on C3 with 4MB flash.
* Fix gpio include path in board.c's that use it.
This commit is contained in:
Scott Shawcroft 2023-09-21 16:02:41 -07:00
parent 16d1dc2be0
commit 1480d70d17
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
33 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk
View File

@ -8,3 +8,5 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
CIRCUITPY_BLEIO = 0

2
ports/espressif/boards/adafruit_feather_esp32s2/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/adafruit_matrixportal_s3/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
View File

@ -8,3 +8,5 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
CIRCUITPY_BLEIO = 0

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

@ -28,7 +28,7 @@
#include "shared-bindings/microcontroller/Pin.h"
#include "supervisor/board.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "soc/usb_serial_jtag_struct.h"
void board_init(void) {

2
ports/espressif/boards/ai_thinker_esp32-c3s/board.c
View File

@ -28,7 +28,7 @@
#include "shared-bindings/microcontroller/Pin.h"
#include "supervisor/board.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "soc/usb_serial_jtag_struct.h"
void board_init(void) {

2
ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
View File

@ -8,3 +8,5 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
CIRCUITPY_BLEIO = 0

10
ports/espressif/boards/arduino_nano_esp32s3/board.c
View File

@ -27,15 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
}
#include "components/driver/gpio/include/driver/gpio.h"
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
if (pin_number == 13) {

10
ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/board.c
View File

@ -27,15 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
}
#include "components/driver/gpio/include/driver/gpio.h"
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
if (pin_number == 13) {

2
ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
View File

@ -9,3 +9,5 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
CIRCUITPY_ESP_FLASH_SIZE=4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
CIRCUITPY_BLEIO = 0

2
ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/deneyap_kart/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/deneyap_kart_1a/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
View File

@ -8,3 +8,5 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
CIRCUITPY_BLEIO = 0

2
ports/espressif/boards/espressif_esp32_eye/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/espressif_esp32_lyrat/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
View File

@ -8,3 +8,5 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
CIRCUITPY_ESP_FLASH_SIZE=4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
CIRCUITPY_BLEIO = 0

2
ports/espressif/boards/lolin_c3_pico/mpconfigboard.mk
View File

@ -9,5 +9,7 @@ CIRCUITPY_ESP_FLASH_SIZE=4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
CIRCUITPY_BLEIO = 0
# Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

2
ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
View File

@ -8,3 +8,5 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
CIRCUITPY_ESP_FLASH_SIZE=4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
CIRCUITPY_BLEIO = 0

2
ports/espressif/boards/luatos_core_esp32c3_ch343/mpconfigboard.mk
View File

@ -8,3 +8,5 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
CIRCUITPY_ESP_FLASH_SIZE=4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
CIRCUITPY_BLEIO = 0

2
ports/espressif/boards/m5stack_core2/board.c
View File

@ -34,7 +34,7 @@
#include "shared-bindings/board/__init__.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
View File

@ -8,3 +8,5 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
CIRCUITPY_ESP_FLASH_SIZE=4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
CIRCUITPY_BLEIO = 0

2
ports/espressif/boards/m5stack_stick_c/board.c
View File

@ -33,7 +33,7 @@
#include "shared-module/displayio/mipi_constants.h"
#include "shared-bindings/board/__init__.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/m5stack_stick_c_plus/board.c
View File

@ -33,7 +33,7 @@
#include "shared-module/displayio/mipi_constants.h"
#include "shared-bindings/board/__init__.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/m5stack_timer_camera_x/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
View File

@ -8,3 +8,5 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
CIRCUITPY_BLEIO = 0

2
ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
View File

@ -8,3 +8,5 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
CIRCUITPY_BLEIO = 0

2
ports/espressif/boards/unexpectedmaker_tinypico/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

2
ports/espressif/boards/unexpectedmaker_tinypico_nano/board.c
View File

@ -27,7 +27,7 @@
#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "components/driver/include/driver/gpio.h"
#include "components/driver/gpio/include/driver/gpio.h"
#include "components/hal/include/hal/gpio_hal.h"
#include "common-hal/microcontroller/Pin.h"

3
ports/espressif/common-hal/canio/Listener.c
View File

@ -39,7 +39,8 @@
#include "hal/twai_ll.h"
#if !defined(TWAI) && defined(TWAI0)
// There is no logic that dictates TWAI vs TWAI0
#if defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP32C6)
#define TWAI TWAI0
#endif