Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00
Code Issues Wiki Activity

OSD - fix macro arguments (#14074)

Browse source
This commit is contained in:
Petr Ledvina 2024-12-09 15:52:30 +01:00 • committed by GitHub
parent 8ef734408f
commit 663427b303
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/osd/osd.h
View file

@ -74,11 +74,13 @@ extern const char * const osdTimerSourceNames[OSD_NUM_TIMER_TYPES];
#define OSD_POSITION_XHD_MASK (1 << OSD_POSITION_BIT_XHD) #define OSD_POSITION_XHD_MASK (1 << OSD_POSITION_BIT_XHD)
#define OSD_POSITION_XY_MASK ((1 << OSD_POSITION_BITS) - 1) #define OSD_POSITION_XY_MASK ((1 << OSD_POSITION_BITS) - 1)
#define OSD_TYPE_MASK 0xC000 // bits 14-15 #define OSD_TYPE_MASK 0xC000 // bits 14-15
#define OSD_POS(x,y) ((x & OSD_POSITION_XY_MASK) | ((x << (OSD_POSITION_BIT_XHD - OSD_POSITION_BITS)) & OSD_POSITION_XHD_MASK) | \ #define OSD_POS(x, y) (((x) & OSD_POSITION_XY_MASK) \
((y & OSD_POSITION_XY_MASK) << OSD_POSITION_BITS)) | (((x) << (OSD_POSITION_BIT_XHD - OSD_POSITION_BITS)) & OSD_POSITION_XHD_MASK) \
#define OSD_X(x) ((x & OSD_POSITION_XY_MASK) | ((x & OSD_POSITION_XHD_MASK) >> (OSD_POSITION_BIT_XHD - OSD_POSITION_BITS))) | (((y) & OSD_POSITION_XY_MASK) << OSD_POSITION_BITS)) \
#define OSD_Y(x) ((x >> OSD_POSITION_BITS) & OSD_POSITION_XY_MASK) /**/
#define OSD_TYPE(x) ((x & OSD_TYPE_MASK) >> 14) #define OSD_X(x) (((x) & OSD_POSITION_XY_MASK) | (((x) & OSD_POSITION_XHD_MASK) >> (OSD_POSITION_BIT_XHD - OSD_POSITION_BITS)))
#define OSD_Y(x) (((x) >> OSD_POSITION_BITS) & OSD_POSITION_XY_MASK)
#define OSD_TYPE(x) (((x) & OSD_TYPE_MASK) >> 14)
#define OSD_SD_COLS VIDEO_COLUMNS_SD #define OSD_SD_COLS VIDEO_COLUMNS_SD
#define OSD_SD_ROWS VIDEO_LINES_PAL #define OSD_SD_ROWS VIDEO_LINES_PAL