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

Pad table strings in the CMS

Browse source 
Ensures that switching from a longer string to a shorter one does not
leave chars from the longer string.

e.g. BATTERY -> GYRO would result in GYROERY
This commit is contained in:
Dan Nixon 2017-07-16 09:14:00 +01:00
parent cfb23ad0ac
commit c23b07bdda
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/cms/cms.c
View file

@ -41,6 +41,7 @@
#include "cms/cms_menu_builtin.h" #include "cms/cms_menu_builtin.h"
#include "cms/cms_types.h" #include "cms/cms_types.h"
#include "common/maths.h"
#include "common/typeconversion.h" #include "common/typeconversion.h"
#include "drivers/system.h" #include "drivers/system.h"
@ -260,7 +261,8 @@ static void cmsPadToSize(char *buf, int size)
static int cmsDrawMenuEntry(displayPort_t *pDisplay, OSD_Entry *p, uint8_t row) static int cmsDrawMenuEntry(displayPort_t *pDisplay, OSD_Entry *p, uint8_t row)
{ {
char buff[10]; #define CMS_DRAW_BUFFER_LEN 10
char buff[CMS_DRAW_BUFFER_LEN];
int cnt = 0; int cnt = 0;
switch (p->type) { switch (p->type) {
@ -306,8 +308,10 @@ static int cmsDrawMenuEntry(displayPort_t *pDisplay, OSD_Entry *p, uint8_t row)
case OME_TAB: case OME_TAB:
if (IS_PRINTVALUE(p)) { if (IS_PRINTVALUE(p)) {
OSD_TAB_t *ptr = p->data; OSD_TAB_t *ptr = p->data;
//cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay) - 5, row, (char *)ptr->names[*ptr->val]); char * str = (char *)ptr->names[*ptr->val];
cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, (char *)ptr->names[*ptr->val]); memcpy(buff, str, MAX(CMS_DRAW_BUFFER_LEN, strlen(str)));
cmsPadToSize(buff, CMS_DRAW_BUFFER_LEN);
cnt = displayWrite(pDisplay, RIGHT_MENU_COLUMN(pDisplay), row, buff);
CLR_PRINTVALUE(p); CLR_PRINTVALUE(p);
} }
break; break;