fix CPU on Monster M4SK; turn off audiobusio by default on SAMD51G

This commit is contained in:
Dan Halbert 2023-09-18 19:43:02 -04:00
parent 9e9dff4bf2
commit 931a6adb81
11 changed files with 10 additions and 23 deletions

View File

@ -10,9 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ" EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0
CIRCUITPY_FULL_BUILD = 0 CIRCUITPY_FULL_BUILD = 0
CIRCUITPY_AUDIOIO = 0 CIRCUITPY_AUDIOIO = 0
CIRCUITPY_AUDIOCORE = 0 CIRCUITPY_AUDIOCORE = 0

View File

@ -1,5 +1,5 @@
#define MICROPY_HW_BOARD_NAME "CP32-M4" #define MICROPY_HW_BOARD_NAME "CP32-M4"
#define MICROPY_HW_MCU_NAME "samd51j20" #define MICROPY_HW_MCU_NAME "samd51j20A"
#define MICROPY_HW_APA102_MOSI (&pin_PA12) #define MICROPY_HW_APA102_MOSI (&pin_PA12)
#define MICROPY_HW_APA102_SCK (&pin_PA13) #define MICROPY_HW_APA102_SCK (&pin_PA13)

View File

@ -9,6 +9,3 @@ CHIP_FAMILY = samd51
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "W25Q128JVxM" EXTERNAL_FLASH_DEVICES = "W25Q128JVxM"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
# No I2S on SAMD51G.
CIRCUITPY_AUDIOBUSIO = 0

View File

@ -10,7 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = GD25Q16C EXTERNAL_FLASH_DEVICES = GD25Q16C
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0
CIRCUITPY_BITBANG_APA102 = 1 CIRCUITPY_BITBANG_APA102 = 1

View File

@ -11,9 +11,6 @@ CIRCUITPY_FULL_BUILD = 0
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0
CIRCUITPY_BITBANG_APA102 = 1 CIRCUITPY_BITBANG_APA102 = 1
# Override optimization to keep binary small # Override optimization to keep binary small
OPTIMIZATION_FLAGS = -Os OPTIMIZATION_FLAGS = -Os

View File

@ -10,9 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "W25Q16JVxM, W25Q16JVxQ" EXTERNAL_FLASH_DEVICES = "W25Q16JVxM, W25Q16JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0
CIRCUITPY_BITBANG_APA102 = 1 CIRCUITPY_BITBANG_APA102 = 1
#Include these Python libraries in firmware. #Include these Python libraries in firmware.

View File

@ -1,5 +1,6 @@
#define MICROPY_HW_BOARD_NAME "Adafruit Monster M4SK" #define MICROPY_HW_BOARD_NAME "Adafruit Monster M4SK"
#define MICROPY_HW_MCU_NAME "samd51j19" // Board is mislabeled as SAMD51J19.
#define MICROPY_HW_MCU_NAME "samd51g19"
#define CIRCUITPY_MCU_FAMILY samd51 #define CIRCUITPY_MCU_FAMILY samd51

View File

@ -3,7 +3,8 @@ USB_PID = 0x8048
USB_PRODUCT = "Monster M4SK" USB_PRODUCT = "Monster M4SK"
USB_MANUFACTURER = "Adafruit Industries LLC" USB_MANUFACTURER = "Adafruit Industries LLC"
CHIP_VARIANT = SAMD51J19A # Board is mislabeled as SAMD51J19.
CHIP_VARIANT = SAMD51G19A
CHIP_FAMILY = samd51 CHIP_FAMILY = samd51
QSPI_FLASH_FILESYSTEM = 1 QSPI_FLASH_FILESYSTEM = 1

View File

@ -12,8 +12,6 @@ SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0
# Make room for more stuff # Make room for more stuff
CIRCUITPY_BITMAPTOOLS = 0 CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_DISPLAYIO = 0 CIRCUITPY_DISPLAYIO = 0

View File

@ -10,7 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, GD25Q64C" EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, GD25Q64C"
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0
CIRCUITPY_BITBANG_APA102 = 1 CIRCUITPY_BITBANG_APA102 = 1

View File

@ -108,6 +108,11 @@ CIRCUITPY_SAMD ?= 1
CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12 CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12
CIRCUITPY_WATCHDOG ?= 1 CIRCUITPY_WATCHDOG ?= 1
ifeq ($(CHIP_VARIANT),SAMD51G19A)
# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0
endif
endif # samd51 endif # samd51
###################################################################### ######################################################################