Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1529 → Rev 1530

/beta/Code Redesign killagreg/capacity.c
68,7 → 68,7
{
Capacity.ActualCurrent = 0;
Capacity.UsedCapacity = 0;
 
Capacity.ActualPower = 0;
update_timer = SetDelay(CAPACITY_UPDATE_INTERVAL);
}
 
119,7 → 119,9
 
// update actual Current
Capacity.ActualCurrent = Current;
Capacity.ActualPower = (UBat * Current) / 10; // in 0.1W
// update actual Power
if(Current < 255) Capacity.ActualPower = (UBat * Current) / 100; // in W higher resolution
else Capacity.ActualPower = (UBat * (Current/4)) / 25; // in W
 
// update used capacity
SubCounter += Current;
/beta/Code Redesign killagreg/jetimenu.c
52,8 → 52,8
 
void Menu_Battery(uint8_t key)
{ //0123456789ABCDEF
JetiBox_printfxy(0,0," [V] [A] [mAh]");
JetiBox_printfxy(0,1,"%2i.%1i %2i.%1i %6i",UBat/10, UBat%10, Capacity.ActualCurrent/10, Capacity.ActualCurrent%10, Capacity.UsedCapacity);
JetiBox_printfxy(0,0,"%2i.%1iV %3i.%1iA", UBat/10, UBat%10, Capacity.ActualCurrent/10, Capacity.ActualCurrent%10);
JetiBox_printfxy(0,1,"%4iW %6imAh",Capacity.ActualPower, Capacity.UsedCapacity);
}
 
 
/beta/Code Redesign killagreg/main.c
244,7 → 244,7
timer = SetDelay(500);
while(!CheckDelay(timer));
 
if(ParamSet.Config0 & CFG0_AIRPRESS_SENSOR)
//if(ParamSet.Config0 & CFG0_AIRPRESS_SENSOR)
{
printf("\n\rCalibrating air pressure sensor.");
timer = SetDelay(1000);
/beta/Code Redesign killagreg/menu.c
191,7 → 191,7
case 7://Battery State
LCD_printfxy(0,0,"Voltage: %3i.%1iV",UBat/10, UBat%10);
LCD_printfxy(0,1,"Current: %3i.%1iA",Capacity.ActualCurrent/10, Capacity.ActualCurrent%10);
LCD_printfxy(0,2,"Power: %3i.%1iW",Capacity.ActualPower/10, Capacity.ActualPower%10);
LCD_printfxy(0,2,"Power: %4iW",Capacity.ActualPower);
LCD_printfxy(0,3,"Discharge: %5imAh", Capacity.UsedCapacity);
break;
case 8:// Remote Control