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

Merge pull request #8622 from jepler/merge-828

Browse Source 
Merge 8.2.x (equivalent to 8.2.8) in to main
This commit is contained in:
Dan Halbert 2023-11-16 16:29:13 -05:00 committed by GitHub
commit 64f6db113d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21 CHIP_FAMILY = samd21
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C" EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
# Turn off displayio to make room for frozen libs. # Turn off displayio to make room for frozen libs.

2
ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21 CHIP_FAMILY = samd21
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C" EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
# Turn off features and optimizations for Crickit build to make room for additional frozen libs. # Turn off features and optimizations for Crickit build to make room for additional frozen libs.
LONGINT_IMPL = NONE LONGINT_IMPL = NONE

2
ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21 CHIP_FAMILY = samd21
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C" EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
# Turn off features and optimizations for displayio build to make room for additional frozen libs. # Turn off features and optimizations for displayio build to make room for additional frozen libs.
LONGINT_IMPL = NONE LONGINT_IMPL = NONE

2
ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
View File

@ -7,5 +7,5 @@ CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21 CHIP_FAMILY = samd21
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C" EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ

2
ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21 CHIP_FAMILY = samd21
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C" EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
# Make space for frozen libs # Make space for frozen libs

2
ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAME51J19A
CHIP_FAMILY = same51 CHIP_FAMILY = same51
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = GD25Q16C EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
CIRCUITPY__EVE = 1 CIRCUITPY__EVE = 1

2
ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD51J19A
CHIP_FAMILY = samd51 CHIP_FAMILY = samd51
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = GD25Q16C EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
CIRCUITPY__EVE = 1 CIRCUITPY__EVE = 1

2
ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21 CHIP_FAMILY = samd21
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "W25Q16FW, GD25Q16C" EXTERNAL_FLASH_DEVICES = "W25Q16FW, GD25Q16C, W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
CIRCUITPY_BITBANG_APA102 = 1 CIRCUITPY_BITBANG_APA102 = 1

2
ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD51G19A
CHIP_FAMILY = samd51 CHIP_FAMILY = samd51
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = GD25Q16C EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
CIRCUITPY_FLOPPYIO = 0 CIRCUITPY_FLOPPYIO = 0

2
ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD51J19A
CHIP_FAMILY = samd51 CHIP_FAMILY = samd51
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C" EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C, W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
CIRCUITPY_LTO_PARTITION = one CIRCUITPY_LTO_PARTITION = one

2
ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
View File

@ -7,5 +7,5 @@ CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21 CHIP_FAMILY = samd21
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C" EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ

2
ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD51J19A
CHIP_FAMILY = samd51 CHIP_FAMILY = samd51
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C" EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C, W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
CIRCUITPY__EVE = 1 CIRCUITPY__EVE = 1

2
ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
View File

@ -7,7 +7,7 @@ CHIP_VARIANT = SAMD51J19A
CHIP_FAMILY = samd51 CHIP_FAMILY = samd51
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C" EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C, W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
CIRCUITPY__EVE = 1 CIRCUITPY__EVE = 1

2
ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk
View File

@ -8,4 +8,4 @@ CHIP_FAMILY = samd21
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = GD25Q16C EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ"

2
ports/espressif/peripherals/esp32/pins.c
View File

