Skip to content

Commit 2fb4257

Browse files
jeplerjepler
committed
Add minimally tested Adafruit MatrixPortal S3 board def
tested: * board.LED * neopixel as status LED * i2c scan finds lis3dh sensor * psram capacity not tested: * rgb matrix o_O * the gpio pins Introduce new `board` properties for matrixportal-style boards: * MTX_COMMON * MTX_ADDRESS These are intended to simplify use of the RGBMatrix constructor: ```py matrix = RGBMatrix(..., addr_pins=MTX_ADDRESS[:3], **MTX_COMMON) ``` removing the need for sending in the following individual parameters: * rgb_pins * clock_pin * latch_pin * output_enable_pins and making construction of a 16/32/64-row display easy by slicing a tuple of all address pins rather than writing out the individual pins. If it works out it'll be ported back to the matrixportal m4 as well.
1 parent de46be1 commit 2fb4257

File tree

5 files changed

+221
-0
lines changed

5 files changed

+221
-0
lines changed

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "supervisor/board.h"
28+
#include "mpconfigboard.h"
29+
#include "shared-bindings/microcontroller/Pin.h"
30+
#include "components/driver/include/driver/gpio.h"
31+
#include "components/hal/include/hal/gpio_hal.h"
32+
#include "common-hal/microcontroller/Pin.h"
33+
34+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/espressif/boards/adafruit_matrixportal_s3/mpconfigboard.h

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
// Micropython setup
28+
29+
#define MICROPY_HW_BOARD_NAME "Adafruit MatrixPortal S3"
30+
#define MICROPY_HW_MCU_NAME "ESP32S3"
31+
32+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO4)
33+
34+
#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
35+
36+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO17)
37+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO16)
38+
39+
#define DEFAULT_UART_BUS_RX (&pin_GPIO8)
40+
#define DEFAULT_UART_BUS_TX (&pin_GPIO18)
41+
42+
#define DOUBLE_TAP_PIN (&pin_GPIO1)

