Skip to content

Merge in 8.2.7 #8494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 58 commits into from
Oct 24, 2023
Merged

Merge in 8.2.7 #8494

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
9acc542
Deinit all the pins.
bill88t Sep 11, 2023
33acd5f
Merge pull request #8393 from bill88t/bp-cam-deinit
jepler Sep 13, 2023
5191071
fixing the wrong rx,tx gpio related issue.
tirtharajsinha Sep 13, 2023
f13edcc
Merge pull request #8396 from tirtharajsinha/8.2.x
dhalbert Sep 13, 2023
18041ea
rgbmatrix: more small doc improvements
jepler Sep 14, 2023
9b20e31
rgbmatrix: also explain the order of rgb and addr pins
jepler Sep 14, 2023
9710ef0
matrixportal_m4: Add board.MTX_ADDRESS and board.MTX_COMMON
jepler Sep 14, 2023
b61900f
fixup! matrixportal_m4: Add board.MTX_ADDRESS and board.MTX_COMMON
jepler Sep 14, 2023
0e78ab6
rgbmatrix: document MTX_ADDRESS and MTX_COMMON
jepler Sep 14, 2023
ee86c76
fix markup, that's not a link
jepler Sep 18, 2023
9e9dff4
Merge pull request #8400 from jepler/update-rgbmatrix-docs
dhalbert Sep 18, 2023
931a6ad
fix CPU on Monster M4SK; turn off audiobusio by default on SAMD51G
dhalbert Sep 18, 2023
40a5313
Merge pull request #8414 from dhalbert/samd51g-fixes
tannewt Sep 19, 2023
8f3c642
Fix MDNS after the user turns off wifi
tannewt Sep 20, 2023
37180b2
Merge pull request #8418 from tannewt/fix_mdns_crash_after_user_disco…
dhalbert Sep 21, 2023
9012e34
Add files via upload
MakerM0 Sep 24, 2023
9d90680
Add board def for MagiClick S3
MakerM0 Sep 24, 2023
f7bc3b8
Merge branch '8.2.x' into magiclick_s3_n4r2
MakerM0 Sep 24, 2023
0bf4f19
Merge pull request #1 from MakerM0/magiclick_s3_n4r2
MakerM0 Sep 24, 2023
a5ae99a
Update mpconfigboard.mk
MakerM0 Sep 24, 2023
12f35d1
Update mpconfigboard.mk
MakerM0 Sep 24, 2023
6d7a08b
Update board.c
MakerM0 Sep 24, 2023
6f77f0f
Update mpconfigboard.h
MakerM0 Sep 24, 2023
9ab8822
Update pins.c
MakerM0 Sep 24, 2023
ab8e119
Update sdkconfig
MakerM0 Sep 24, 2023
5ffb7e7
Update mpconfigboard.mk
MakerM0 Sep 24, 2023
0507e7a
Update mpconfigboard.mk
MakerM0 Sep 24, 2023
c35839a
Update board.c
MakerM0 Sep 24, 2023
3913adf
Update sdkconfig
MakerM0 Sep 24, 2023
918f93f
Update mpconfigboard.mk
MakerM0 Sep 24, 2023
71e165b
Update pins.c
MakerM0 Sep 24, 2023
ca4ecf0
Update board.c
MakerM0 Sep 24, 2023
1143d3e
Update mpconfigboard.h
MakerM0 Sep 24, 2023
e197493
Update mpconfigboard.mk
MakerM0 Sep 24, 2023
9284d25
Update pins.c
MakerM0 Sep 24, 2023
6acce76
Update pins.c
MakerM0 Sep 24, 2023
761ac3b
Update pins.c
MakerM0 Sep 24, 2023
586ead3
Merge pull request #8427 from MakerM0/8.2.x
dhalbert Sep 24, 2023
f5d4f1e
Fixed displayio/Bitmap value_count range
rimwolf-redux Sep 26, 2023
41096dd
Merge pull request #8434 from rimwolf-redux/bitmap
jepler Sep 27, 2023
79161db
Update sdkconfig
MakerM0 Sep 29, 2023
7aa8535
Update mpconfigboard.mk
MakerM0 Sep 29, 2023
4c21f22
Improve RGBMatrix allocation tracking
tannewt Sep 29, 2023
73292f6
Merge pull request #8445 from MakerM0/8.2.x
tannewt Sep 29, 2023
5327487
Merge pull request #8446 from tannewt/rgbmatrix_memory_fix
dhalbert Sep 30, 2023
2e6ef78
Update Metro S3 pin mapping for Rev B
tannewt Oct 4, 2023
d4b5146
Adding the missing pins(33,34) and SPI pins
tirtharajsinha Oct 7, 2023
a14a9a0
Merge pull request #8463 from tirtharajsinha/8.2.x
dhalbert Oct 7, 2023
c8926de
removing gpio 19 and 20 as these pins are not broken out in board
tirtharajsinha Oct 7, 2023
2047a8d
Merge branch 'adafruit:8.2.x' into 8.2.x
tirtharajsinha Oct 8, 2023
cc709f6
Merge pull request #8465 from tirtharajsinha/8.2.x
tannewt Oct 10, 2023
56d5df3
Copy non touch, change name, pid and lcd rest pin.
minordemon Oct 11, 2023
2de11f0
Merge pull request #8459 from tannewt/metro_s3_revb
tannewt Oct 12, 2023
e576782
Merge pull request #8475 from minordemon/Waveshare-RP2040-Touch-LCD-1_28
tannewt Oct 12, 2023
4606af4
Added Unexpected Maker BlizzardS3 board for Espressif port.
UnexpectedMaker Oct 15, 2023
10a4424
Merge pull request #8480 from UnexpectedCircuitPython/um_blizzard_s3
dhalbert Oct 15, 2023
89467ec
Merge tag '8.2.7' into merge_in_8.2.7
tannewt Oct 20, 2023
c988ff7
Remove random A
tannewt Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix CPU on Monster M4SK; turn off audiobusio by default on SAMD51G
  • Loading branch information
