VIDEO_SYSTEM_AUTO will negotiate canvas size

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

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c
@@ -2060,14 +2060,16 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src)
 #ifdef USE_MSP_DISPLAYPORT
 	case MSP_SET_OSD_CANVAS:
 		{
-			displayPort_t *dp = osdGetDisplayPort();
-			if(dp != NULL && dataSize == 2) {
-				dp->cols = constrain(sbufReadU8(src), 30, MSP_DISPLAYPORT_MAX_COLS);
-				dp->rows = constrain(sbufReadU8(src), 16, MSP_DISPLAYPORT_MAX_ROWS);
-			} else {
-				return MSP_RESULT_ERROR;
-			}
-		}
+            if (osdConfig()->video_system == VIDEO_SYSTEM_AUTO) {
+                displayPort_t *dp = osdGetDisplayPort();
+                if (dp != NULL && dataSize == 2) {
+                    dp->cols = constrain(sbufReadU8(src), 30, MSP_DISPLAYPORT_MAX_COLS);
+                    dp->rows = constrain(sbufReadU8(src), 16, MSP_DISPLAYPORT_MAX_ROWS);
+                } else {
+                    return MSP_RESULT_ERROR;
+                }
+            }
+        }
 		break;
 #endif
 

diff --git a/src/main/io/displayport_msp_osd.c b/src/main/io/displayport_msp_osd.c
@@ -444,7 +444,6 @@ 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;
@@ -461,6 +460,7 @@ displayPort_t* mspOsdDisplayPortInit(const videoSystem_e videoSystem)
             screenRows = HDZERO_ROWS;
             screenCols = HDZERO_COLS;
             break;
+        case VIDEO_SYSTEM_AUTO:
         case VIDEO_SYSTEM_DJIWTF:
             currentOsdMode = HD_6022;
             screenRows = DJI_ROWS;