‎ports/espressif/boards/adafruit_matrixportal_s3/mpconfigboard.mk

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
USB_VID = 0x239A
2+
USB_PID = 0x8126
3+
USB_PRODUCT = "MatrixPortal S3"
4+
USB_MANUFACTURER = "Adafruit"
5+
6+
IDF_TARGET = esp32s3
7+
8+
CIRCUITPY_ESP_FLASH_MODE = dio
9+
CIRCUITPY_ESP_FLASH_FREQ = 40m
10+
CIRCUITPY_ESP_FLASH_SIZE = 4MB
11+
12+
CIRCUITPY_ESP32_CAMERA = 0

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

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
#include "py/objtuple.h"
2+
#include "shared-bindings/board/__init__.h"
3+
4+
STATIC const mp_rom_obj_tuple_t matrix_addr_tuple = {
5+
{&mp_type_tuple},
6+
5,
7+
{
8+
MP_ROM_PTR(&pin_GPIO35),
9+
MP_ROM_PTR(&pin_GPIO36),
10+
MP_ROM_PTR(&pin_GPIO48),
11+
MP_ROM_PTR(&pin_GPIO45),
12+
MP_ROM_PTR(&pin_GPIO21),
13+
}
14+
};
15+
16+
STATIC const mp_rom_obj_tuple_t matrix_data_tuple = {
17+
{&mp_type_tuple},
18+
6,
19+
{
20+
MP_ROM_PTR(&pin_GPIO42),
21+
MP_ROM_PTR(&pin_GPIO41),
22+
MP_ROM_PTR(&pin_GPIO40),
23+
24+
MP_ROM_PTR(&pin_GPIO38),
25+
MP_ROM_PTR(&pin_GPIO39),
26+
MP_ROM_PTR(&pin_GPIO37),
27+
}
28+
};
29+
30+
STATIC const mp_rom_map_elem_t matrix_common_table[] = {
31+
{ MP_OBJ_NEW_QSTR(MP_QSTR_rgb_pins),MP_ROM_PTR(&matrix_data_tuple) },
32+
{ MP_OBJ_NEW_QSTR(MP_QSTR_clock_pin),MP_ROM_PTR(&pin_GPIO2) },
33+
{ MP_OBJ_NEW_QSTR(MP_QSTR_latch_pin),MP_ROM_PTR(&pin_GPIO47) },
34+
{ MP_OBJ_NEW_QSTR(MP_QSTR_output_enable_pin),MP_ROM_PTR(&pin_GPIO14) },
35+
};
36+
MP_DEFINE_CONST_DICT(matrix_common_dict, matrix_common_table);
37+
38+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
39+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
40+
41+
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
42+
{ MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
43+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
44+
45+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO16) },
46+
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
47+
48+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO17) },
49+
{ MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
50+
51+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
52+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
53+
{ MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) },
54+
55+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO11) },
56+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO10) },
57+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO9) },
58+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO3) },
59+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO11) },
60+
61+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO4) },
62+
63+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO8) },
64+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
65+
66+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO18) },
67+
{ MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
68+
69+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_ADDRESS),MP_ROM_PTR(&matrix_addr_tuple) },
70+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_COMMON),MP_ROM_PTR(&matrix_common_dict) },
71+
72+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_R1),MP_ROM_PTR(&pin_GPIO42) },
73+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_G1),MP_ROM_PTR(&pin_GPIO41) },
74+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_B1),MP_ROM_PTR(&pin_GPIO40) },
75+
76+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_R2),MP_ROM_PTR(&pin_GPIO38) },
77+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_G2),MP_ROM_PTR(&pin_GPIO39) },
78+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_B2),MP_ROM_PTR(&pin_GPIO37) },
79+
80+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_ADDRA),MP_ROM_PTR(&pin_GPIO35) },
81+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_ADDRB),MP_ROM_PTR(&pin_GPIO36) },
82+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_ADDRC),MP_ROM_PTR(&pin_GPIO48) },
83+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_ADDRD),MP_ROM_PTR(&pin_GPIO45) },
84+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_ADDRE),MP_ROM_PTR(&pin_GPIO21) },
85+
86+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_CLK),MP_ROM_PTR(&pin_GPIO2) },
87+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_LAT),MP_ROM_PTR(&pin_GPIO47) },
88+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_OE),MP_ROM_PTR(&pin_GPIO14) },
89+
90+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
91+
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
92+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }
93+
};
94+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/adafruit_matrixportal_s3/sdkconfig

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#
2+
# Component config
3+
#
4+
#
5+
# ESP32S3-Specific
6+
#
7+
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
8+
#
9+
# SPI RAM config
10+
#
11+
CONFIG_SPIRAM_MODE_QUAD=y
12+
# CONFIG_SPIRAM_MODE_OCT is not set
13+
CONFIG_SPIRAM_TYPE_AUTO=y
14+
# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
15+
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
16+
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
17+
CONFIG_SPIRAM_SIZE=2097152
18+
#
19+
# PSRAM Clock and CS IO for ESP32S3
20+
#
21+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
22+
CONFIG_DEFAULT_PSRAM_CS_IO=26
23+
# end of PSRAM Clock and CS IO for ESP32S3
24+
25+
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
26+
# CONFIG_SPIRAM_RODATA is not set
27+
# CONFIG_SPIRAM_SPEED_120M is not set
28+
CONFIG_SPIRAM_SPEED_80M=y
29+
# CONFIG_SPIRAM_SPEED_40M is not set
30+
CONFIG_SPIRAM=y
31+
CONFIG_SPIRAM_BOOT_INIT=y
32+
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
33+
CONFIG_SPIRAM_USE_MEMMAP=y
34+
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
35+
# CONFIG_SPIRAM_USE_MALLOC is not set
36+
CONFIG_SPIRAM_MEMTEST=y
37+
# end of SPI RAM config
38+
39+
CONFIG_LWIP_LOCAL_HOSTNAME="matrixportal-s3"

0 commit comments

Comments
 (0)