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

Some names made more intuitive

Browse source
This commit is contained in:
jflyper 2016-11-04 17:22:58 +09:00
parent 0a270e878b
commit 51d4b34540
4 changed files with 61 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,15 +24,11 @@
#include "display.h" #include "display.h"
// XXX Why is this here? Something wrong?
// XXX Something like Drawing Context that holds all state variables would be the way...
int8_t lastCursorPos;
void displayClear(displayPort_t *instance) void displayClear(displayPort_t *instance)
{ {
instance->vTable->clear(instance); instance->vTable->clear(instance);
instance->cleared = true; instance->cleared = true;
instance->lastCursorPos = -1; instance->cursorRow = -1;
} }
void displayOpen(displayPort_t *instance) void displayOpen(displayPort_t *instance)

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

@ -25,7 +25,7 @@ typedef struct displayPort_s {
// CMS state // CMS state
bool cleared; bool cleared;
int8_t lastCursorPos; int8_t cursorRow;
} displayPort_t; } displayPort_t;
typedef struct displayPortVTable_s { typedef struct displayPortVTable_s {

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

@ -72,7 +72,7 @@
#include "io/cms_vtx.h" #include "io/cms_vtx.h"
#ifdef OSD #ifdef OSD
#include "io/cms_osd.h" #include "io/cms_osd.h"
#endif // OSD #endif
#include "io/cms_ledstrip.h" #include "io/cms_ledstrip.h"
// Forwards // Forwards
@ -82,7 +82,9 @@ void cmsx_FeatureWriteback(void);
// Device management // Device management
#ifndef CMS_MAX_DEVICE
#define CMS_MAX_DEVICE 4 #define CMS_MAX_DEVICE 4
#endif
cmsDeviceInitFuncPtr cmsDeviceInitFunc[CMS_MAX_DEVICE]; cmsDeviceInitFuncPtr cmsDeviceInitFunc[CMS_MAX_DEVICE];
int cmsDeviceCount; int cmsDeviceCount;
@ -152,17 +154,21 @@ displayPort_t currentDisplay;
bool cmsInMenu = false; bool cmsInMenu = false;
OSD_Entry *menuStack[10]; //tab to save menu stack OSD_Entry menuMain[];
uint8_t menuStackHistory[10]; //current position in menu stack
// XXX Does menu backing support backing into second page???
OSD_Entry *menuStack[10]; // Stack to save menu transition
uint8_t menuStackHistory[10]; // cursorRow in a stacked menu
uint8_t menuStackIdx = 0; uint8_t menuStackIdx = 0;
OSD_Entry menuMain[]; OSD_Entry *currentMenu; // Points to top entry of the current page
OSD_Entry *currentMenu = NULL; OSD_Entry *nextPage; // Only 2 pages are allowed (for now)
OSD_Entry *nextPage = NULL; uint8_t maxRow; // Max row in a page
int8_t currentCursorPos = 0; int8_t cursorRow;
uint8_t currentMenuIdx = 0;
uint16_t *currentElement = NULL; // Stick/key detection
#define IS_HI(X) (rcData[X] > 1750) #define IS_HI(X) (rcData[X] > 1750)
#define IS_LO(X) (rcData[X] < 1250) #define IS_LO(X) (rcData[X] < 1250)
@ -179,18 +185,18 @@ uint16_t *currentElement = NULL;
#define BUTTON_TIME 250 // msec #define BUTTON_TIME 250 // msec
#define BUTTON_PAUSE 500 // msec #define BUTTON_PAUSE 500 // msec
void cmsUpdateMaxRows(displayPort_t *instance) void cmsUpdateMaxRow(displayPort_t *instance)
{ {
OSD_Entry *ptr; OSD_Entry *ptr;
currentMenuIdx = 0; maxRow = 0;
for (ptr = currentMenu; ptr->type != OME_END; ptr++) for (ptr = currentMenu; ptr->type != OME_END; ptr++)
currentMenuIdx++; maxRow++;
if (currentMenuIdx > MAX_MENU_ITEMS(instance)) if (maxRow > MAX_MENU_ITEMS(instance))
currentMenuIdx = MAX_MENU_ITEMS(instance); maxRow = MAX_MENU_ITEMS(instance);
currentMenuIdx--; maxRow--;
} }
static void cmsFormatFloat(int32_t value, char *floatString) static void cmsFormatFloat(int32_t value, char *floatString)
@ -220,7 +226,7 @@ static void cmsFormatFloat(int32_t value, char *floatString)
floatString[0] = ' '; floatString[0] = ' ';
} }
void cmsPad(char *buf, int size) void cmsPadToSize(char *buf, int size)
{ {
int i; int i;
@ -294,8 +300,7 @@ int cmsDrawMenuEntry(displayPort_t *pDisplay, OSD_Entry *p, uint8_t row, bool dr
if (IS_PRINTVALUE(p) && p->data) { if (IS_PRINTVALUE(p) && p->data) {
OSD_UINT8_t *ptr = p->data; OSD_UINT8_t *ptr = p->data;
itoa(*ptr->val, buff, 10); itoa(*ptr->val, buff, 10);
cmsPad(buff, 5); cmsPadToSize(buff, 5);
//cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, " ");
cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff); cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff);
CLR_PRINTVALUE(p); CLR_PRINTVALUE(p);
} }
@ -304,7 +309,7 @@ int cmsDrawMenuEntry(displayPort_t *pDisplay, OSD_Entry *p, uint8_t row, bool dr
if (IS_PRINTVALUE(p) && p->data) { if (IS_PRINTVALUE(p) && p->data) {
OSD_INT8_t *ptr = p->data; OSD_INT8_t *ptr = p->data;
itoa(*ptr->val, buff, 10); itoa(*ptr->val, buff, 10);
cmsPad(buff, 5); cmsPadToSize(buff, 5);
cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff); cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff);
CLR_PRINTVALUE(p); CLR_PRINTVALUE(p);
} }
@ -313,7 +318,7 @@ int cmsDrawMenuEntry(displayPort_t *pDisplay, OSD_Entry *p, uint8_t row, bool dr
if (IS_PRINTVALUE(p) && p->data) { if (IS_PRINTVALUE(p) && p->data) {
OSD_UINT16_t *ptr = p->data; OSD_UINT16_t *ptr = p->data;
itoa(*ptr->val, buff, 10); itoa(*ptr->val, buff, 10);
cmsPad(buff, 5); cmsPadToSize(buff, 5);
cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff); cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff);
CLR_PRINTVALUE(p); CLR_PRINTVALUE(p);
} }
@ -322,7 +327,7 @@ int cmsDrawMenuEntry(displayPort_t *pDisplay, OSD_Entry *p, uint8_t row, bool dr
if (IS_PRINTVALUE(p) && p->data) { if (IS_PRINTVALUE(p) && p->data) {
OSD_UINT16_t *ptr = p->data; OSD_UINT16_t *ptr = p->data;
itoa(*ptr->val, buff, 10); itoa(*ptr->val, buff, 10);
cmsPad(buff, 5); cmsPadToSize(buff, 5);
cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff); cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff);
CLR_PRINTVALUE(p); CLR_PRINTVALUE(p);
} }
@ -331,7 +336,7 @@ int cmsDrawMenuEntry(displayPort_t *pDisplay, OSD_Entry *p, uint8_t row, bool dr
if (p->data && drawPolled) { if (p->data && drawPolled) {
OSD_UINT16_t *ptr = p->data; OSD_UINT16_t *ptr = p->data;
itoa(*ptr->val, buff, 10); itoa(*ptr->val, buff, 10);
cmsPad(buff, 5); cmsPadToSize(buff, 5);
cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff); cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff);
// PRINTVALUE not cleared on purpose // PRINTVALUE not cleared on purpose
} }
@ -340,7 +345,7 @@ int cmsDrawMenuEntry(displayPort_t *pDisplay, OSD_Entry *p, uint8_t row, bool dr
if (IS_PRINTVALUE(p) && p->data) { if (IS_PRINTVALUE(p) && p->data) {
OSD_FLOAT_t *ptr = p->data; OSD_FLOAT_t *ptr = p->data;
cmsFormatFloat(*ptr->val * ptr->multipler, buff); cmsFormatFloat(*ptr->val * ptr->multipler, buff);
cmsPad(buff, 5); cmsPadToSize(buff, 5);
cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay) - 1, row, buff); // XXX One char left ??? cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay) - 1, row, buff); // XXX One char left ???
CLR_PRINTVALUE(p); CLR_PRINTVALUE(p);
} }
@ -359,7 +364,7 @@ void cmsDrawMenu(displayPort_t *pDisplay)
{ {
uint8_t i; uint8_t i;
OSD_Entry *p; OSD_Entry *p;
uint8_t top = (pDisplay->rows - currentMenuIdx) / 2 - 1; uint8_t top = (pDisplay->rows - maxRow) / 2 - 1;
// Polled (dynamic) value display denominator. // Polled (dynamic) value display denominator.
// XXX Need to denom based on absolute time // XXX Need to denom based on absolute time
@ -389,19 +394,19 @@ void cmsDrawMenu(displayPort_t *pDisplay)
// Cursor manipulation // Cursor manipulation
while ((currentMenu + currentCursorPos)->type == OME_Label) // skip label while ((currentMenu + cursorRow)->type == OME_Label) // skip label
currentCursorPos++; cursorRow++;
if (pDisplay->lastCursorPos >= 0 && currentCursorPos != pDisplay->lastCursorPos) { if (pDisplay->cursorRow >= 0 && cursorRow != pDisplay->cursorRow) {
room -= displayWrite(pDisplay, LEFT_MENU_COLUMN, pDisplay->lastCursorPos + top, " "); room -= displayWrite(pDisplay, LEFT_MENU_COLUMN, pDisplay->cursorRow + top, " ");
} }
if (room < 30) if (room < 30)
return; return;
if (pDisplay->lastCursorPos != currentCursorPos) { if (pDisplay->cursorRow != cursorRow) {
room -= displayWrite(pDisplay, LEFT_MENU_COLUMN, currentCursorPos + top, " >"); room -= displayWrite(pDisplay, LEFT_MENU_COLUMN, cursorRow + top, " >");
pDisplay->lastCursorPos = currentCursorPos; pDisplay->cursorRow = cursorRow;
} }
if (room < 30) if (room < 30)
@ -441,17 +446,19 @@ long cmsMenuChange(displayPort_t *pDisplay, void *ptr)
if (ptr == cmsx_menuRateExpo) if (ptr == cmsx_menuRateExpo)
cmsx_RateExpoRead(); cmsx_RateExpoRead();
// Stack the current menu and move to a new menu.
// The (ptr == curretMenu) case occurs when reopening for display sw
if ((OSD_Entry *)ptr != currentMenu) { if ((OSD_Entry *)ptr != currentMenu) {
// Stack it and move to a new menu.
// (ptr == curretMenu case occurs when reopening for display sw)
menuStack[menuStackIdx] = currentMenu; menuStack[menuStackIdx] = currentMenu;
menuStackHistory[menuStackIdx] = currentCursorPos; menuStackHistory[menuStackIdx] = cursorRow;
menuStackIdx++; menuStackIdx++;
currentMenu = (OSD_Entry *)ptr; currentMenu = (OSD_Entry *)ptr;
currentCursorPos = 0; cursorRow = 0;
} }
displayClear(pDisplay); displayClear(pDisplay);
cmsUpdateMaxRows(pDisplay); cmsUpdateMaxRow(pDisplay);
} }
return 0; return 0;
@ -473,9 +480,8 @@ long cmsMenuBack(displayPort_t *pDisplay)
menuStackIdx--; menuStackIdx--;
nextPage = NULL; nextPage = NULL;
currentMenu = menuStack[menuStackIdx]; currentMenu = menuStack[menuStackIdx];
currentCursorPos = menuStackHistory[menuStackIdx]; cursorRow = menuStackHistory[menuStackIdx];
cmsUpdateMaxRow(pDisplay);
cmsUpdateMaxRows(pDisplay);
} }
return 0; return 0;
@ -549,46 +555,42 @@ uint16_t cmsHandleKey(displayPort_t *pDisplay, uint8_t key)
} }
if (key == KEY_DOWN) { if (key == KEY_DOWN) {
if (currentCursorPos < currentMenuIdx) { if (cursorRow < maxRow) {
currentCursorPos++; cursorRow++;
} else { } else {
if (nextPage) { // we have more pages if (nextPage) { // we have another page
displayClear(pDisplay); displayClear(pDisplay);
p = nextPage; p = nextPage;
nextPage = currentMenu; nextPage = currentMenu;
currentMenu = (OSD_Entry *)p; currentMenu = (OSD_Entry *)p;
currentCursorPos = 0; cmsUpdateMaxRow(pDisplay);
cmsUpdateMaxRows(pDisplay);
} else {
currentCursorPos = 0;
} }
cursorRow = 0; // Goto top in any case
} }
} }
if (key == KEY_UP) { if (key == KEY_UP) {
currentCursorPos--; cursorRow--;
if ((currentMenu + currentCursorPos)->type == OME_Label && currentCursorPos > 0) if ((currentMenu + cursorRow)->type == OME_Label && cursorRow > 0)
currentCursorPos--; cursorRow--;
if (currentCursorPos == -1 || (currentMenu + currentCursorPos)->type == OME_Label) { if (cursorRow == -1 || (currentMenu + cursorRow)->type == OME_Label) {
if (nextPage) { if (nextPage) {
displayClear(pDisplay); displayClear(pDisplay);
p = nextPage; p = nextPage;
nextPage = currentMenu; nextPage = currentMenu;
currentMenu = (OSD_Entry *)p; currentMenu = (OSD_Entry *)p;
currentCursorPos = 0; cmsUpdateMaxRow(pDisplay);
cmsUpdateMaxRows(pDisplay);
} else {
currentCursorPos = currentMenuIdx;
} }
cursorRow = maxRow; // Goto bottom in any case
} }
} }
if (key == KEY_DOWN || key == KEY_UP) if (key == KEY_DOWN || key == KEY_UP)
return res; return res;
p = currentMenu + currentCursorPos; p = currentMenu + cursorRow;
switch (p->type) { switch (p->type) {
case OME_Submenu: case OME_Submenu:
@ -759,7 +761,7 @@ void cmsUpdate(displayPort_t *pDisplay, uint32_t currentTime)
//lastCalled = currentTime; //lastCalled = currentTime;
if (key && !currentElement) { if (key) {
rcDelay = cmsHandleKey(&currentDisplay, key); rcDelay = cmsHandleKey(&currentDisplay, key);
return; return;
} }

1
src/main/target/OMNIBUS/target.h
View file

@ -96,6 +96,7 @@
// Configuratoin Menu System // Configuratoin Menu System
#define CMS #define CMS
#define CMS_MAX_DEVICE 4
// Use external OSD to run CMS // Use external OSD to run CMS
#define CANVAS #define CANVAS