Skip to content

Commit 3eb28d9

Browse files
tannewttannewt
authored
Merge pull request adafruit#10142 from Neradoc/add-waveshare-touch-lcd-2
Add Waveshare ESP32S3 touch LCD 2 inch display board
2 parents 678f387 + 052e3dd commit 3eb28d9

File tree

5 files changed

+205
-0
lines changed

5 files changed

+205
-0
lines changed

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

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "supervisor/board.h"
8+
#include "mpconfigboard.h"
9+
#include "shared-bindings/busio/SPI.h"
10+
#include "shared-bindings/fourwire/FourWire.h"
11+
#include "shared-bindings/microcontroller/Pin.h"
12+
#include "shared-module/displayio/__init__.h"
13+
#include "shared-module/displayio/mipi_constants.h"
14+
#include "shared-bindings/board/__init__.h"
15+
16+
#define DELAY 0x80
17+
18+
// display init sequence according to LilyGO example app
19+
uint8_t display_init_sequence[] = {
20+
0x01, DELAY, 0x96, // _SWRESET and Delay 150ms
21+
0x11, DELAY, 0xFF, // _SLPOUT and Delay 500ms
22+
0x3A, DELAY | 1, 0x55, 0x0A, // _COLMOD and Delay 10ms
23+
0x21, DELAY, 0x0A, // _INVON Hack and Delay 10ms
24+
0x13, DELAY, 0x0A, // _NORON and Delay 10ms
25+
0x36, 0x01, 0x60, // _MADCTL
26+
0x29, DELAY, 0xFF, // _DISPON and Delay 500ms
27+
};
28+
29+
void board_init(void) {
30+
busio_spi_obj_t *spi = common_hal_board_create_spi(0);
31+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
32+
bus->base.type = &fourwire_fourwire_type;
33+
34+
common_hal_fourwire_fourwire_construct(
35+
bus,
36+
spi,
37+
&pin_GPIO42, // DC
38+
&pin_GPIO45, // CS
39+
&pin_GPIO0, // RST
40+
// 24000000,
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+
48+
common_hal_busdisplay_busdisplay_construct(
49+
display,
50+
bus,
51+
320, // width (after rotation)
52+
240, // height (after rotation)
53+
0, // column start
54+
0, // row start
55+
0, // rotation
56+
16, // color depth
57+
false, // grayscale
58+
false, // pixels in a byte share a row. Only valid for depths < 8
59+
1, // bytes per cell. Only valid for depths < 8
60+
false, // reverse_pixels_in_byte. Only valid for depths < 8
61+
true, // reverse_pixels_in_word
62+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // set column command
63+
MIPI_COMMAND_SET_PAGE_ADDRESS, // set row command
64+
MIPI_COMMAND_WRITE_MEMORY_START, // write memory command
65+
display_init_sequence,
66+
sizeof(display_init_sequence),
67+
&pin_GPIO1, // backlight pin
68+
NO_BRIGHTNESS_COMMAND,
69+
1.0f, // brightness
70+
false, // single_byte_bounds
71+
false, // data_as_commands
72+
true, // auto_refresh
73+
60, // native_frames_per_second
74+
true, // backlight_on_high
75+
false, // SH1107_addressing
76+
50000 // backlight pwm frequency
77+
);
78+
}

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

+19
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) 2025 Neradoc
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#pragma once
8+
9+
#define MICROPY_HW_BOARD_NAME "Waveshare ESP32S3 Touch LCD 2"
10+
#define MICROPY_HW_MCU_NAME "ESP32S3"
11+
12+
#define CIRCUITPY_BOARD_I2C (1)
13+
#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO47, .sda = &pin_GPIO48}}
14+
15+
#define CIRCUITPY_BOARD_SPI (1)
16+
#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO39, .mosi = &pin_GPIO38, .miso = &pin_GPIO40}}
17+
18+
#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
19+
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)

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

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
USB_VID = 0x303A
2+
USB_PID = 0x82CE
3+
USB_MANUFACTURER = "Waveshare Electronics"
4+
USB_PRODUCT = "ESP32S3 Touch LCD 2"
5+
6+
IDF_TARGET = esp32s3
7+
8+
CIRCUITPY_ESP_FLASH_MODE = qio
9+
CIRCUITPY_ESP_FLASH_FREQ = 80m
10+
CIRCUITPY_ESP_FLASH_SIZE = 16MB
11+
12+
CIRCUITPY_ESP_PSRAM_SIZE = 8MB
13+
CIRCUITPY_ESP_PSRAM_MODE = opi
14+
CIRCUITPY_ESP_PSRAM_FREQ = 80m

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

