Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-22 07:45:29 +03:00
Code Issues Wiki Activity

Simplify 'PWM_RANGE_MAX' handling.

Browse source
This commit is contained in:
mikeller 2019-01-24 17:23:11 +13:00
parent 4503dffab0
commit d8ade76fbe
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1343,19 +1343,11 @@ static void osdDrawStickOverlayCursor(osd_items_e osd_item)
horizontal_channel = radioModes[osdConfig()->overlay_radio_mode-1].right_horizontal; horizontal_channel = radioModes[osdConfig()->overlay_radio_mode-1].right_horizontal;
} }
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 = scaleRange(constrain(rcData[horizontal_channel], PWM_RANGE_MIN, PWM_RANGE_MAX - 1), PWM_RANGE_MIN, PWM_RANGE_MAX, 0, OSD_STICK_OVERLAY_WIDTH);
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); const uint8_t y_pos = OSD_STICK_OVERLAY_VERTICAL_POSITIONS - 1 - scaleRange(constrain(rcData[vertical_channel], PWM_RANGE_MIN, PWM_RANGE_MAX - 1), PWM_RANGE_MIN, PWM_RANGE_MAX, 0, OSD_STICK_OVERLAY_VERTICAL_POSITIONS);
char cursor; char cursor;
switch (y_pos % OSD_STICK_OVERLAY_CHARACTER_HEIGHT) { switch (y_pos % OSD_STICK_OVERLAY_CHARACTER_HEIGHT) {
case 2:
if (rcData[vertical_channel] < PWM_RANGE_MAX) {
cursor = STICK_OVERLAY_CURSOR_LOW_CHAR;
break;
}
FALLTHROUGH;
case 0: case 0:
cursor = STICK_OVERLAY_CURSOR_HIGH_CHAR; cursor = STICK_OVERLAY_CURSOR_HIGH_CHAR;
@ -1363,6 +1355,10 @@ static void osdDrawStickOverlayCursor(osd_items_e osd_item)
case 1: case 1:
cursor = STICK_OVERLAY_CURSOR_MID_CHAR; cursor = STICK_OVERLAY_CURSOR_MID_CHAR;
break;
case 2:
cursor = STICK_OVERLAY_CURSOR_LOW_CHAR;
break; break;
} }