modding HDZero PR #755 to revert to 5bit compatible OSD element positioning. (#958)

* HDZero - 5bit backward compatible OSD positioning
* hdzero - 30hz OSD and dont periodically force-advertise fc-variant
* hdzero - comment out unused code
* hdzero - unneeded comma
* hdzero - stupid alignment

Author: nerdCopter

src/main/drivers/display_font_metadata.h

@@ -10,11 +10,11 @@ typedef struct displayFontMetadata_s {
     uint16_t charCount;
 } displayFontMetadata_t;
 
-// 'I', 'N', 'A', 'V'
-#define FONT_CHR_IS_METADATA(chr) ((chr)->data[0] == 'I' && \
-    (chr)->data[1] == 'N' && \
-    (chr)->data[2] == 'A' && \
-    (chr)->data[3] == 'V')
+// 'E', 'M', 'U', 'F'
+#define FONT_CHR_IS_METADATA(chr) ((chr)->data[0] == 'E' && \
+    (chr)->data[1] == 'M' && \
+    (chr)->data[2] == 'U' && \
+    (chr)->data[3] == 'F')
 
 #define FONT_METADATA_CHR_INDEX 255
 // Used for runtime detection of display drivers that might

src/main/interface/msp_protocol.h

@@ -64,7 +64,7 @@
 // API VERSION
 
 #define API_VERSION_MAJOR                   1  // increment when major changes are made
-#define API_VERSION_MINOR                   52 // increment after a release, to set the version for all changes to go into the following release (if no changes to MSP are made between the releases, this can be reverted before the release)
+#define API_VERSION_MINOR                   53 // increment after a release, to set the version for all changes to go into the following release (if no changes to MSP are made between the releases, this can be reverted before the release)
 
 #define API_VERSION_LENGTH                  2
 

src/main/interface/settings.c

@@ -368,7 +368,7 @@ static const char * const lookupTableRescueSanityType[] = {
 
 #ifdef USE_MAX7456
 static const char * const lookupTableVideoSystem[] = {
-    "AUTO", "PAL", "NTSC", "HDZERO"
+    "AUTO", "PAL", "NTSC", "HD"
 };
 #endif // USE_MAX7456
 

src/main/io/displayport_hdzero_osd.c

@@ -56,7 +56,8 @@ FILE_COMPILE_FOR_SPEED
 #define MSP_WRITE_STRING 3
 #define MSP_DRAW_SCREEN 4
 #define MSP_SET_OPTIONS 5
-#define DRAW_FREQ_DENOM 4 // 60Hz
+//#define DRAW_FREQ_DENOM 4 // 60Hz
+#define DRAW_FREQ_DENOM 8 // 30Hz
 #define TX_BUFFER_SIZE 1024
 #define VTX_TIMEOUT 1000 // 1 second timer
 
@@ -279,25 +280,27 @@ static uint32_t txBytesFree(const displayPort_t *displayPort)
     return mspSerialTxBytesFree();
 }
 
-static bool getFontMetadata(displayFontMetadata_t *metadata, const displayPort_t *displayPort)
-{
-    UNUSED(displayPort);
-    metadata->charCount = 512;
-    metadata->version = FONT_VERSION;
-    return true;
-}
+//Commented out as compiler reports unused.
+//static bool getFontMetadata(displayFontMetadata_t *metadata, const displayPort_t *displayPort)
+//{
+//    UNUSED(displayPort);
+//    metadata->charCount = 512;
+//    metadata->version = FONT_VERSION;
+//    return true;
+//}
 
 static bool isTransferInProgress(const displayPort_t *displayPort)
 {
     UNUSED(displayPort);
     return false;
 }
 
