diff options
Diffstat (limited to 'drivers/gdisp/RA6963')
| -rwxr-xr-x | drivers/gdisp/RA6963/board_RA6963.h | 16 | ||||
| -rwxr-xr-x | drivers/gdisp/RA6963/gdisp_lld_RA6963.c | 32 |
2 files changed, 24 insertions, 24 deletions
diff --git a/drivers/gdisp/RA6963/board_RA6963.h b/drivers/gdisp/RA6963/board_RA6963.h index ce2af186..bee22c30 100755 --- a/drivers/gdisp/RA6963/board_RA6963.h +++ b/drivers/gdisp/RA6963/board_RA6963.h @@ -177,7 +177,7 @@ static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { #endif
}
-static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) {
+static GFXINLINE void set_backlight(GDisplay *g, gU8 percent) {
(void) g;
(void) percent;
#if RA6963_NEED_BACKLIGHT
@@ -199,9 +199,9 @@ static GFXINLINE void release_bus(GDisplay *g) { #if RA6963_NEED_READ
-static GFXINLINE uint8_t RA6963_busy_wait(uint8_t pattern, gBool lh){
+static GFXINLINE gU8 RA6963_busy_wait(gU8 pattern, gBool lh){
- uint8_t data;
+ gU8 data;
int ii;
for(ii = 0; ii < 2; ii++) //Only interested in Bit 0 and 1
@@ -229,7 +229,7 @@ static GFXINLINE uint8_t RA6963_busy_wait(uint8_t pattern, gBool lh){ }
#endif
-static GFXINLINE void RA6963_write(uint8_t value){
+static GFXINLINE void RA6963_write(gU8 value){
int ii;
for(ii = 0; ii < 8; ii++){
if(value & (1 << ii))
@@ -239,7 +239,7 @@ static GFXINLINE void RA6963_write(uint8_t value){ }
}
-static GFXINLINE void write_data(GDisplay* g, uint8_t data){
+static GFXINLINE void write_data(GDisplay* g, gU8 data){
(void)g;
#if RA6963_NEED_READ
RA6963_busy_wait(RA6963_STATUS_BUSY1 | RA6963_STATUS_BUSY2, ~(RA6963_STATUS_BUSY1 | RA6963_STATUS_BUSY2));
@@ -254,7 +254,7 @@ static GFXINLINE void write_data(GDisplay* g, uint8_t data){ palSetLine(lcdpins.CD);
}
-static GFXINLINE void write_cmd(GDisplay* g, uint8_t data){
+static GFXINLINE void write_cmd(GDisplay* g, gU8 data){
(void)g;
#if RA6963_NEED_READ
RA6963_busy_wait(RA6963_STATUS_BUSY1 | RA6963_STATUS_BUSY2, ~(RA6963_STATUS_BUSY1 | RA6963_STATUS_BUSY2));
@@ -275,11 +275,11 @@ static GFXINLINE void setwritemode(GDisplay *g) { (void) g;
}
-static GFXINLINE uint8_t read_data(GDisplay *g) {
+static GFXINLINE gU8 read_data(GDisplay *g) {
(void) g;
#if RA6963_NEED_READ
int ii;
- uint8_t data;
+ gU8 data;
write_cmd(g, RA6963_DATA_READ_AND_NONVARIABLE);
//RA6963_busy_wait(RA6963_STATUS_BUSY1 | RA6963_STATUS_BUSY2, ~(RA6963_STATUS_BUSY1 | RA6963_STATUS_BUSY2));
diff --git a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c index 3dfc13ef..ca7cf7e0 100755 --- a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c +++ b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c @@ -119,7 +119,7 @@ #if !RA6963_NEED_READ
#define BUFFSZ (RA6963_GRAPHIC_SIZE)
- #define RAM(g) ((uint8_t *)g->priv)
+ #define RAM(g) ((gU8 *)g->priv)
#define POS (((g->p.x) / RA6963_FONT_WIDTH) + ((g->p.y) * RA6963_GRAPHIC_AREA))
#endif
#ifndef GDISP_INITIAL_CONTRAST
@@ -159,23 +159,23 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { gfxSleepMilliseconds(50);
//RA6963 needs Data first THEN command!
- write_data(g, (uint8_t)RA6963_GRAPHIC_HOME); //0
- write_data(g, (uint8_t)(RA6963_GRAPHIC_HOME>>8)); //0
+ write_data(g, (gU8)RA6963_GRAPHIC_HOME); //0
+ write_data(g, (gU8)(RA6963_GRAPHIC_HOME>>8)); //0
write_cmd(g, RA6963_SET_GRAPHIC_HOME_ADDRESS); //0x42
- write_data(g, (uint8_t)RA6963_GRAPHIC_AREA); //16
+ write_data(g, (gU8)RA6963_GRAPHIC_AREA); //16
write_data(g, 0); //0
write_cmd(g, RA6963_SET_GRAPHIC_AREA); //0x43
- write_data(g, (uint8_t)RA6963_TEXT_HOME); //0x00
- write_data(g, (uint8_t)(RA6963_TEXT_HOME>>8)); //0x04 = 0x400
+ write_data(g, (gU8)RA6963_TEXT_HOME); //0x00
+ write_data(g, (gU8)(RA6963_TEXT_HOME>>8)); //0x04 = 0x400
write_cmd(g, RA6963_SET_TEXT_HOME_ADDRESS); //0x40
- write_data(g, (uint8_t)RA6963_TEXT_AREA); //16
- write_data(g, (uint8_t)(RA6963_TEXT_AREA>>8)); //0
+ write_data(g, (gU8)RA6963_TEXT_AREA); //16
+ write_data(g, (gU8)(RA6963_TEXT_AREA>>8)); //0
write_cmd(g, RA6963_SET_TEXT_AREA); //0x41
-/* write_data(g, (uint8_t)RA6963_OFFSET_REGISTER);
+/* write_data(g, (gU8)RA6963_OFFSET_REGISTER);
write_data(g, 0);
write_cmd(g, RA6963_SET_OFFSET_REGISTER);*/
@@ -213,20 +213,20 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { static void set_viewport(GDisplay *g) {
if ((g->p.x >= GDISP_SCREEN_WIDTH) || (g->p.y >= GDISP_SCREEN_HEIGHT))
return; // 0 + ( x / 8 ) + ( y * 16 )
- //uint16_t addr = (RA6963_GRAPHIC_HOME + ((g->p.x) / RA6963_FONT_WIDTH) + ((g->p.y) * RA6963_GRAPHIC_AREA));
- uint16_t addr = (RA6963_GRAPHIC_HOME + ((g->p.x >> 3) + (g->p.y << 4)));
+ //gU16 addr = (RA6963_GRAPHIC_HOME + ((g->p.x) / RA6963_FONT_WIDTH) + ((g->p.y) * RA6963_GRAPHIC_AREA));
+ gU16 addr = (RA6963_GRAPHIC_HOME + ((g->p.x >> 3) + (g->p.y << 4)));
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
#warning "check function set_viewport about the shift operations if you change the resolution!"
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
COMPILER_WARNING("check function set_viewport about the shift operations if you change the resolution!")
#endif
- write_data(g, (uint8_t)addr);
- write_data(g, (uint8_t)(addr>>8));
+ write_data(g, (gU8)addr);
+ write_data(g, (gU8)(addr>>8));
write_cmd(g, RA6963_SET_ADDRESS_POINTER);
}
LLDSPEC void gdisp_lld_write_color(GDisplay *g) {
- uint8_t temp;
+ gU8 temp;
#if RA6963_NEED_READ
temp = read_data(g);
@@ -275,7 +275,7 @@ LLDSPEC void gdisp_lld_read_start(GDisplay *g) { }
LLDSPEC gColor gdisp_lld_read_color(GDisplay *g) {
- uint16_t data;
+ gU16 data;
data = read_data(g);
return gdispNative2Color(data);
@@ -289,7 +289,7 @@ LLDSPEC void gdisp_lld_read_stop(GDisplay *g) { #if GDISP_HARDWARE_FILLS
LLDSPEC void gdisp_lld_fill_area(GDisplay *g) {
- uint8_t data, j;
+ gU8 data, j;
set_viewport(g);
if (g->p.color != GFX_WHITE) {
|