Skip to content

Commit ebc98f0

Browse files
authored
20240217 fix merge conflict OSD 0x0800 (emuflight#961)
fix merge conflict for Analog OSD VISIBLE_FLAG 0x0800
1 parent 3335565 commit ebc98f0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/main/io/osd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extern const char * const osdTimerSourceNames[OSD_NUM_TIMER_TYPES];
2828

2929
#define OSD_ELEMENT_BUFFER_LENGTH 32
3030

31-
#define VISIBLE_FLAG 0x2000
31+
#define VISIBLE_FLAG 0x0800
3232
#define VISIBLE(x) (x & VISIBLE_FLAG)
3333

3434
#define OSD_POS_MAX 0x7FF

0 commit comments

Comments
 (0)