Add AUTOHD option

iNavFlight · Nov 14, 2024 · fbc33e0 · fbc33e0
1 parent f100947
commit fbc33e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/main/drivers/osd.h b/src/main/drivers/osd.h
@@ -50,7 +50,8 @@ typedef enum {
     VIDEO_SYSTEM_DJIWTF,
     VIDEO_SYSTEM_AVATAR,
     VIDEO_SYSTEM_DJICOMPAT,
-    VIDEO_SYSTEM_DJICOMPAT_HD
+    VIDEO_SYSTEM_DJICOMPAT_HD,
+    VIDEO_SYSTEM_AUTOHD
 } videoSystem_e;
 
 typedef enum {

diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c
@@ -2060,7 +2060,7 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src)
 #ifdef USE_MSP_DISPLAYPORT
 	case MSP_SET_OSD_CANVAS:
 		{
-            if (osdConfig()->video_system == VIDEO_SYSTEM_AUTO) {
+            if (osdConfig()->video_system == VIDEO_SYSTEM_AUTOHD) {
                 displayPort_t *dp = osdGetDisplayPort();
                 if (dp != NULL && dataSize == 2) {
                     dp->cols = constrain(sbufReadU8(src), 30, MSP_DISPLAYPORT_MAX_COLS);
@@ -2073,8 +2073,6 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src)
 		break;
 #endif
 
-
-
     case MSP2_INAV_SET_MISC:
         if (dataSize == 41) {
             sbufReadU16(src);       // midrc

diff --git a/src/main/fc/settings.yaml b/src/main/fc/settings.yaml
@@ -67,7 +67,7 @@ tables:
     values: ["MAH", "WH"]
     enum: osd_stats_energy_unit_e
   - name: osd_video_system
-    values: ["AUTO", "PAL", "NTSC", "HDZERO", "DJIWTF", "AVATAR", "BF43COMPAT", "BFHDCOMPAT"]
+    values: ["AUTO", "PAL", "NTSC", "HDZERO", "DJIWTF", "AVATAR", "BF43COMPAT", "BFHDCOMPAT", "AUTOHD"]
     enum: videoSystem_e
   - name: osd_telemetry
     values: ["OFF", "ON","TEST"]

diff --git a/src/main/io/displayport_msp_osd.c b/src/main/io/displayport_msp_osd.c
@@ -444,6 +444,7 @@ displayPort_t* mspOsdDisplayPortInit(const videoSystem_e videoSystem)
 {
     if (mspOsdSerialInit()) {
         switch(videoSystem) {
+        case VIDEO_SYSTEM_AUTO:
         case VIDEO_SYSTEM_DJICOMPAT:
         case VIDEO_SYSTEM_PAL:
             currentOsdMode = SD_3016;
@@ -460,7 +461,7 @@ displayPort_t* mspOsdDisplayPortInit(const videoSystem_e videoSystem)
             screenRows = HDZERO_ROWS;
             screenCols = HDZERO_COLS;
             break;
-        case VIDEO_SYSTEM_AUTO:
+        case VIDEO_SYSTEM_AUTOHD:
         case VIDEO_SYSTEM_DJIWTF:
             currentOsdMode = HD_6022;
             screenRows = DJI_ROWS;