New FF.CFG option osd-display-order=, analagous to LCD/OLED display-order=

Author: keirf

examples/FF.CFG

@@ -218,7 +218,7 @@ oled-font = 6x13
 # Values: 0 <= N <= 255
 oled-contrast = 143
 
-# Text height and arrangement on LCD/OLED
+# Text height and arrangement on LCD/OLED and on OSD, respectively.
 # 'default', or a comma-separated list (one entry per LCD/OLED row, top down).
 # Each list item is a digit plus optional height specifier: <content-row>[d]
 #  content-row: '0-3' = specified content row, '7' = blank
@@ -230,6 +230,7 @@ oled-contrast = 143
 # 'default' depends on display, eg.: oled-128x32='0,1' ; oled-128x64='3,0d,1'
 # Values: [0-7][d] | default
 display-order = default
+osd-display-order = default
 
 # Turn an LCD or OLED display off after N seconds of inactivity
 # N=0: always off; N=255: always on

inc/config.h

@@ -164,6 +164,7 @@ struct packed ff_cfg {
 #define WDRAIN_eot      2
     uint8_t write_drain;
     uint8_t max_cyl;
+    uint16_t osd_display_order;
 };
 
 extern struct ff_cfg ff_cfg;

scripts/mk_config.py

@@ -46,7 +46,7 @@ def main(argv):
                     else:
                         opts += ['DISPLAY_' + x]
                 val = '|'.join(opts)
-            elif opt == "display-order":
+            elif opt == "display-order" or opt == "osd-display-order":
                 if val == "default":
                     val = "DORD_" + val
                 else:

src/display/lcd_at32f435.c

@@ -219,20 +219,39 @@ static unsigned int osd_prep_buffer(void)
     uint16_t order = menu_mode ? 0x7903 : 0x7183;
     char *p;
     uint8_t *q = buffer;
-    unsigned int row;
+    unsigned int row, rows, heights;
+    int i;
 
     if (++in_osd == OSD_read) {
         memset(buffer, 0x11, sizeof(struct i2c_osd_info));
         return sizeof(struct i2c_osd_info);
     }
 
+    if ((ff_cfg.osd_display_order != DORD_default)
+        && (display_mode == DM_normal))
+        order = ff_cfg.osd_display_order;
+
+    heights = rows = 0;
+    for (i = 3; i >= 0; i--) {
+        /* Iterate over rows, bottom to top. */
+        row = order >> (i<<2);
+        /* Skip all trailing empty rows. */
+        if ((rows == 0) && ((row&7) == 7))
+            continue;
+        /* Count this row and check if it is double height. */
+        rows++;
+        heights <<= 1;
+        if (row & 8)
+            heights |= 1;
+    }
+
     *q++ = OSD_BACKLIGHT | !!_bl;
     *q++ = OSD_COLUMNS | lcd_columns;
-    *q++ = OSD_ROWS | 3;
-    *q++ = OSD_HEIGHTS | (menu_mode ? 4 : 2);
+    *q++ = OSD_ROWS | rows;
+    *q++ = OSD_HEIGHTS | heights;
     *q++ = OSD_BUTTONS | osd_buttons_tx;
     *q++ = OSD_DATA;
-    for (row = 0; row < 3; row++) {
+    for (row = 0; row < rows; row++) {
         p = text[(order >> (row * DORD_shift)) & DORD_row];
         memcpy(q, p, lcd_columns);
         q += lcd_columns;

src/display/lcd_stm32f105.c

@@ -246,21 +246,40 @@ static unsigned int osd_prep_buffer(void)
     uint16_t order = menu_mode ? 0x7903 : 0x7183;
     char *p;
     uint8_t *q = buffer;
-    unsigned int row;
+    unsigned int row, rows, heights;
+    int i;
 
     if (++in_osd == OSD_read) {
         i2c->cr2 |= I2C_CR2_LAST | I2C_CR2_ITEVTEN;
         i2c->cr1 |= I2C_CR1_ACK | I2C_CR1_START;
         return sizeof(struct i2c_osd_info);
     }
 
+    if ((ff_cfg.osd_display_order != DORD_default)
+        && (display_mode == DM_normal))
+        order = ff_cfg.osd_display_order;
+
+    heights = rows = 0;
+    for (i = 3; i >= 0; i--) {
+        /* Iterate over rows, bottom to top. */
+        row = order >> (i<<2);
+        /* Skip all trailing empty rows. */
+        if ((rows == 0) && ((row&7) == 7))
+            continue;
+        /* Count this row and check if it is double height. */
+        rows++;
+        heights <<= 1;
+        if (row & 8)
+            heights |= 1;
+    }
+
     *q++ = OSD_BACKLIGHT | !!_bl;
     *q++ = OSD_COLUMNS | lcd_columns;
-    *q++ = OSD_ROWS | 3;
-    *q++ = OSD_HEIGHTS | (menu_mode ? 4 : 2);
+    *q++ = OSD_ROWS | rows;
+    *q++ = OSD_HEIGHTS | heights;
     *q++ = OSD_BUTTONS | osd_buttons_tx;
     *q++ = OSD_DATA;
-    for (row = 0; row < 3; row++) {
+    for (row = 0; row < rows; row++) {
         p = text[(order >> (row * DORD_shift)) & DORD_row];
         memcpy(q, p, lcd_columns);
         q += lcd_columns;

src/main.c

@@ -915,6 +915,30 @@ static uint8_t parse_pin_str(const char *s)
     return pin;
 }
 
+static uint16_t parse_display_order(const char *p)
+{
+    int sh = 0;
+    uint16_t order = 0;
+
+    if (!strcmp(p, "default"))
+        return DORD_default;
+
+    while (p != NULL) {
+        order |= ((p[0]-'0')&7) << sh;
+        if (p[1] == 'd')
+            order |= DORD_double << sh;
+        sh += DORD_shift;
+        if ((p = strchr(p, ',')) == NULL)
+            break;
+        p++;
+    }
+
+    if (sh < 16)
+        order |= 0x7777 << sh;
+
+    return order;
+}
+
 static void read_ff_cfg(void)
 {
     enum {
@@ -1200,26 +1224,13 @@ static void read_ff_cfg(void)
             ff_cfg.oled_contrast = strtol(opts.arg, NULL, 10);
             break;
 
-        case FFCFG_display_order: {
-            char *p = opts.arg;
-            int sh = 0;
-            ff_cfg.display_order = DORD_default;
-            if (!strcmp(p, "default"))
-                break;
-            ff_cfg.display_order = 0;
-            while (p != NULL) {
-                ff_cfg.display_order |= ((p[0]-'0')&7) << sh;
-                if (p[1] == 'd')
-                    ff_cfg.display_order |= DORD_double << sh;
-                sh += DORD_shift;
-                if ((p = strchr(p, ',')) == NULL)
-                    break;
-                p++;
-            }
-            if (sh < 16)
-                ff_cfg.display_order |= 0x7777 << sh;
+        case FFCFG_display_order:
+            ff_cfg.display_order = parse_display_order(opts.arg);
+            break;
+
+        case FFCFG_osd_display_order:
+            ff_cfg.osd_display_order = parse_display_order(opts.arg);
             break;
-        }
 
         case FFCFG_display_off_secs:
             ff_cfg.display_off_secs = strtol(opts.arg, NULL, 10);