From 107aad5745fb2b86212822aa5b9fbed680f1a174 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:54:52 +0100 Subject: [PATCH 1/2] New video system --- src/main/drivers/osd.h | 3 ++- src/main/io/displayport_msp_osd.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/drivers/osd.h b/src/main/drivers/osd.h index a8b0bbc8e42..76b7d3c78cc 100644 --- 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_DJINEW } videoSystem_e; typedef enum { diff --git a/src/main/io/displayport_msp_osd.c b/src/main/io/displayport_msp_osd.c index 0b9be8c6d86..968ddf0e467 100644 --- a/src/main/io/displayport_msp_osd.c +++ b/src/main/io/displayport_msp_osd.c @@ -488,6 +488,7 @@ displayPort_t* mspOsdDisplayPortInit(const videoSystem_e videoSystem) break; case VIDEO_SYSTEM_DJICOMPAT_HD: case VIDEO_SYSTEM_AVATAR: + case VIDEO_SYSTEM_DJINEW: currentOsdMode = HD_5320; screenRows = AVATAR_ROWS; screenCols = AVATAR_COLS; From 5c670ae6d7f79abf8f5f022274b95651489b3137 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Fri, 1 Nov 2024 11:17:05 +0100 Subject: [PATCH 2/2] Rename new option --- src/main/drivers/osd.h | 2 +- src/main/fc/settings.yaml | 2 +- src/main/io/displayport_msp_osd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/drivers/osd.h b/src/main/drivers/osd.h index 76b7d3c78cc..a69bc5b360f 100644 --- a/src/main/drivers/osd.h +++ b/src/main/drivers/osd.h @@ -51,7 +51,7 @@ typedef enum { VIDEO_SYSTEM_AVATAR, VIDEO_SYSTEM_DJICOMPAT, VIDEO_SYSTEM_DJICOMPAT_HD, - VIDEO_SYSTEM_DJINEW + VIDEO_SYSTEM_DJI_NATIVE } videoSystem_e; typedef enum { diff --git a/src/main/fc/settings.yaml b/src/main/fc/settings.yaml index fd6073fa4bd..663926f1984 100644 --- 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", "DJI_NATIVE"] 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 index 968ddf0e467..0f7750be83e 100644 --- a/src/main/io/displayport_msp_osd.c +++ b/src/main/io/displayport_msp_osd.c @@ -488,7 +488,7 @@ displayPort_t* mspOsdDisplayPortInit(const videoSystem_e videoSystem) break; case VIDEO_SYSTEM_DJICOMPAT_HD: case VIDEO_SYSTEM_AVATAR: - case VIDEO_SYSTEM_DJINEW: + case VIDEO_SYSTEM_DJI_NATIVE: currentOsdMode = HD_5320; screenRows = AVATAR_ROWS; screenCols = AVATAR_COLS;