Skip to content

Fix LCD for custom pins , renew default config and gpio initialize. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions components/nofrendo-esp32/Kconfig.projbuild
Original file line number Diff line number Diff line change
Expand Up @@ -42,36 +42,41 @@ config HW_LCD_TYPE
default 0 if HW_LCD_TYPE_ILI
default 1 if HW_LCD_TYPE_ST

config HW_LCD_MISO_GPIO_CUST
int "LCD MISO pin"
depends on HW_CUSTOM
range 1 35
default 25

config HW_LCD_MOSI_GPIO_CUST
int "LCD MOSI pin"
depends on HW_CUSTOM
range 1 35
default 25
default 23

config HW_LCD_CLK_GPIO_CUST
int "LCD CLK pin"
depends on HW_CUSTOM
range 1 35
default 23
default 19

config HW_LCD_CS_GPIO_CUST
int "LCD CS pin"
depends on HW_CUSTOM
range 1 35
default 19
default 22

config HW_LCD_DC_GPIO_CUST
int "LCD DC pin"
depends on HW_CUSTOM
range 1 35
default 22
default 21

config HW_LCD_RESET_GPIO_CUST
int "LCD RESET pin"
depends on HW_CUSTOM
range 1 35
default 21
default 18

config HW_LCD_BL_GPIO_CUST
int "LCD Backlight Enable pin"
Expand Down
19 changes: 10 additions & 9 deletions components/nofrendo-esp32/spi_lcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "soc/spi_reg.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "driver/gpio.h"
#include "driver/periph_ctrl.h"
#include "spi_lcd.h"

Expand Down Expand Up @@ -298,10 +299,10 @@ static void ILI9341_INITIAL ()

static void ili_gpio_init()
{
PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO21_U,2); //DC PIN
PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO18_U,2); //RESET PIN
PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO5_U,2); //BKL PIN
WRITE_PERI_REG(GPIO_ENABLE_W1TS_REG, BIT21|BIT18|BIT5);
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[PIN_NUM_DC], 2); //DC PIN
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[PIN_NUM_RST], 2); //RESET PIN
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[PIN_NUM_BCKL], 2); //BKL PIN
WRITE_PERI_REG(GPIO_ENABLE_W1TS_REG, BIT(PIN_NUM_DC)|BIT(PIN_NUM_RST)|BIT(PIN_NUM_BCKL));
}

static void spi_master_init()
Expand All @@ -310,11 +311,11 @@ static void spi_master_init()
periph_module_enable(PERIPH_SPI_DMA_MODULE);

ets_printf("lcd spi pin mux init ...\r\n");
PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO19_U,2);
PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO23_U,2);
PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO22_U,2);
PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO25_U,2);
WRITE_PERI_REG(GPIO_ENABLE_W1TS_REG, BIT19|BIT23|BIT22);
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[PIN_NUM_MISO], 2);
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[PIN_NUM_MOSI], 2);
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[PIN_NUM_CLK], 2);
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[PIN_NUM_CS], 2);
WRITE_PERI_REG(GPIO_ENABLE_W1TS_REG, BIT(PIN_NUM_MOSI)|BIT(PIN_NUM_CLK)|BIT(PIN_NUM_CS));

ets_printf("lcd spi signal init\r\n");
gpio_matrix_in(PIN_NUM_MISO, VSPIQ_IN_IDX,0);
Expand Down