Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Changed to smooth transitions everywhere.

Browse source
This commit is contained in:
mikeller 2019-01-24 02:16:03 +13:00
parent c74e1f0df1
commit 4503dffab0
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/main/io/osd.c
View file

@ -109,17 +109,16 @@
// Stick overlay size // Stick overlay size
#define OSD_STICK_OVERLAY_WIDTH 7 #define OSD_STICK_OVERLAY_WIDTH 7
#define OSD_STICK_OVERLAY_HEIGHT 5 #define OSD_STICK_OVERLAY_HEIGHT 5
#define OSD_STICK_OVERLAY_CHARACTER_HEIGHT 3
#define OSD_STICK_OVERLAY_VERTICAL_POSITIONS (OSD_STICK_OVERLAY_HEIGHT * OSD_STICK_OVERLAY_CHARACTER_HEIGHT)
#define STICK_OVERLAY_HORIZONTAL_CHAR '-' #define STICK_OVERLAY_HORIZONTAL_CHAR '-'
#define STICK_OVERLAY_VERTICAL_CHAR '|' #define STICK_OVERLAY_VERTICAL_CHAR '|'
#define STICK_OVERLAY_CROSS_CHAR '+' #define STICK_OVERLAY_CROSS_CHAR '+'
#define STICK_OVERLAY_CURSOR_CHAR 0x84
#define STICK_OVERLAY_CURSOR_LOW_CHAR 0x86 #define STICK_OVERLAY_CURSOR_LOW_CHAR 0x86
#define STICK_OVERLAY_CURSOR_MID_CHAR 0x84
#define STICK_OVERLAY_CURSOR_HIGH_CHAR 0x82 #define STICK_OVERLAY_CURSOR_HIGH_CHAR 0x82
#define OSD_STICK_OVERLAY_VERT_MID_ROW ((OSD_STICK_OVERLAY_HEIGHT - 1) / 2)
#define OSD_STICK_OVERLAY_VERT_ROW_HEIGHT ((PWM_RANGE_MAX - PWM_RANGE_MIN) / OSD_STICK_OVERLAY_HEIGHT)
const char * const osdTimerSourceNames[] = { const char * const osdTimerSourceNames[] = {
"ON TIME ", "ON TIME ",
"TOTAL ARM", "TOTAL ARM",
@ -1345,21 +1344,29 @@ static void osdDrawStickOverlayCursor(osd_items_e osd_item)
} }
const uint8_t x_pos = constrain(scaleRange(rcData[horizontal_channel], PWM_RANGE_MIN, PWM_RANGE_MAX, 0, OSD_STICK_OVERLAY_WIDTH), 0, OSD_STICK_OVERLAY_WIDTH - 1); const uint8_t x_pos = constrain(scaleRange(rcData[horizontal_channel], PWM_RANGE_MIN, PWM_RANGE_MAX, 0, OSD_STICK_OVERLAY_WIDTH), 0, OSD_STICK_OVERLAY_WIDTH - 1);
const uint8_t y_pos = OSD_STICK_OVERLAY_HEIGHT - 1 - constrain(scaleRange(rcData[vertical_channel], PWM_RANGE_MIN, PWM_RANGE_MAX, 0, OSD_STICK_OVERLAY_HEIGHT), 0, OSD_STICK_OVERLAY_HEIGHT - 1); const uint8_t y_pos = OSD_STICK_OVERLAY_VERTICAL_POSITIONS - 1 - constrain(scaleRange(rcData[vertical_channel], PWM_RANGE_MIN, PWM_RANGE_MAX, 0, OSD_STICK_OVERLAY_VERTICAL_POSITIONS), 0, OSD_STICK_OVERLAY_VERTICAL_POSITIONS - 1);
char cursor; char cursor;
if (y_pos != OSD_STICK_OVERLAY_VERT_MID_ROW) { switch (y_pos % OSD_STICK_OVERLAY_CHARACTER_HEIGHT) {
const uint16_t yPosInRow = (constrain(rcData[vertical_channel], PWM_RANGE_MIN, PWM_RANGE_MAX) - PWM_RANGE_MIN) % OSD_STICK_OVERLAY_VERT_ROW_HEIGHT; case 2:
if (yPosInRow < OSD_STICK_OVERLAY_VERT_ROW_HEIGHT / 2 && rcData[vertical_channel] < PWM_RANGE_MAX) { if (rcData[vertical_channel] < PWM_RANGE_MAX) {
cursor = STICK_OVERLAY_CURSOR_LOW_CHAR; cursor = STICK_OVERLAY_CURSOR_LOW_CHAR;
} else {
cursor = STICK_OVERLAY_CURSOR_HIGH_CHAR; break;
} }
} else {
cursor = STICK_OVERLAY_CURSOR_CHAR; FALLTHROUGH;
case 0:
cursor = STICK_OVERLAY_CURSOR_HIGH_CHAR;
break;
case 1:
cursor = STICK_OVERLAY_CURSOR_MID_CHAR;
break;
} }
osdDrawStickOverlayPos(osd_item, x_pos, y_pos, cursor); osdDrawStickOverlayPos(osd_item, x_pos, y_pos / OSD_STICK_OVERLAY_CHARACTER_HEIGHT, cursor);
} }
#endif #endif