Skip to content

Commit b2189d3

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#5741 from dhalbert/5738-backport-to-7.1.x
Backport adafruit#5738 and adafruit#5742 to 7.1.x
2 parents 9096833 + 654414e commit b2189d3

4 files changed

Lines changed: 16 additions & 13 deletions

File tree

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ uint8_t display_init_sequence[] = {
4545
// normal display mode on
4646
0x13, 0,
4747
// display and color format settings
48-
0x36, 1, 0x60,
48+
0x36, 1, 0x68,
4949
0xB6, 2, 0x0A, 0x82,
5050
0x3A, 1 | DELAY, 0x55, 10,
5151
// ST7789V frame rate setting
@@ -74,6 +74,12 @@ void board_init(void) {
7474
common_hal_never_reset_pin(&pin_GPIO19);
7575
common_hal_never_reset_pin(&pin_GPIO20);
7676

77+
// I2C/TFT power pin
78+
common_hal_never_reset_pin(&pin_GPIO21);
79+
80+
// Turn on TFT and I2C
81+
gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT);
82+
gpio_set_level(21, true);
7783

7884
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
7985

@@ -93,7 +99,7 @@ void board_init(void) {
9399
bus,
94100
spi,
95101
&pin_GPIO39, // DC
96-
&pin_GPIO21, // CS
102+
&pin_GPIO7, // CS
97103
&pin_GPIO40, // RST
98104
40000000, // baudrate
99105
0, // polarity
@@ -112,7 +118,7 @@ void board_init(void) {
112118
240, // width (after rotation)
113119
135, // height (after rotation)
114120
40, // column start
115-
52, // row start
121+
53, // row start
116122
0, // rotation
117123
16, // color depth
118124
false, // grayscale

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4444
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) },
4545
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO34) },
4646

47+
{ MP_ROM_QSTR(MP_QSTR_I2C_TFT_POWER), MP_ROM_PTR(&pin_GPIO21) },
48+
4749
{ MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
4850
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
4951

@@ -59,7 +61,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
5961
{ MP_ROM_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO42) },
6062
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO42) },
6163

62-
{ MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO21) },
64+
{ MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO7) },
6365
{ MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO39) },
6466
{ MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO40) },
6567
{ MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO45) },

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,3 @@ CIRCUITPY_ESP_FLASH_FREQ=40m
1818
CIRCUITPY_ESP_FLASH_SIZE=4MB
1919

2020
CIRCUITPY_MODULE=wroom
21-
22-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
23-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
24-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
25-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
3737
{ MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
3838
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
3939

40-
{ MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
41-
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO34) },
40+
{ MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
41+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
4242

43-
{ MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
44-
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO33) },
43+
{ MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
44+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
4545

4646
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO38) },
4747
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO39) },

0 commit comments

Comments
 (0)