Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

begin-end to open-close

Browse source
This commit is contained in:
jflyper 2016-11-04 09:48:44 +09:00
parent fc81bc668b
commit d1aa8a603c
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/drivers/display.c
View file

@ -35,15 +35,15 @@ void displayClear(displayPort_t *instance)
instance->lastCursorPos = -1; instance->lastCursorPos = -1;
} }
void displayBegin(displayPort_t *instance) void displayOpen(displayPort_t *instance)
{ {
instance->vTable->begin(instance); instance->vTable->open(instance);
instance->vTable->clear(instance); instance->vTable->clear(instance);
} }
void displayEnd(displayPort_t *instance) void displayClose(displayPort_t *instance)
{ {
instance->vTable->end(instance); instance->vTable->close(instance);
} }
int displayWrite(displayPort_t *instance, uint8_t x, uint8_t y, char *s) int displayWrite(displayPort_t *instance, uint8_t x, uint8_t y, char *s)

10
src/main/drivers/display.h
View file

@ -22,8 +22,6 @@ typedef struct displayPort_s {
const struct displayPortVTable_s *vTable; const struct displayPortVTable_s *vTable;
uint8_t rows; uint8_t rows;
uint8_t cols; uint8_t cols;
uint16_t buftime;
uint16_t bufsize;
// CMS state // CMS state
bool cleared; bool cleared;
@ -31,8 +29,8 @@ typedef struct displayPort_s {
} displayPort_t; } displayPort_t;
typedef struct displayPortVTable_s { typedef struct displayPortVTable_s {
int (*begin)(displayPort_t *displayPort); int (*open)(displayPort_t *displayPort);
int (*end)(displayPort_t *displayPort); int (*close)(displayPort_t *displayPort);
int (*clear)(displayPort_t *displayPort); int (*clear)(displayPort_t *displayPort);
int (*write)(displayPort_t *displayPort, uint8_t col, uint8_t row, char *text); int (*write)(displayPort_t *displayPort, uint8_t col, uint8_t row, char *text);
int (*heartbeat)(displayPort_t *displayPort); int (*heartbeat)(displayPort_t *displayPort);
@ -40,9 +38,9 @@ typedef struct displayPortVTable_s {
uint32_t (*txBytesFree)(displayPort_t *displayPort); uint32_t (*txBytesFree)(displayPort_t *displayPort);
} displayPortVTable_t; } displayPortVTable_t;
void displayOpen(displayPort_t *instance);
void displayClose(displayPort_t *instance);
void displayClear(displayPort_t *instance); void displayClear(displayPort_t *instance);
void displayBegin(displayPort_t *instance);
void displayEnd(displayPort_t *instance);
int displayWrite(displayPort_t *instance, uint8_t x, uint8_t y, char *s); int displayWrite(displayPort_t *instance, uint8_t x, uint8_t y, char *s);
void displayHeartbeat(displayPort_t *instance); void displayHeartbeat(displayPort_t *instance);
void displayResync(displayPort_t *instance); void displayResync(displayPort_t *instance);

6
src/main/io/cms.c
View file

@ -494,7 +494,7 @@ void cmsMenuOpen(void)
currentMenu = &menuMain[0]; currentMenu = &menuMain[0];
} else { } else {
// Switch display // Switch display
displayEnd(&currentDisplay); displayClose(&currentDisplay);
initfunc = cmsDeviceSelectNext(); initfunc = cmsDeviceSelectNext();
} }
@ -502,7 +502,7 @@ void cmsMenuOpen(void)
return; return;
cmsScreenInit(&currentDisplay, initfunc); cmsScreenInit(&currentDisplay, initfunc);
displayBegin(&currentDisplay); displayOpen(&currentDisplay);
cmsMenuChange(&currentDisplay, currentMenu); cmsMenuChange(&currentDisplay, currentMenu);
} }
@ -524,7 +524,7 @@ long cmsMenuExit(displayPort_t *pDisplay, void *ptr)
cmsInMenu = false; cmsInMenu = false;
displayEnd(pDisplay); displayClose(pDisplay);
currentMenu = NULL; currentMenu = NULL;
if (ptr) if (ptr)