@ -59,7 +59,7 @@ const mcu_pin_obj_t pin_GPIO27 = PIN(27, ADC_UNIT_2, ADC_CHANNEL_7, TOUCH_PAD_NU
// no GPIO29 // no GPIO29
// no GPIO30 // no GPIO30
// no GPIO31 // no GPIO31
const mcu_pin_obj_t pin_GPIO32 = PIN(32, ADC_UNIT_1, ADC_CHANNEL_1, TOUCH_PAD_NUM9); const mcu_pin_obj_t pin_GPIO32 = PIN(32, ADC_UNIT_1, ADC_CHANNEL_4, TOUCH_PAD_NUM9);
const mcu_pin_obj_t pin_GPIO33 = PIN(33, ADC_UNIT_1, ADC_CHANNEL_5, TOUCH_PAD_NUM8); const mcu_pin_obj_t pin_GPIO33 = PIN(33, ADC_UNIT_1, ADC_CHANNEL_5, TOUCH_PAD_NUM8);
const mcu_pin_obj_t pin_GPIO34 = PIN(34, ADC_UNIT_1, ADC_CHANNEL_6, NO_TOUCH_CHANNEL); const mcu_pin_obj_t pin_GPIO34 = PIN(34, ADC_UNIT_1, ADC_CHANNEL_6, NO_TOUCH_CHANNEL);
const mcu_pin_obj_t pin_GPIO35 = PIN(35, ADC_UNIT_1, ADC_CHANNEL_7, NO_TOUCH_CHANNEL); const mcu_pin_obj_t pin_GPIO35 = PIN(35, ADC_UNIT_1, ADC_CHANNEL_7, NO_TOUCH_CHANNEL);

2
ports/nrf/boards/adafruit_led_glasses_nrf52840/mpconfigboard.mk
View File

@ -6,6 +6,6 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
MCU_CHIP = nrf52840 MCU_CHIP = nrf52840
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "GD25Q16C" EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ"
CIRCUITPY_IS31FL3741 = 1 CIRCUITPY_IS31FL3741 = 1

2
ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.mk
View File

@ -6,4 +6,4 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
MCU_CHIP = nrf52840 MCU_CHIP = nrf52840
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "GD25Q16C" EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"

2
ports/nrf/boards/clue_nrf52840_express/mpconfigboard.mk
View File

@ -6,4 +6,4 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
MCU_CHIP = nrf52840 MCU_CHIP = nrf52840
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "GD25Q16C" EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"

2
ports/nrf/boards/feather_bluefruit_sense/mpconfigboard.mk
View File

@ -6,4 +6,4 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
MCU_CHIP = nrf52840 MCU_CHIP = nrf52840
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "GD25Q16C" EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"

2
ports/nrf/boards/feather_nrf52840_express/mpconfigboard.mk
View File

@ -6,4 +6,4 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
MCU_CHIP = nrf52840 MCU_CHIP = nrf52840
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "GD25Q16C" EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"

2
ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.mk
View File

@ -9,4 +9,4 @@ MCU_CHIP = nrf52840
CIRCUITPY_BITBANG_APA102 = 1 CIRCUITPY_BITBANG_APA102 = 1
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "GD25Q16C" EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"

2
ports/nrf/boards/metro_nrf52840_express/mpconfigboard.mk
View File

@ -6,6 +6,6 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
MCU_CHIP = nrf52840 MCU_CHIP = nrf52840
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "GD25Q16C" EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"
CIRCUITPY__EVE = 1 CIRCUITPY__EVE = 1

2
ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
View File

@ -4,7 +4,7 @@ USB_PRODUCT = "Feather STM32F405 Express"
USB_MANUFACTURER = "Adafruit Industries LLC" USB_MANUFACTURER = "Adafruit Industries LLC"
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = GD25Q16C EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"
MCU_SERIES = F4 MCU_SERIES = F4
MCU_VARIANT = STM32F405xx MCU_VARIANT = STM32F405xx

2
ports/stm/boards/stm32f411ce_blackpill_with_flash/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_MANUFACTURER = "WeAct"
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
#See supervisor/shared/external_flash/devices.h for options #See supervisor/shared/external_flash/devices.h for options
EXTERNAL_FLASH_DEVICES = GD25Q16C,W25Q64FV,W25Q32JVxQ,W25Q64JVxQ EXTERNAL_FLASH_DEVICES = GD25Q16C,W25Q16JVxQ,W25Q64FV,W25Q32JVxQ,W25Q64JVxQ
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
INTERNAL_FLASH_FILESYSTEM = 0 INTERNAL_FLASH_FILESYSTEM = 0