+94
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) 2020 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "shared-bindings/board/__init__.h"
8+
#include "shared-module/displayio/__init__.h"
9+
10+
static const mp_rom_map_elem_t board_module_globals_table[] = {
11+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
12+
13+
// User accessible GPIO
14+
{ MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
15+
{ MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
16+
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
17+
{ MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
18+
{ MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
19+
{ MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
20+
{ MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
21+
{ MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
22+
{ MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
23+
{ MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
24+
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
25+
{ MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
26+
{ MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
27+
{ MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
28+
{ MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
29+
{ MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
30+
{ MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
31+
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
32+
{ MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
33+
{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
34+
{ MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
35+
36+
// User button
37+
{ MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
38+
{ MP_ROM_QSTR(MP_QSTR_BUTTON0), MP_ROM_PTR(&pin_GPIO0) },
39+
40+
// Battery ADC
41+
{MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO5)},
42+
43+
// I2C
44+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO47) },
45+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO48) },
46+
47+
// CST816D Touch
48+
{ MP_ROM_QSTR(MP_QSTR_TOUCH_INT), MP_ROM_PTR(&pin_GPIO46) },
49+
50+
// QMI8658 IMU
51+
{ MP_ROM_QSTR(MP_QSTR_IMU_INT), MP_ROM_PTR(&pin_GPIO3) },
52+
53+
// SPI
54+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO39) },
55+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO38) },
56+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO40) },
57+
58+
// LCD
59+
{ MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO42) },
60+
{ MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO45) },
61+
{ MP_ROM_QSTR(MP_QSTR_LCD_RESET), MP_ROM_PTR(&pin_GPIO0) },
62+
{ MP_ROM_QSTR(MP_QSTR_LCD_BACKLIGHT), MP_ROM_PTR(&pin_GPIO1) },
63+
64+
// SD Card slot
65+
{ MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO41) },
66+
67+
// Camera connector
68+
{ MP_ROM_QSTR(MP_QSTR_CAM_HREF), MP_ROM_PTR(&pin_GPIO4) },
69+
{ MP_ROM_QSTR(MP_QSTR_CAM_VSYNC), MP_ROM_PTR(&pin_GPIO6) },
70+
{ MP_ROM_QSTR(MP_QSTR_CAM_XCLK), MP_ROM_PTR(&pin_GPIO8) },
71+
{ MP_ROM_QSTR(MP_QSTR_CAM_PCLK), MP_ROM_PTR(&pin_GPIO9) },
72+
{ MP_ROM_QSTR(MP_QSTR_CAM_PWDN), MP_ROM_PTR(&pin_GPIO17) },
73+
{ MP_ROM_QSTR(MP_QSTR_CAM_D0), MP_ROM_PTR(&pin_GPIO12) },
74+
{ MP_ROM_QSTR(MP_QSTR_CAM_D1), MP_ROM_PTR(&pin_GPIO13) },
75+
{ MP_ROM_QSTR(MP_QSTR_CAM_D2), MP_ROM_PTR(&pin_GPIO15) },
76+
{ MP_ROM_QSTR(MP_QSTR_CAM_D3), MP_ROM_PTR(&pin_GPIO11) },
77+
{ MP_ROM_QSTR(MP_QSTR_CAM_D4), MP_ROM_PTR(&pin_GPIO14) },
78+
{ MP_ROM_QSTR(MP_QSTR_CAM_D5), MP_ROM_PTR(&pin_GPIO10) },
79+
{ MP_ROM_QSTR(MP_QSTR_CAM_D6), MP_ROM_PTR(&pin_GPIO7) },
80+
{ MP_ROM_QSTR(MP_QSTR_CAM_D7), MP_ROM_PTR(&pin_GPIO2) },
81+
{ MP_ROM_QSTR(MP_QSTR_TWI_CLK), MP_ROM_PTR(&pin_GPIO16) },
82+
{ MP_ROM_QSTR(MP_QSTR_TWI_SDA), MP_ROM_PTR(&pin_GPIO21) },
83+
84+
// UART
85+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
86+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
87+
88+
// Objects
89+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
90+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
91+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
92+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
93+
};
94+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/waveshare_esp32_s3_touch_lcd_2/sdkconfig

Whitespace-only changes.

0 commit comments

Comments
 (0)