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

Review changes

Browse source
This commit is contained in:
Bas Delfos 2017-05-04 20:37:04 +02:00
parent 37e2b8be24
commit 5499e08bf0
1 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -483,39 +483,33 @@ static void osdDrawSingleElement(uint8_t item)
case OSD_MAIN_BATT_USAGE: case OSD_MAIN_BATT_USAGE:
{ {
//Set length of indicator bar //Set length of indicator bar
uint8_t progressSteps = 10; #define MAIN_BATT_USAGE_STEPS 10
//Calculate constrained value //Calculate constrained value
float value = constrain(osdConfig()->cap_alarm - getMAhDrawn(), 0, osdConfig()->cap_alarm); float value = constrain(batteryConfig()->batteryCapacity - getMAhDrawn(), 0, batteryConfig()->batteryCapacity);
//Calculate mAh used progress //Calculate mAh used progress
uint8_t mAhUsedProgress = ceil((value / (osdConfig()->cap_alarm / progressSteps))); uint8_t mAhUsedProgress = ceil((value / (batteryConfig()->batteryCapacity / MAIN_BATT_USAGE_STEPS)));
//Create empty battery indicator bar //Create empty battery indicator bar
buff[0] = SYM_PB_START; buff[0] = SYM_PB_START;
for(uint8_t i = 1; i <= progressSteps; i++) for(uint8_t i = 1; i <= MAIN_BATT_USAGE_STEPS; i++) {
{ if (i <= mAhUsedProgress)
buff[i] = SYM_PB_EMPTY; buff[i] = SYM_PB_FULL;
else
buff[i] = SYM_PB_EMPTY;
} }
buff[progressSteps+1] = SYM_PB_CLOSE; buff[MAIN_BATT_USAGE_STEPS+1] = SYM_PB_CLOSE;
//Fill indicator bar progress if (mAhUsedProgress > 0 && mAhUsedProgress < MAIN_BATT_USAGE_STEPS) {
for(uint8_t i = 1; i <= mAhUsedProgress; i++)
{
buff[i] = SYM_PB_FULL;
}
if (mAhUsedProgress > 0 && mAhUsedProgress < progressSteps)
{
buff[1+mAhUsedProgress] = SYM_PB_END; buff[1+mAhUsedProgress] = SYM_PB_END;
} }
buff[progressSteps+2] = 0; buff[MAIN_BATT_USAGE_STEPS+2] = 0;
break; break;
} }
default: default:
return; return;
} }
@ -706,13 +700,11 @@ void osdUpdateAlarms(void)
else else
CLR_BLINK(OSD_FLYTIME); CLR_BLINK(OSD_FLYTIME);
if (getMAhDrawn() >= osdConfig()->cap_alarm) if (getMAhDrawn() >= osdConfig()->cap_alarm) {
{
SET_BLINK(OSD_MAH_DRAWN); SET_BLINK(OSD_MAH_DRAWN);
SET_BLINK(OSD_MAIN_BATT_USAGE); SET_BLINK(OSD_MAIN_BATT_USAGE);
} }
else else {
{
CLR_BLINK(OSD_MAH_DRAWN); CLR_BLINK(OSD_MAH_DRAWN);
CLR_BLINK(OSD_MAIN_BATT_USAGE); CLR_BLINK(OSD_MAIN_BATT_USAGE);
} }