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

Add OME_String for simple string entry

Browse source
This commit is contained in:
jflyper 2016-11-02 17:57:53 +09:00
parent 9363f53945
commit 15c83c184c
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/io/canvas.h
View file

@ -1,3 +1,3 @@
#pragma once #pragma once
void canvasInit(void); void canvasInit(void);
void canvasCmsInit(displayPort_t *); void canvasCmsInit(displayPort_t *dPort);

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

@ -258,6 +258,12 @@ int cmsDrawMenuEntry(displayPort_t *pDisplay, OSD_Entry *p, uint8_t row, bool dr
int cnt = 0; int cnt = 0;
switch (p->type) { switch (p->type) {
case OME_String:
if (IS_PRINTVALUE(p) && p->data) {
cnt = cmsScreenWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, p->data);
CLR_PRINTVALUE(p);
}
break;
case OME_Submenu: case OME_Submenu:
if (IS_PRINTVALUE(p)) { if (IS_PRINTVALUE(p)) {
cnt = cmsScreenWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, ">"); cnt = cmsScreenWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, ">");
@ -728,6 +734,8 @@ uint16_t cmsHandleKey(displayPort_t *pDisplay, uint8_t key)
SET_PRINTVALUE(p); SET_PRINTVALUE(p);
} }
break; break;
case OME_String:
break;
case OME_Poll_INT16: case OME_Poll_INT16:
case OME_Label: case OME_Label:
case OME_END: case OME_END:
@ -976,7 +984,7 @@ OSD_UINT16_t entryYawPLimit = {&masterConfig.profile[0].pidProfile.yaw_p_limit,
OSD_UINT8_t entryVbatScale = {&masterConfig.batteryConfig.vbatscale, 1, 250, 1}; OSD_UINT8_t entryVbatScale = {&masterConfig.batteryConfig.vbatscale, 1, 250, 1};
OSD_UINT8_t entryVbatMaxCell = {&masterConfig.batteryConfig.vbatmaxcellvoltage, 10, 50, 1}; OSD_UINT8_t entryVbatMaxCell = {&masterConfig.batteryConfig.vbatmaxcellvoltage, 10, 50, 1};
OSD_Entry menuMisc[]= OSD_Entry menuImuMisc[]=
{ {
{"--- MISC ---", OME_Label, NULL, NULL, 0}, {"--- MISC ---", OME_Label, NULL, NULL, 0},
{"GYRO LPF", OME_UINT8, NULL, &entryGyroSoftLpfHz, 0}, {"GYRO LPF", OME_UINT8, NULL, &entryGyroSoftLpfHz, 0},
@ -992,12 +1000,12 @@ OSD_Entry menuMisc[]=
OSD_Entry menuImu[] = OSD_Entry menuImu[] =
{ {
{"--- CFG. IMU ---", OME_Label, NULL, NULL, 0}, {"--- CFG.IMU ---", OME_Label, NULL, NULL, 0},
{"PID PROF", OME_UINT8, NULL, &entryPidProfile, 0}, {"PID PROF", OME_UINT8, NULL, &entryPidProfile, 0},
{"PID", OME_Submenu, cmsMenuChange, &menuPid[0], 0}, {"PID", OME_Submenu, cmsMenuChange, &menuPid[0], 0},
{"RATE&RXPO", OME_Submenu, cmsMenuChange, &menuRateExpo[0], 0}, {"RATE&RXPO", OME_Submenu, cmsMenuChange, &menuRateExpo[0], 0},
{"RC PREV", OME_Submenu, cmsMenuChange, &menuRc[0], 0}, {"RC PREV", OME_Submenu, cmsMenuChange, &menuRc[0], 0},
{"MISC", OME_Submenu, cmsMenuChange, &menuMisc[0], 0}, {"MISC", OME_Submenu, cmsMenuChange, &menuImuMisc[0], 0},
{"BACK", OME_Back, NULL, NULL, 0}, {"BACK", OME_Back, NULL, NULL, 0},
{NULL, OME_END, NULL, NULL, 0} {NULL, OME_END, NULL, NULL, 0}
}; };
@ -1222,10 +1230,17 @@ static char infoTargetName[] = __TARGET__;
OSD_Entry menuInfo[] = { OSD_Entry menuInfo[] = {
{ "--- INFO ---", OME_Label, NULL, NULL, 0 }, { "--- INFO ---", OME_Label, NULL, NULL, 0 },
{ "FWID", OME_String, NULL, BETAFLIGHT_IDENTIFIER, 0 },
{ "FWVER", OME_String, NULL, FC_VERSION_STRING, 0 },
{ "GITREV", OME_String, NULL, infoGitRev, 0 },
{ "TARGET", OME_String, NULL, infoTargetName, 0 },
#if 0
{ BETAFLIGHT_IDENTIFIER, OME_Label, NULL, NULL, 0 }, { BETAFLIGHT_IDENTIFIER, OME_Label, NULL, NULL, 0 },
{ FC_VERSION_STRING, OME_Label, NULL, NULL, 0 }, { FC_VERSION_STRING, OME_Label, NULL, NULL, 0 },
{ infoGitRev, OME_Label, NULL, NULL, 0 }, { infoGitRev, OME_Label, NULL, NULL, 0 },
{ infoTargetName, OME_Label, NULL, NULL, 0 }, { infoTargetName, OME_Label, NULL, NULL, 0 },
#endif
{ "BACK", OME_Back, NULL, NULL, 0 }, { "BACK", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 } { NULL, OME_END, NULL, NULL, 0 }
}; };

9
src/main/io/cms_types.h
View file

@ -8,6 +8,7 @@
typedef long (*OSDMenuFuncPtr)(displayPort_t *, void *); typedef long (*OSDMenuFuncPtr)(displayPort_t *, void *);
//type of elements //type of elements
typedef enum typedef enum
{ {
OME_Label, OME_Label,
@ -20,9 +21,12 @@ typedef enum
OME_UINT16, OME_UINT16,
OME_INT16, OME_INT16,
OME_Poll_INT16, OME_Poll_INT16,
OME_String,
OME_FLOAT, //only up to 255 value and cant be 2.55 or 25.5, just for PID's OME_FLOAT, //only up to 255 value and cant be 2.55 or 25.5, just for PID's
//wlasciwosci elementow //wlasciwosci elementow
#ifdef OSD
OME_VISIBLE, OME_VISIBLE,
#endif
OME_TAB, OME_TAB,
OME_END, OME_END,
} OSD_MenuElement; } OSD_MenuElement;
@ -95,3 +99,8 @@ typedef struct
uint8_t max; uint8_t max;
const char * const *names; const char * const *names;
} OSD_TAB_t; } OSD_TAB_t;
typedef struct
{
char *val;
} OSD_String_t;