8000 Merge pull request #9405 from dikei100/LILYGO-T-Display-S3-Pro · leench/circuitpython@921e376 · GitHub 8000
[go: up one dir, main page]
Skip to content

Commit 921e376

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#9405 from dikei100/LILYGO-T-Display-S3-Pro
Adding support for LILYGO T-Display S3 Pro
2 parents 3f4913e + 28f8a83 commit 921e376

File tree

10 files changed

+270
-0
lines changed

10 files changed

+270
-0
lines changed

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

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2024 Konstantinos Krikis
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "supervisor/board.h"
8+
#include "mpconfigboard.h"
9+
#include "shared-bindings/microcontroller/Pin.h"
10+
11+
#include "shared-bindings/busio/SPI.h"
12+
#include "shared-bindings/fourwire/FourWire.h"
13+
#include "shared-module/displayio/__init__.h"
14+
#include "shared-module/displayio/mipi_constants.h"
15+
#include "shared-bindings/board/__init__.h"
16+
17+
#include "components/driver/gpio/include/driver/gpio.h"
18+
#include "components/hal/include/hal/gpio_hal.h"
19+
#include "common-hal/microcontroller/Pin.h"
20+
21+
uint8_t display_init_sequence[] = {
22+
0x01, 0x80, 0x96, // _SWRESET and Delay 150ms
23+
0x11, 0x80, 0xFF, // _SLPOUT and Delay 500ms
24+
0x3A, 0x81, 0x55, 0x0A, // _COLMOD and Delay 10ms
25+
0x21, 0x80, 0x0A, // _INVON Hack and Delay 10ms
26+
0x12, 0x80, 0x0A, // _PTLON and Delay 10ms
27+
0x36, 0x01, 0x48, // _MADCTL use portrait mode
28+
0x29, 0x80, 0xFF, // _DISPON and Delay 500ms
29+
};
30+
31+
void board_init(void) {
32+
busio_spi_obj_t *spi = common_hal_board_create_spi(0);
33+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
34+
bus->base.type = &fourwire_fourwire_type;
35+
common_hal_fourwire_fourwire_construct(
36+
bus,
37+
spi,
38+
&pin_GPIO9, // TFT_DC Command or data
39+
&pin_GPIO39, // TFT_CS Chip select
40+
&pin_GPIO47, // TFT_RST Reset
41+
40000000, // Baudrate
42+
0, // Polarity
43+
0); // Phase
44+
45+
busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
46+
display->base.type = &busdisplay_busdisplay_type;
47+
common_hal_busdisplay_busdisplay_construct(
48+
display,
49+
bus,
50+
222, // Width
51+
480, // Height
52+
49, // column start
53+
0, // row start
54+
0, // rotation
55+
16, // Color depth
56+
false, // Grayscale
57+
false, // pixels in a byte share a row. Only valid for depths < 8
58+
1, // bytes per cell. Only valid for depths < 8
59+
false, // reverse_pixels_in_byte. Only valid for depths < 8
60+
true, // reverse_pixels_in_word
61+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
62+
MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
63+
MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
64+
display_init_sequence,
65+
sizeof(display_init_sequence),
66+
&pin_GPIO48, // backlight pin
67+
NO_BRIGHTNESS_COMMAND,
68+
1.0f, // brightness
69+
false, // single_byte_bounds
70+
false, // data_as_commands
71+
true, // auto_refresh
72+
60, // native_frames_per_second
73+
true, // backlight_on_high
74+
false, // SH1107_addressing
75+
50000); // backlight pwm frequency
76+
}
77+
78+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
79+
80+
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
81+
// Pull one LED down on reset rather than the default up
82+
if (pin_number == 38) { // This is the flashlight LED - very bright
83+
gpio_config_t cfg = {
84+
.pin_bit_mask = BIT64(pin_number),
85+
.mode = GPIO_MODE_DISABLE,
86+
.pull_up_en = false,
87+
.pull_down_en = true,
88+
.intr_type = GPIO_INTR_DISABLE,
89+
};
90+
gpio_config(&cfg);
91+
return true;
92+
}
93+
return false;
94+
}

‎ports/espressif/boards/lilygo_tdisplay_s3_pro/board.c:Zone.Identifier

Whitespace-only changes.

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2024 Konstantinos Krikis
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#pragma once
8+
9+
// Micropython setup
10+
11+
#define MICROPY_HW_BOARD_NAME "LILYGO T-Display S3 Pro"
12+
#define MICROPY_HW_MCU_NAME "ESP32S3"
13+
14+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO18)
15+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO17)
16+
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO8)
17+
18+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO6)
19+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO5)

‎ports/espressif/boards/lilygo_tdisplay_s3_pro/mpconfigboard.h:Zone.Identifier

Whitespace-only changes.

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
USB_VID = 0x303A
2+
USB_PID = 0x8211
3+
USB_PRODUCT = "T-Display S3 Pro"
4+
USB_MANUFACTURER = "LILYGO"
5+
6+
IDF_TARGET = esp32s3
7+
8+
CIRCUITPY_ESP_FLASH_SIZE = 16MB
9+
CIRCUITPY_ESP_FLASH_MODE = qio
10+
CIRCUITPY_ESP_FLASH_FREQ = 80m
11+
12+
CIRCUITPY_ESP_PSRAM_SIZE = 8MB
13+
CIRCUITPY_ESP_PSRAM_MODE = opi
14+
CIRCUITPY_ESP_PSRAM_FREQ = 80m
15+
16+
CIRCUITPY_ESPCAMERA = 1

‎ports/espressif/boards/lilygo_tdisplay_s3_pro/mpconfigboard.mk:Zone.Identifier

