mirror of
https://github.com/iNavFlight/inav.git
synced 2025-07-26 01:35:35 +03:00
Fix handling of readonly items, cmsMenuChange() and formatting
This commit is contained in:
Alberto García Hierro
parent
09fb7c5834
commit
eb08d79fd9
2 changed files with 306 additions and 294 deletions
|
|
@ -56,6 +56,7 @@
|
|||
#include "config/parameter_group_ids.h"
|
||||
|
||||
// For 'ARM' related
|
||||
#include "fc/fc_core.h"
|
||||
#include "fc/config.h"
|
||||
#include "fc/rc_controls.h"
|
||||
#include "fc/runtime_config.h"
|
||||
|
|
@ -189,8 +190,7 @@ static cmsCtx_t currentCtx;
|
|||
|
||||
static char menuErrLabel[21 + 1] = "RANDOM DATA";
|
||||
|
||||
static const OSD_Entry menuErrEntries[] =
|
||||
{
|
||||
static const OSD_Entry menuErrEntries[] = {
|
||||
{ "BROKEN MENU", OME_Label, NULL, NULL, 0 },
|
||||
{ menuErrLabel, OME_Label, NULL, NULL, 0 },
|
||||
|
||||
|
|
@ -198,8 +198,7 @@ static const OSD_Entry menuErrEntries[] =
|
|||
OSD_END_ENTRY,
|
||||
};
|
||||
|
||||
static const CMS_Menu menuErr =
|
||||
{
|
||||
static const CMS_Menu menuErr = {
|
||||
"MENUERR",
|
||||
OME_MENU,
|
||||
NULL,
|
||||
|
|
@ -409,17 +408,29 @@ static int cmsDrawMenuEntry(displayPort_t *pDisplay, const OSD_Entry *p, uint8_t
|
|||
|
||||
case OME_UINT8:
|
||||
if (IS_PRINTVALUE(p, screenRow) && p->data) {
|
||||
const uint8_t *val;
|
||||
if (IS_READONLY(p)) {
|
||||
val = p->data;
|
||||
} else {
|
||||
const OSD_UINT8_t *ptr = p->data;
|
||||
itoa(*ptr->val, buff, 10);
|
||||
val = ptr->val;
|
||||
}
|
||||
itoa(*val, buff, 10);
|
||||
cnt = cmsDrawMenuItemValue(pDisplay, buff, row, CMS_NUM_FIELD_LEN);
|
||||
CLR_PRINTVALUE(p, screenRow);
|
||||
}
|
||||
break;
|
||||
|
||||
case OME_INT8:
|
||||
if (IS_PRINTVALUE(p, row) && p->data) {
|
||||
if (IS_PRINTVALUE(p, screenRow) && p->data) {
|
||||
const int8_t *val;
|
||||
if (IS_READONLY(p)) {
|
||||
val = p->data;
|
||||
} else {
|
||||
const OSD_INT8_t *ptr = p->data;
|
||||
itoa(*ptr->val, buff, 10);
|
||||
val = ptr->val;
|
||||
}
|
||||
itoa(*val, buff, 10);
|
||||
cnt = cmsDrawMenuItemValue(pDisplay, buff, row, CMS_NUM_FIELD_LEN);
|
||||
CLR_PRINTVALUE(p, screenRow);
|
||||
}
|
||||
|
|
@ -514,7 +525,8 @@ static int cmsDrawMenuEntry(displayPort_t *pDisplay, const OSD_Entry *p, uint8_t
|
|||
tfp_sprintf(buff, "%d", (int)value);
|
||||
}
|
||||
break;
|
||||
case MODE_LOOKUP: {
|
||||
case MODE_LOOKUP:
|
||||
{
|
||||
const char *str = settingLookupValueName(var, value);
|
||||
strncpy(buff, str ? str : "INVALID", sizeof(buff) - 1);
|
||||
}
|
||||
|
|
@ -605,13 +617,12 @@ static void cmsDrawMenu(displayPort_t *pDisplay, uint32_t currentTimeUs)
|
|||
|
||||
// Cursor manipulation
|
||||
|
||||
while ((pageTop + currentCtx.cursorRow)->type == OME_Label)// skip label
|
||||
while (cmsElementIsLabel((pageTop + currentCtx.cursorRow)->type)) // skip label
|
||||
currentCtx.cursorRow++;
|
||||
|
||||
cmsPageDebug();
|
||||
|
||||
if (pDisplay->cursorRow >= 0
|
||||
&& currentCtx.cursorRow != pDisplay->cursorRow) {
|
||||
if (pDisplay->cursorRow >= 0 && currentCtx.cursorRow != pDisplay->cursorRow) {
|
||||
room -= displayWrite(pDisplay, leftMenuColumn, top + pDisplay->cursorRow * linesPerMenuItem, " ");
|
||||
}
|
||||
|
||||
|
|
@ -630,7 +641,7 @@ static void cmsDrawMenu(displayPort_t *pDisplay, uint32_t currentTimeUs)
|
|||
for (i = 0, p = pageTop; i < maxMenuItems && p->type != OME_END; i++, p++) {
|
||||
if (IS_PRINTLABEL(p, i)) {
|
||||
uint8_t coloff = leftMenuColumn;
|
||||
coloff += (p->type == OME_Label) ? 0 : 1;
|
||||
coloff += cmsElementIsLabel(p->type) ? 0 : 1;
|
||||
room -= displayWrite(pDisplay, coloff, top + i * linesPerMenuItem, p->text);
|
||||
CLR_PRINTLABEL(p, i);
|
||||
if (room < 30) {
|
||||
|
|
@ -648,9 +659,10 @@ static void cmsDrawMenu(displayPort_t *pDisplay, uint32_t currentTimeUs)
|
|||
for (i = 0, p = pageTop; i < maxMenuItems && p->type != OME_END; i++, p++) {
|
||||
if (IS_PRINTVALUE(p, i)) {
|
||||
room -= cmsDrawMenuEntry(pDisplay, p, top + i * linesPerMenuItem, i);
|
||||
if (room < 30)
|
||||
if (room < 30) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (p->type == OME_BACK_AND_END) {
|
||||
break;
|
||||
}
|
||||
|
|
@ -672,10 +684,8 @@ static void cmsMenuCountPage(displayPort_t *pDisplay)
|
|||
|
||||
STATIC_UNIT_TESTED long cmsMenuBack(displayPort_t *pDisplay); // Forward; will be resolved after merging
|
||||
|
||||
long cmsMenuChange(displayPort_t *pDisplay, const void *ptr)
|
||||
long cmsMenuChange(displayPort_t *pDisplay, const CMS_Menu *pMenu, const OSD_Entry *from)
|
||||
{
|
||||
const CMS_Menu *pMenu = (const CMS_Menu *) ptr;
|
||||
|
||||
if (!pMenu) {
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -683,12 +693,9 @@ long cmsMenuChange(displayPort_t *pDisplay, const void *ptr)
|
|||
#ifdef CMS_MENU_DEBUG
|
||||
if (pMenu->GUARD_type != OME_MENU) {
|
||||
// ptr isn't pointing to a CMS_Menu.
|
||||
if (pMenu->GUARD_type <= OME_MAX)
|
||||
{
|
||||
if (pMenu->GUARD_type <= OME_MAX) {
|
||||
strncpy(menuErrLabel, pMenu->GUARD_text, sizeof(menuErrLabel) - 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
strncpy(menuErrLabel, "LABEL UNKNOWN", sizeof(menuErrLabel) - 1);
|
||||
}
|
||||
pMenu = &menuErr;
|
||||
|
|
@ -703,7 +710,7 @@ long cmsMenuChange(displayPort_t *pDisplay, const void *ptr)
|
|||
currentCtx.menu = pMenu;
|
||||
currentCtx.cursorRow = 0;
|
||||
|
||||
if (pMenu->onEnter && (pMenu->onEnter(NULL) == MENU_CHAIN_BACK)) {
|
||||
if (pMenu->onEnter && (pMenu->onEnter(from) == MENU_CHAIN_BACK)) {
|
||||
return cmsMenuBack(pDisplay);
|
||||
}
|
||||
|
||||
|
|
@ -791,7 +798,7 @@ void cmsMenuOpen(void)
|
|||
maxMenuItems = pCurrentDisplay->rows;
|
||||
}
|
||||
|
||||
cmsMenuChange(pCurrentDisplay, currentCtx.menu);
|
||||
cmsMenuChange(pCurrentDisplay, currentCtx.menu, NULL);
|
||||
}
|
||||
|
||||
static void cmsTraverseGlobalExit(const CMS_Menu *pMenu)
|
||||
|
|
@ -824,8 +831,7 @@ long cmsMenuExit(displayPort_t *pDisplay, const void *ptr)
|
|||
if (currentCtx.menu->onExit)
|
||||
currentCtx.menu->onExit((OSD_Entry *)NULL); // Forced exit
|
||||
|
||||
if ((exitType == CMS_POPUP_SAVE)
|
||||
|| (exitType == CMS_POPUP_SAVEREBOOT)) {
|
||||
if ((exitType == CMS_POPUP_SAVE) || (exitType == CMS_POPUP_SAVEREBOOT)) {
|
||||
// traverse through the menu stack and call their onExit functions
|
||||
for (int i = menuStackIdx - 1; i >= 0; i--) {
|
||||
if (menuStack[i].menu->onExit) {
|
||||
|
|
@ -852,11 +858,7 @@ long cmsMenuExit(displayPort_t *pDisplay, const void *ptr)
|
|||
|
||||
displayResync(pDisplay); // Was max7456RefreshAll(); why at this timing?
|
||||
|
||||
stopMotors();
|
||||
stopPwmAllMotors();
|
||||
delay(200);
|
||||
|
||||
systemReset();
|
||||
fcReboot(false);
|
||||
}
|
||||
|
||||
DISABLE_ARMING_FLAG(ARMING_DISABLED_CMS_MENU);
|
||||
|
|
@ -903,7 +905,7 @@ STATIC_UNIT_TESTED uint16_t cmsHandleKey(displayPort_t *pDisplay, uint8_t key)
|
|||
}
|
||||
|
||||
if (key == CMS_KEY_SAVEMENU) {
|
||||
cmsMenuChange(pDisplay, &cmsx_menuSaveExit);
|
||||
cmsMenuChange(pDisplay, &cmsx_menuSaveExit, NULL);
|
||||
return BUTTON_PAUSE;
|
||||
}
|
||||
|
||||
|
|
@ -938,7 +940,7 @@ STATIC_UNIT_TESTED uint16_t cmsHandleKey(displayPort_t *pDisplay, uint8_t key)
|
|||
switch (p->type) {
|
||||
case OME_Submenu:
|
||||
if (key == CMS_KEY_RIGHT) {
|
||||
cmsMenuChange(pDisplay, p->data);
|
||||
cmsMenuChange(pDisplay, p->data, p);
|
||||
res = BUTTON_PAUSE;
|
||||
}
|
||||
break;
|
||||
|
|
@ -990,6 +992,9 @@ STATIC_UNIT_TESTED uint16_t cmsHandleKey(displayPort_t *pDisplay, uint8_t key)
|
|||
|
||||
case OME_UINT8:
|
||||
case OME_FLOAT:
|
||||
if (IS_READONLY(p)) {
|
||||
break;
|
||||
}
|
||||
if (p->data) {
|
||||
const OSD_UINT8_t *ptr = p->data;
|
||||
if (key == CMS_KEY_RIGHT) {
|
||||
|
|
@ -1025,6 +1030,9 @@ STATIC_UNIT_TESTED uint16_t cmsHandleKey(displayPort_t *pDisplay, uint8_t key)
|
|||
break;
|
||||
|
||||
case OME_INT8:
|
||||
if (IS_READONLY(p)) {
|
||||
break;
|
||||
}
|
||||
if (p->data) {
|
||||
const OSD_INT8_t *ptr = p->data;
|
||||
if (key == CMS_KEY_RIGHT) {
|
||||
|
|
@ -1093,43 +1101,48 @@ STATIC_UNIT_TESTED uint16_t cmsHandleKey(displayPort_t *pDisplay, uint8_t key)
|
|||
}
|
||||
const void *valuePointer = settingGetValuePointer(var);
|
||||
switch (SETTING_TYPE(var)) {
|
||||
case VAR_UINT8: {
|
||||
case VAR_UINT8:
|
||||
{
|
||||
uint8_t val = *(uint8_t *)valuePointer;
|
||||
val = MIN(MAX(val + step, (uint8_t)min), (uint8_t)max);
|
||||
*(uint8_t *)valuePointer = val;
|
||||
break;
|
||||
}
|
||||
case VAR_INT8: {
|
||||
case VAR_INT8:
|
||||
{
|
||||
int8_t val = *(int8_t *)valuePointer;
|
||||
val = MIN(MAX(val + step, (int8_t)min), (int8_t)max);
|
||||
*(int8_t *)valuePointer = val;
|
||||
break;
|
||||
}
|
||||
case VAR_UINT16: {
|
||||
case VAR_UINT16:
|
||||
{
|
||||
uint16_t val = *(uint16_t *)valuePointer;
|
||||
val = MIN(MAX(val + step, (uint16_t)min), (uint16_t)max);
|
||||
*(uint16_t *)valuePointer = val;
|
||||
break;
|
||||
}
|
||||
case VAR_INT16: {
|
||||
case VAR_INT16:
|
||||
{
|
||||
int16_t val = *(int16_t *)valuePointer;
|
||||
val = MIN(MAX(val + step, (int16_t)min), (int16_t)max);
|
||||
*(int16_t *)valuePointer = val;
|
||||
break;
|
||||
}
|
||||
case VAR_UINT32: {
|
||||
case VAR_UINT32:
|
||||
{
|
||||
uint32_t val = *(uint32_t *)valuePointer;
|
||||
val = MIN(MAX(val + step, (uint32_t)min), (uint32_t)max);
|
||||
*(uint32_t *)valuePointer = val;
|
||||
break;
|
||||
}
|
||||
case VAR_FLOAT: {
|
||||
case VAR_FLOAT:
|
||||
{
|
||||
float val = *(float *)valuePointer;
|
||||
val = MIN(MAX(val + step, (float)min), (float)max);
|
||||
*(float *)valuePointer = val;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case VAR_STRING:
|
||||
break;
|
||||
}
|
||||
|
|
@ -1270,8 +1283,7 @@ static uint16_t cmsScanKeys(timeMs_t currentTimeMs, timeMs_t lastCalledMs, int16
|
|||
void cmsUpdate(uint32_t currentTimeUs)
|
||||
{
|
||||
#ifdef USE_RCDEVICE
|
||||
if(rcdeviceInMenu)
|
||||
{
|
||||
if(rcdeviceInMenu) {
|
||||
return ;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ void cmsHandler(timeUs_t currentTimeUs);
|
|||
|
||||
bool cmsDisplayPortSelect(displayPort_t *instance);
|
||||
void cmsMenuOpen(void);
|
||||
long cmsMenuChange(displayPort_t *pPort, const void *ptr);
|
||||
long cmsMenuChange(displayPort_t *pPort, const CMS_Menu *menu, const OSD_Entry *from);
|
||||
long cmsMenuExit(displayPort_t *pPort, const void *ptr);
|
||||
void cmsYieldDisplay(displayPort_t *pPort, timeMs_t duration);
|
||||
void cmsUpdate(uint32_t currentTimeUs);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue