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

Merge pull request #10273 from etracer65/cms_table_display_improvements

Browse source 
Improve CMS support of long lookup table names
This commit is contained in:
Michael Keller 2020-10-16 03:29:56 +13:00 • committed by GitHub
commit e315fb74da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/build/debug.c
View file

@ -61,7 +61,7 @@ const char * const debugModeNames[DEBUG_COUNT] = {
"SBUS",
"FPORT",
"RANGEFINDER",
"RNGFNDR_QUALITY",
"RANGEFINDER_QUALITY",
"LIDAR_TF",
"ADC_INTERNAL",
"RUNAWAY_TAKEOFF",
@ -74,7 +74,7 @@ const char * const debugModeNames[DEBUG_COUNT] = {
"ACRO_TRAINER",
"RC_SMOOTHING",
"RX_SIGNAL_LOSS",
"RC_SMOOTH_RATE",
"RC_SMOOTHING_RATE",
"ANTI_GRAVITY",
"DYN_LPF",
"RX_SPEKTRUM_SPI",
@ -85,9 +85,9 @@ const char * const debugModeNames[DEBUG_COUNT] = {
"AC_ERROR",
"DUAL_GYRO_SCALED",
"DSHOT_RPM_ERRORS",
"CRSF_LS_UPLINK",
"CRSF_LS_PWR",
"CRSF_LS_DOWN",
"CRSF_LINK_STATISTICS_UPLINK",
"CRSF_LINK_STATISTICS_PWR",
"CRSF_LINK_STATISTICS_DOWN",
"BARO",
"GPS_RESCUE_THROTTLE_PID",
"DYN_IDLE",

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

@ -243,6 +243,16 @@ static uint8_t cmsCursorAbsolute(displayPort_t *instance)
uint8_t runtimeEntryFlags[CMS_MAX_ROWS] = { 0 };
#define LOOKUP_TABLE_TICKER_START_CYCLES 20 // Task loops for start/end of ticker (1 second delay)
#define LOOKUP_TABLE_TICKER_SCROLL_CYCLES 3 // Task loops for each scrolling step of the ticker (150ms delay)
typedef struct cmsTableTicker_s {
uint8_t loopCounter;
uint8_t state;
} cmsTableTicker_t;
cmsTableTicker_t runtimeTableTicker[CMS_MAX_ROWS];
static void cmsPageSelect(displayPort_t *instance, int8_t newpage)
{
currentCtx.page = (newpage + pageCount) % pageCount;
@ -378,13 +388,15 @@ static int cmsDrawMenuItemValue(displayPort_t *pDisplay, char *buff, uint8_t row
return cnt;
}
static int cmsDrawMenuEntry(displayPort_t *pDisplay, const OSD_Entry *p, uint8_t row, bool selectedRow, uint8_t *flags)
static int cmsDrawMenuEntry(displayPort_t *pDisplay, const OSD_Entry *p, uint8_t row, bool selectedRow, uint8_t *flags, cmsTableTicker_t *ticker)
{
#define CMS_DRAW_BUFFER_LEN 12
#define CMS_TABLE_VALUE_MAX_LEN 30
#define CMS_NUM_FIELD_LEN 5
#define CMS_CURSOR_BLINK_DELAY_MS 500
char buff[CMS_DRAW_BUFFER_LEN +1]; // Make room for null terminator.
char tableBuff[CMS_TABLE_VALUE_MAX_LEN +1];
int cnt = 0;
#ifndef USE_OSD
@ -440,11 +452,43 @@ static int cmsDrawMenuEntry(displayPort_t *pDisplay, const OSD_Entry *p, uint8_t
break;
case OME_TAB:
if (IS_PRINTVALUE(*flags)) {
if (IS_PRINTVALUE(*flags) || IS_SCROLLINGTICKER(*flags)) {
bool drawText = false;
OSD_TAB_t *ptr = p->data;
char * str = (char *)ptr->names[*ptr->val];
strncpy(buff, str, CMS_DRAW_BUFFER_LEN);
cnt = cmsDrawMenuItemValue(pDisplay, buff, row, CMS_DRAW_BUFFER_LEN);
const int labelLength = strlen(p->text) + 1; // account for the space between label and display data
char *str = (char *)ptr->names[*ptr->val]; // lookup table display text
const int displayLength = strlen(str);
// Calculate the available space to display the lookup table entry based on the
// screen size and the length of the label. Always display at least CMS_DRAW_BUFFER_LEN
// characters to prevent really long labels from overriding the data display.
const int availableSpace = MAX(CMS_DRAW_BUFFER_LEN, rightMenuColumn - labelLength - leftMenuColumn - 1);
if (IS_PRINTVALUE(*flags)) {
drawText = true;
ticker->state = 0;
ticker->loopCounter = 0;
if (displayLength > availableSpace) { // table entry text is longer than the available space so start the ticker
SET_SCROLLINGTICKER(*flags);
} else {
CLR_SCROLLINGTICKER(*flags);
}
} else if (IS_SCROLLINGTICKER(*flags)) {
ticker->loopCounter++;
const uint8_t loopLimit = (ticker->state == 0 || ticker->state == (displayLength - availableSpace)) ? LOOKUP_TABLE_TICKER_START_CYCLES : LOOKUP_TABLE_TICKER_SCROLL_CYCLES;
if (ticker->loopCounter >= loopLimit) {
ticker->loopCounter = 0;
drawText = true;
ticker->state++;
if (ticker->state > (displayLength - availableSpace)) {
ticker->state = 0;
}
}
}
if (drawText) {
strncpy(tableBuff, (char *)(str + ticker->state), CMS_TABLE_VALUE_MAX_LEN);
cnt = cmsDrawMenuItemValue(pDisplay, tableBuff, row, availableSpace);
}
CLR_PRINTVALUE(*flags);
}
break;
@ -691,9 +735,9 @@ static void cmsDrawMenu(displayPort_t *pDisplay, uint32_t currentTimeUs)
// XXX Polled values at latter positions in the list may not be
// XXX printed if not enough room in the middle of the list.
if (IS_PRINTVALUE(runtimeEntryFlags[i])) {
if (IS_PRINTVALUE(runtimeEntryFlags[i]) || IS_SCROLLINGTICKER(runtimeEntryFlags[i])) {
bool selectedRow = i == currentCtx.cursorRow;
room -= cmsDrawMenuEntry(pDisplay, p, top + i * linesPerMenuItem, selectedRow, &runtimeEntryFlags[i]);
room -= cmsDrawMenuEntry(pDisplay, p, top + i * linesPerMenuItem, selectedRow, &runtimeEntryFlags[i], &runtimeTableTicker[i]);
if (room < 30) {
return;
}

5
src/main/cms/cms_types.h
View file

@ -71,6 +71,7 @@ typedef struct
#define DYNAMIC 0x04 // Value should be updated dynamically
#define OPTSTRING 0x08 // (Temporary) Flag for OME_Submenu, indicating func should be called to get a string to display.
#define REBOOT_REQUIRED 0x10 // Reboot is required if the value is changed
#define SCROLLING_TICKER 0x20// Long values are displayed as horizontally scrolling tickers (OME_TAB only)
#define IS_PRINTVALUE(x) ((x) & PRINT_VALUE)
#define SET_PRINTVALUE(x) do { (x) |= PRINT_VALUE; } while (0)
@ -82,6 +83,10 @@ typedef struct
#define IS_DYNAMIC(p) ((p)->flags & DYNAMIC)
#define IS_SCROLLINGTICKER(x) ((x) & SCROLLING_TICKER)
#define SET_SCROLLINGTICKER(x) do { (x) |= SCROLLING_TICKER; } while (0)
#define CLR_SCROLLINGTICKER(x) do { (x) &= ~SCROLLING_TICKER; } while (0)
typedef const void *(*CMSMenuFuncPtr)(displayPort_t *pDisp);
// Special return value(s) for function chaining by CMSMenuFuncPtr