Whitespace-only changes.

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

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2024 Konstantinos Krikis
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "py/objtuple.h"
8+
#include "shared-bindings/board/__init__.h"
9+
#include "shared-module/displayio/__init__.h"
10+
11+
static const mp_rom_obj_tuple_t camera_data_tuple = {
12+
{&mp_type_tuple},
13+
8,
14+
{
15+
MP_ROM_PTR(&pin_GPIO45),
16+
MP_ROM_PTR(&pin_GPIO41),
17+
MP_ROM_PTR(&pin_GPIO40),
18+
MP_ROM_PTR(&pin_GPIO42),
19+
MP_ROM_PTR(&pin_GPIO1),
20+
MP_ROM_PTR(&pin_GPIO3),
21+
MP_ROM_PTR(&pin_GPIO10),
22+
MP_ROM_PTR(&pin_GPIO4),
23+
}
24+
};
25+
26+
static const mp_rom_map_elem_t board_module_globals_table[] = {
27+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
28+
29+
{ MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
30+
{ MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
31+
{ MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
32+
{ MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
33+
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
34+
{ MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
35+
{ MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
36+
{ MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
37+
{ MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
38+
{ MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
39+
{ MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
40+
{ MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
41+
{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
42+
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
43+
{ MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
44+
{ MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
45+
{ MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
46+
{ MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
47+
{ MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
48+
{ MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
49+
{ MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
50+
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
51+
{ MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
52+
{ MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
53+
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
54+
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
55+
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
56+
{ MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
57+
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
58+
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
59+
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
60+
{ MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
61+
{ MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
62+
{ MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
63+
{ MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
64+
{ MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
65+
66+
// SPI control pins
67+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO18) },
68+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO17) },
69+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) },
70+
71+
// I2C control pins
72+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO5) },
73+
{ MP_ROM_QSTR(MP_QSTR_STEMMA_SDA), MP_ROM_PTR(&pin_GPIO5) },
74+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) },
75+
{ MP_ROM_QSTR(MP_QSTR_STEMMA_SCL), MP_ROM_PTR(&pin_GPIO6) },
76+
77+
// TFT control pins
78+
{ MP_ROM_QSTR(MP_QSTR_TFT_BKLT), MP_ROM_PTR(&pin_GPIO48) },
79+
{ MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO39) },
80+
{ MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO9) },
81+
82+
// Touchscreen control pins
83+
{ MP_ROM_QSTR(MP_QSTR_TOUCH_INT), MP_ROM_PTR(&pin_GPIO7) },
84+
{ MP_ROM_QSTR(MP_QSTR_TOUCH_RESET), MP_ROM_PTR(&pin_GPIO13) },
85+
86+
// SD card control pins
87+
{ MP_ROM_QSTR(MP_QSTR_SDCARD_CS), MP_ROM_PTR(&pin_GPIO14) },
88+
89+
// Camera control pins
90+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA), MP_ROM_PTR(&camera_data_tuple) },
91+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_VSYNC), MP_ROM_PTR(&pin_GPIO7) },
92+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_HREF), MP_ROM_PTR(&pin_GPIO15) },
93+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA9), MP_ROM_PTR(&pin_GPIO4) },
94+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_XCLK), MP_ROM_PTR(&pin_GPIO11) },
95+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA8), MP_ROM_PTR(&pin_GPIO10) },
96+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA7), MP_ROM_PTR(&pin_GPIO3) },
97+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_PCLK), MP_ROM_PTR(&pin_GPIO2) },
98+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA6), MP_ROM_PTR(&pin_GPIO1) },
99+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA2), MP_ROM_PTR(&pin_GPIO45) },
100+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA5), MP_ROM_PTR(&pin_GPIO42) },
101+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA3), MP_ROM_PTR(&pin_GPIO41) },
102+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA4), MP_ROM_PTR(&pin_GPIO40) },
103+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_PWDN), MP_ROM_PTR(&pin_GPIO46) },
104+
105+
// Camera flashlight control pin
106+
{ MP_ROM_QSTR(MP_QSTR_FLASHLIGHT), MP_ROM_PTR(&pin_GPIO38) },
107+
108+
// Buttons
109+
{ MP_ROM_QSTR(MP_QSTR_BUTTON0), MP_ROM_PTR(&pin_GPIO0) },
110+
{ MP_ROM_QSTR(MP_QSTR_BUTTON1), MP_ROM_PTR(&pin_GPIO12) },
111+
{ MP_ROM_QSTR(MP_QSTR_BUTTON2), MP_ROM_PTR(&pin_GPIO16) },
112+
113+
// Interfaces
114+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
115+
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
116+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
117+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
118+
};
119+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/lilygo_tdisplay_s3_pro/pins.c:Zone.Identifier

Whitespace-only changes.

‎ports/espressif/boards/lilygo_tdisplay_s3_pro/sdkconfig

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#
2+
# Espressif IoT Development Framework Configuration
3+
#
4+
#
5+
# Component config
6+
#
7+
#
8+
# LWIP
9+
#
10+
CONFIG_LWIP_LOCAL_HOSTNAME="T-Display S3 Pro"
11+
# end of LWIP
12+
13+
#
14+
# Camera configuration
15+
#
16+
# CONFIG_OV7725_SUPPORT is not set
17+
# CONFIG_OV3660_SUPPORT is not set
18+
# end of Camera configuration
19+
20+
# end of Component config
21+
22+
# end of Espressif IoT Development Framework Configuration

‎ports/espressif/boards/lilygo_tdisplay_s3_pro/sdkconfig:Zone.Identifier

Whitespace-only changes.

0 commit comments

Comments
 (0)
0