Skip to content
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.

Sign up for GitHub

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

Ili9341 BGR driver #393

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Ili9341 BGR driver #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63ca606
fix orientation for ILI9341
chowette Aug 14, 2020
196916a
Fix touch pressure not returned
chowette Aug 28, 2020
4bf70f1
add ILI9341_BGR variantThis variant support panel wired as BGR.Those …
chowette Aug 28, 2020
45a6c5a
make touch work with ILI9341_BGR driver
chowette Sep 22, 2020
649eadb
Merge branch 'whitecatboard:master' into ILI9341_BGR-driver
chowette Jun 23, 2021
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
1 change: 1 addition & 0 deletions components/gdisplay/gdisplay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ static const gdisplay_t displaydevs[] = {
{CHIPSET_ST7735G_144, st7735_init },
{CHIPSET_ST7735_096 , st7735_init },
{CHIPSET_ILI9341, ili9341_init},
{CHIPSET_ILI9341_BGR, ili9341_init},
{CHIPSET_SSD1306_128_32, ssd1306_init},
{CHIPSET_SSD1306_128_64, ssd1306_init},
{CHIPSET_SSD1306_96_16, ssd1306_init},
Expand Down
11 changes: 7 additions & 4 deletions components/gdisplay/gdisplay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,23 @@
*/

#define CHIPSET_ILI9341 6
#define CHIPSET_ILI9341_BGR 7

#define CHIPSET_ILI9341_VARIANT_OFFSET CHIPSET_ILI9341

/*
* PCD8544
*/

#define CHIPSET_PCD8544 7
#define CHIPSET_PCD8544 8

/*
* SSDS1306
*/

#define CHIPSET_SSD1306_128_32 8
#define CHIPSET_SSD1306_128_64 9
#define CHIPSET_SSD1306_96_16 10
#define CHIPSET_SSD1306_128_32 9
#define CHIPSET_SSD1306_128_64 10
#define CHIPSET_SSD1306_96_16 11

#define CHIPSET_SSD1306_VARIANT_OFFSET CHIPSET_SSD1306_128_32

Expand Down
1 change: 1 addition & 0 deletions components/lua/modules/hw/gdisplay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,6 +1460,7 @@ static const LUA_REG_TYPE gdisplay_map[] = {
{ LSTRKEY( "ST7735_096" ), LINTVAL( CHIPSET_ST7735_096 ) },

{ LSTRKEY( "ILI9341" ), LINTVAL( CHIPSET_ILI9341 ) },
{ LSTRKEY( "ILI9341_BGR" ), LINTVAL( CHIPSET_ILI9341_BGR ) },
{ LSTRKEY( "PCD8544" ), LINTVAL( CHIPSET_PCD8544 ) },

{ LSTRKEY( "SSD1306_128_32" ), LINTVAL( CHIPSET_SSD1306_128_32 ) },
Expand Down
144 changes: 132 additions & 12 deletions components/sys/drivers/ili9341.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static const uint8_t ILI9341_init[] = {
0x28,
ILI9341_VMCTR2, 1, //VCM control2
0x86,
ILI9341_RDMADCTL, 1, // Memory Access Control
ST7735_MADCTL, 1, // Memory Access Control
0x48,
ILI9341_PIXFMT, 1,
0x55,
Expand Down Expand Up @@ -210,8 +210,16 @@ driver_error_t *ili9341_init(uint8_t chip, uint8_t orientation, uint8_t address)
caps->on = st7735_on;
caps->off = st7735_off;
caps->invert = st7735_invert;
caps->orientation = ili9341_set_orientation;
caps->touch_get = ili9341_tp_get;
switch (chip) {
case CHIPSET_ILI9341:
caps->orientation = ili9341_set_orientation;
caps->touch_get = ili9341_tp_get;
break;
case CHIPSET_ILI9341_BGR:
caps->orientation = ili9341_bgr_set_orientation;
caps->touch_get = ili9341_bgr_tp_get;
break;
}
caps->touch_cal = ili9341_tp_set_cal;
caps->bytes_per_pixel = 2;
caps->rdepth = 5;
Expand Down Expand Up @@ -298,11 +306,14 @@ driver_error_t *ili9341_init(uint8_t chip, uint8_t orientation, uint8_t address)
switch (chipset) {
case CHIPSET_ILI9341:
gdisplay_ll_command_list(ILI9341_init);
ili9341_set_orientation(orientation);
break;
case CHIPSET_ILI9341_BGR:
gdisplay_ll_command_list(ILI9341_init);
ili9341_bgr_set_orientation(orientation);
break;
}

ili9341_set_orientation(orientation);

// Allocate buffer
if (!gdisplay_ll_allocate_buffer(ST7735_BUFFER)) {
return driver_error(GDISPLAY_DRIVER, GDISPLAY_ERR_NOT_ENOUGH_MEMORY, NULL);
Expand Down Expand Up @@ -347,7 +358,43 @@ void ili9341_set_orientation(uint8_t m) {
break;
}

gdisplay_ll_command(ILI9341_RDMADCTL);
gdisplay_ll_command(ST7735_MADCTL);
gdisplay_ll_data(&madctl, 1);
}

void ili9341_bgr_set_orientation(uint8_t m) {
gdisplay_caps_t *caps = gdisplay_ll_get_caps();
uint8_t orientation = m & 3; // can't be higher than 3
uint8_t madctl = ST7735_MADCTL_BGR;

caps->ystart = 0;
caps->xstart = 0;


switch (orientation) {
case LANDSCAPE:
madctl |= ST7735_MADCTL_MV;
caps->width = ILI9341_HEIGHT;
caps->height = ILI9341_WIDTH;
break;
case PORTRAIT:
madctl |= ST7735_MADCTL_MY;
caps->width = ILI9341_WIDTH;
caps->height = ILI9341_HEIGHT;
break;
case LANDSCAPE_FLIP:
madctl |= ST7735_MADCTL_MX | ST7735_MADCTL_MY | ST7735_MADCTL_MV;
caps->width = ILI9341_HEIGHT;
caps->height = ILI9341_WIDTH;
break;
case PORTRAIT_FLIP:
madctl |= ST7735_MADCTL_MX;
caps->width = ILI9341_WIDTH;
caps->height = ILI9341_HEIGHT;
break;
}

gdisplay_ll_command(ST7735_MADCTL);
gdisplay_ll_data(&madctl, 1);
}

Expand Down Expand Up @@ -385,6 +432,8 @@ void ili9341_tp_get(int *x, int *y, int *z, uint8_t raw) {
result = ili9341_tp_read(0xB0, 3);
if (result > 50) {
// tp pressed
*z = result;

result = ili9341_tp_read(0xD0, 10);
if (result >= 0) {
*x = result;
Expand All @@ -394,10 +443,10 @@ void ili9341_tp_get(int *x, int *y, int *z, uint8_t raw) {
}
}

if (result <= 50) {
if (result < 0) {
*x = 0;
*y = 0;
*z = 0;
*z = result;
return;
}

Expand All @@ -407,9 +456,10 @@ void ili9341_tp_get(int *x, int *y, int *z, uint8_t raw) {
int ybottom = tp_caly & 0x3FFF;

if (((xright - xleft) != 0) && ((ybottom - ytop) != 0)) {
*x = ((*x - xleft) * 320) / (xright - xleft);
*y = ((*y - ytop) * 240) / (ybottom - ytop);
*x = ((*x - xleft) * ILI9341_WIDTH) / (xright - xleft);
*y = ((*y - ytop) * ILI9341_HEIGHT) / (ybottom - ytop);
}

else {
*z = 0;
*x = 0;
Expand All @@ -418,9 +468,9 @@ void ili9341_tp_get(int *x, int *y, int *z, uint8_t raw) {
}

if (*x < 0) *x = 0;
if (*x > 319) *x = 319;
if (*x >= ILI9341_WIDTH) *x = ILI9341_WIDTH-1;
if (*y < 0) *y = 0;
if (*y > 239) *y = 239;
if (*y >= ILI9341_HEIGHT) *y = ILI9341_HEIGHT-1;

gdisplay_caps_t *caps = gdisplay_ll_get_caps();

Expand All @@ -443,4 +493,74 @@ void ili9341_tp_get(int *x, int *y, int *z, uint8_t raw) {
}
}

void ili9341_bgr_tp_get(int *x, int *y, int *z, uint8_t raw) {
int result = -1;
int tmp;

*x = 0;
*y = 0;
*z = 0;

result = ili9341_tp_read(0xB0, 3);
if (result > 50) {
// tp pressed
*z = result;

result = ili9341_tp_read(0xD0, 10);
if (result >= 0) {
*x = result;

result = ili9341_tp_read(0x90, 10);
if (result >= 0) *y = result;
}
}

if (result < 0) {
*x = 0;
*y = 0;
*z = result;
return;
}

if (!raw) {
int xleft = (tp_calx >> 16) & 0x3FFF;
int xright = tp_calx & 0x3FFF;
int ytop = (tp_caly >> 16) & 0x3FFF;
int ybottom = tp_caly & 0x3FFF;

if (((xright - xleft) != 0) && ((ybottom - ytop) != 0)) {
*x = ((*x - xleft) * ILI9341_WIDTH) / (xright - xleft);
*y = ((*y - ytop) * ILI9341_HEIGHT) / (ybottom - ytop);
} else {
*z = 0;
*x = 0;
*y = 0;
return;
}

if (*x < 0) *x = 0;
if (*x >= ILI9341_WIDTH) *x = ILI9341_WIDTH-1;
if (*y < 0) *y = 0;
if (*y >= ILI9341_HEIGHT) *y = ILI9341_HEIGHT-1;

gdisplay_caps_t *caps = gdisplay_ll_get_caps();

switch (caps->orient) {
case LANDSCAPE:
tmp = *x;
*x = ILI9341_HEIGHT - *y - 1;
*y = tmp;
break;
case LANDSCAPE_FLIP:
tmp = *x;
*x = *y;
*y = ILI9341_WIDTH - tmp - 1;
break;
case PORTRAIT_FLIP :
*x = ILI9341_WIDTH - *x - 1;
*y = ILI9341_HEIGHT - *y - 1;
break;
}
}
}
#endif
2 changes: 2 additions & 0 deletions components/sys/drivers/ili9341.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,10 @@

driver_error_t *ili9341_init(uint8_t chip, uint8_t orientation, uint8_t address);
void ili9341_set_orientation(uint8_t m);
void ili9341_bgr_set_orientation(uint8_t m);

void ili9341_tp_get(int *x, int *y, int *z, uint8_t raw);
void ili9341_bgr_tp_get(int *x, int *y, int *z, uint8_t raw);
void ili9341_tp_set_cal(int calx, int caly);

#endif
Expand Down