diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-devkit/src/Make.defs index bcce60fdd5..98779609f7 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/Make.defs @@ -41,6 +41,10 @@ ifeq ($(CONFIG_ESP32S3_SPI),y) CSRCS += esp32s3_board_spi.c endif +ifeq ($(CONFIG_LCD_ST7735),y) +CSRCS += esp32s3_st7735.c +endif + SCRIPTIN = $(SCRIPTDIR)$(DELIM)esp32s3.template.ld SCRIPTOUT = $(SCRIPTDIR)$(DELIM)esp32s3_out.ld diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h index df4f762a3c..56f3aec414 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h +++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h @@ -35,6 +35,11 @@ /* ESP32-S3-DEVKIT GPIOs ****************************************************/ +/* LCD pins, i.e. used by ST7735 */ + +#define GPIO_LCD_DC 14 +#define GPIO_LCD_RST 9 + /* BOOT Button */ #define BUTTON_BOOT 0 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_board_spi.c b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_board_spi.c index d59e79a96d..c46be1d4e8 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_board_spi.c +++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_board_spi.c @@ -31,6 +31,7 @@ #include #include "esp32s3_gpio.h" +#include "esp32s3-devkit.h" /**************************************************************************** * Private Functions @@ -69,7 +70,7 @@ int esp32s3_spi2_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) * data bits are data or a command. */ - esp32s3_gpiowrite(CONFIG_ESP32S3_SPI2_MISOPIN, !cmd); + esp32s3_gpiowrite(GPIO_LCD_DC, !cmd); return OK; } diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c index b6dc28f8e5..049d79374b 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c +++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c @@ -58,6 +58,10 @@ # include #endif +#ifdef CONFIG_VIDEO_FB +#include +#endif + #include "esp32s3-devkit.h" /**************************************************************************** @@ -170,6 +174,20 @@ int esp32s3_bringup(void) } #endif +#ifdef CONFIG_VIDEO_FB + ret = fb_register(0, 0); + if (ret < 0) + { + syslog(LOG_ERR, "ERROR: Failed to initialize Frame Buffer Driver.\n"); + } +#elif defined(CONFIG_LCD) + ret = board_lcd_initialize(); + if (ret < 0) + { + syslog(LOG_ERR, "ERROR: Failed to initialize LCD.\n"); + } +#endif + /* If we got here then perhaps not all initialization was successful, but * at least enough succeeded to bring-up NSH with perhaps reduced * capabilities. diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_st7735.c b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_st7735.c new file mode 100644 index 0000000000..0ef4f27c8f --- /dev/null +++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_st7735.c @@ -0,0 +1,133 @@ +/**************************************************************************** + * boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_st7735.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "esp32s3_spi.h" +#include "esp32s3_gpio.h" +#include "esp32s3-devkit.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#define LCD_SPI_PORTNO 2 + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static struct spi_dev_s *g_spidev; +static struct lcd_dev_s *g_lcd = NULL; + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: board_lcd_initialize + * + * Description: + * Initialize the LCD video hardware. The initial state of the LCD is + * fully initialized, display memory cleared, and the LCD ready to use, but + * with the power setting at 0 (full off). + * + ****************************************************************************/ + +int board_lcd_initialize(void) +{ + g_spidev = esp32s3_spibus_initialize(LCD_SPI_PORTNO); + if (!g_spidev) + { + lcderr("ERROR: Failed to initialize SPI port %d\n", LCD_SPI_PORTNO); + return -ENODEV; + } + + /* Data/Control PIN */ + + esp32s3_configgpio(GPIO_LCD_DC, OUTPUT); + esp32s3_gpiowrite(GPIO_LCD_DC, true); + + /* Reset device */ + + esp32s3_configgpio(GPIO_LCD_RST, OUTPUT); + esp32s3_gpiowrite(GPIO_LCD_RST, false); + usleep(10000); + esp32s3_gpiowrite(GPIO_LCD_RST, true); + usleep(100000); + + return OK; +} + +/**************************************************************************** + * Name: board_lcd_getdev + * + * Description: + * Return a a reference to the LCD object for the specified LCD. This + * allows support for multiple LCD devices. + * + ****************************************************************************/ + +struct lcd_dev_s *board_lcd_getdev(int devno) +{ + g_lcd = st7735_lcdinitialize(g_spidev); + if (!g_lcd) + { + lcderr("ERROR: Failed to bind SPI port %d to LCD %d\n", LCD_SPI_PORTNO, + devno); + } + else + { + lcdinfo("SPI port %d bound to LCD %d\n", LCD_SPI_PORTNO, devno); + return g_lcd; + } + + return NULL; +} + +/**************************************************************************** + * Name: board_lcd_uninitialize + * + * Description: + * Uninitialize the LCD support + * + ****************************************************************************/ + +void board_lcd_uninitialize(void) +{ + /* Turn the display off */ + + g_lcd->setpower(g_lcd, 0); +}