/trunk/capacity.c |
---|
70,7 → 70,7 |
{ |
Capacity.ActualCurrent = 0; |
Capacity.UsedCapacity = 0; |
Capacity.ActualPower = 0; |
update_timer = SetDelay(CAPACITY_UPDATE_INTERVAL); |
} |
120,7 → 120,8 |
// update actual Current |
Capacity.ActualCurrent = Current; |
// update actual Power |
Capacity.ActualPower = (UBat * Current) / 10; // in 0.1W |
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; |
/trunk/jetimenu.c |
---|
45,8 → 45,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); |
} |
void Menu_PosInfo(uint8_t key) |
/trunk/main.c |
---|
335,7 → 335,7 |
printf("\n\rUsing parameterset %d", GetActiveParamSetNumber()); |
if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG) |
//if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG) |
{ |
printf("\n\rCalibrating pressure sensor.."); |
timer = SetDelay(1000); |
367,7 → 367,7 |
//SpektrumBinding(); |
timer = SetDelay(2000); |
timerPolling = SetDelay(250); |
while (1) |
{ |
459,13 → 459,13 |
SPI_StartTransmitPacket(); |
SendSPI = 4; |
if(!MotorenEin) timer2 = 1450; // 0,5 Minuten aufrunden |
else |
else |
if(++second == 49) |
{ |
second = 0; |
FlugSekunden++; |
} |
if(++timer2 == 2930) // eine Minute |
{ |
timer2 = 0; |
/trunk/menu.c |
---|
117,7 → 117,7 |
case 7: |
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: |