@dhalbert
dhalbert committed Sep 19, 2023
commit 931a6adb81bcfb96a1ac15060cc685a592e6d744
3 changes: 0 additions & 3 deletions ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"
LONGINT_IMPL = MPZ

# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0

CIRCUITPY_FULL_BUILD = 0
CIRCUITPY_AUDIOIO = 0
CIRCUITPY_AUDIOCORE = 0
Expand Down
2 changes: 1 addition & 1 deletion ports/atmel-samd/boards/cp32-m4/mpconfigboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#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_SCK (&pin_PA13)
Expand Down
3 changes: 0 additions & 3 deletions ports/atmel-samd/boards/cp32-m4/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,3 @@ CHIP_FAMILY = samd51
QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "W25Q128JVxM"
LONGINT_IMPL = MPZ

# No I2S on SAMD51G.
CIRCUITPY_AUDIOBUSIO = 0
3 changes: 0 additions & 3 deletions ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = GD25Q16C
LONGINT_IMPL = MPZ

# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0

CIRCUITPY_BITBANG_APA102 = 1
3 changes: 0 additions & 3 deletions ports/atmel-samd/boards/loc_ber_m4_base_board/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ CIRCUITPY_FULL_BUILD = 0

LONGINT_IMPL = MPZ

# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0

CIRCUITPY_BITBANG_APA102 = 1
# Override optimization to keep binary small
OPTIMIZATION_FLAGS = -Os
3 changes: 0 additions & 3 deletions ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "W25Q16JVxM, W25Q16JVxQ"
LONGINT_IMPL = MPZ

# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0

CIRCUITPY_BITBANG_APA102 = 1

#Include these Python libraries in firmware.
Expand Down
3 changes: 2 additions & 1 deletion ports/atmel-samd/boards/monster_m4sk/mpconfigboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#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

Expand Down
3 changes: 2 additions & 1 deletion ports/atmel-samd/boards/monster_m4sk/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ USB_PID = 0x8048
USB_PRODUCT = "Monster M4SK"
USB_MANUFACTURER = "Adafruit Industries LLC"

CHIP_VARIANT = SAMD51J19A
# Board is mislabeled as SAMD51J19.
CHIP_VARIANT = SAMD51G19A
CHIP_FAMILY = samd51

QSPI_FLASH_FILESYSTEM = 1
Expand Down
2 changes: 0 additions & 2 deletions ports/atmel-samd/boards/robohatmm1_m4/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
LONGINT_IMPL = MPZ

# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0
# Make room for more stuff
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_DISPLAYIO = 0
Expand Down
3 changes: 0 additions & 3 deletions ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, GD25Q64C"
LONGINT_IMPL = MPZ

# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0

CIRCUITPY_BITBANG_APA102 = 1
5 changes: 5 additions & 0 deletions ports/atmel-samd/mpconfigport.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ CIRCUITPY_SAMD ?= 1
CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12
CIRCUITPY_WATCHDOG ?= 1

ifeq ($(CHIP_VARIANT),SAMD51G19A)
# No I2S on SAMD51G
CIRCUITPY_AUDIOBUSIO = 0
endif

endif # samd51
######################################################################

Expand Down