-static bool isReady(displayPort_t *displayPort)
-{
-    UNUSED(displayPort);
-    return vtxActive;
-}
+//Commented out as compiler reports unused.
+//static bool isReady(displayPort_t *displayPort)
+//{
+//    UNUSED(displayPort);
+//    return vtxActive;
+//}
 
 static int grab(displayPort_t *displayPort)
 {
@@ -383,15 +386,18 @@ static mspResult_e hdZeroProcessMspCommand(mspPacket_t *cmd, mspPacket_t *reply,
     vtxSeen = vtxActive = true;
     vtxHeartbeat = millis();
 
-    sbuf_t *dst = &reply->buf;
+    //Commented out as compiler reports unused.
+    //sbuf_t *dst = &reply->buf;
 
     const uint8_t cmdMSP = cmd->cmd;
     reply->cmd = cmd->cmd;
-    if (cmdMSP == MSP_FC_VARIANT) {
-        //We advertise as ARDU on this port for the prettier font
-        sbufWriteData(dst, "ARDU", FLIGHT_CONTROLLER_IDENTIFIER_LENGTH);
-        return MSP_RESULT_ACK;
-    }
+
+    //Apparently no longer required as HDZero will send the MSP/EEPROM value of "EMUF" fc_variant
+    //if (cmdMSP == MSP_FC_VARIANT) {
+    //    //We advertise as EMUF on this port for the prettier font
+    //    sbufWriteData(dst, "EMUF", FLIGHT_CONTROLLER_IDENTIFIER_LENGTH);
+    //    return MSP_RESULT_ACK;
+    //}
 
     // #define MSP_SET_VTXTABLE_BAND 227
     // #define MSP_SET_VTXTABLE_POWERLEVEL 228

src/main/io/osd.c

@@ -220,7 +220,7 @@ static const uint8_t osdElementDisplayOrder[] = {
     OSD_COMPASS_BAR
 };
 
-PG_REGISTER_WITH_RESET_FN(osdConfig_t, osdConfig, PG_OSD_CONFIG, 4);
+PG_REGISTER_WITH_RESET_FN(osdConfig_t, osdConfig, PG_OSD_CONFIG, 5);
 
 /**
  * Gets the correct altitude symbol for the current unit system
@@ -1155,7 +1155,7 @@ void osdInit(displayPort_t *osdDisplayPortToUse) {
     if (!osdDisplayPortToUse) {
         return;
     }
-    BUILD_BUG_ON(OSD_POS_MAX != OSD_POS(63, 63));
+    BUILD_BUG_ON(OSD_POS_MAX != OSD_POS(63, 31));
     osdDisplayPort = osdDisplayPortToUse;
 #ifdef USE_CMS
     cmsDisplayPortRegister(osdDisplayPort);

src/main/io/osd.h

@@ -30,14 +30,18 @@ extern const char * const osdTimerSourceNames[OSD_NUM_TIMER_TYPES];
 
 #define VISIBLE_FLAG  0x2000
 #define VISIBLE(x)    (x & VISIBLE_FLAG)
-#define OSD_POS_MAX    0xFFF
-#define OSD_POSCFG_MAX   (VISIBLE_FLAG|0xFFF) // For CLI values
+
+#define OSD_POS_MAX    0x7FF
+#define OSD_POSCFG_MAX   (VISIBLE_FLAG|0x7FF) // For CLI values
 
 // Character coordinate
-#define OSD_POSITION_BITS 6 // 6 bits gives a range 0-63
-#define OSD_POSITION_XY_MASK ((1 << OSD_POSITION_BITS) - 1)
-#define OSD_POS(x,y)  ((x & OSD_POSITION_XY_MASK) | ((y & OSD_POSITION_XY_MASK) << OSD_POSITION_BITS))
-#define OSD_X(x)      (x & OSD_POSITION_XY_MASK)
+#define OSD_POSITION_BITS       5       // 5 bits gives a range 0-31
+#define OSD_POSITION_BIT_XHD    10      // extra bit used to extend X range in a backward compatible manner for HD displays
+#define OSD_POSITION_XHD_MASK   (1 << OSD_POSITION_BIT_XHD)
+#define OSD_POSITION_XY_MASK    ((1 << OSD_POSITION_BITS) - 1)
+#define OSD_POS(x,y)  ((x & OSD_POSITION_XY_MASK) | ((x << (OSD_POSITION_BIT_XHD - OSD_POSITION_BITS)) & OSD_POSITION_XHD_MASK) | \
+                       ((y & OSD_POSITION_XY_MASK) << OSD_POSITION_BITS))
+#define OSD_X(x)      ((x & OSD_POSITION_XY_MASK) | ((x & OSD_POSITION_XHD_MASK) >> (OSD_POSITION_BIT_XHD - OSD_POSITION_BITS)))
 #define OSD_Y(x)      ((x >> OSD_POSITION_BITS) & OSD_POSITION_XY_MASK)
 
 // Timer configuration

src/main/io/serial.h

@@ -50,7 +50,7 @@ typedef enum {
     FUNCTION_VTX_TRAMP           = (1 << 13), // 8192
     FUNCTION_RCDEVICE            = (1 << 14), // 16384
     FUNCTION_LIDAR_TF            = (1 << 15), // 32768
-    FUNCTION_HDZERO_OSD          = (1 << 16), // 65536
+    FUNCTION_HDZERO_OSD          = (1 << 16)  // 65536
 } serialPortFunction_e;
 
 #define TELEMETRY_SHAREABLE_PORT_FUNCTIONS_MASK (FUNCTION_TELEMETRY_FRSKY_HUB | FUNCTION_TELEMETRY_LTM | FUNCTION_TELEMETRY_MAVLINK)