From ebc98f03cfb0abc9e8d84f6ed6f73eef60dba1f0 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Sat, 17 Feb 2024 12:48:22 -0600 Subject: [PATCH] 20240217 fix merge conflict OSD 0x0800 (#961) fix merge conflict for Analog OSD VISIBLE_FLAG 0x0800 --- src/main/io/osd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/io/osd.h b/src/main/io/osd.h index 02e01c14c2..886a3080d6 100644 --- a/src/main/io/osd.h +++ b/src/main/io/osd.h @@ -28,7 +28,7 @@ extern const char * const osdTimerSourceNames[OSD_NUM_TIMER_TYPES]; #define OSD_ELEMENT_BUFFER_LENGTH 32 -#define VISIBLE_FLAG 0x2000 +#define VISIBLE_FLAG 0x0800 #define VISIBLE(x) (x & VISIBLE_FLAG) #define OSD_POS_MAX 0x7FF