Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1526 → Rev 1527

/beta/Code Redesign killagreg/capacity.c
53,6 → 53,7
#include "capacity.h"
#include "twimaster.h"
#include "timer0.h"
#include "analog.h"
 
#define CAPACITY_UPDATE_INTERVAL 10 // 10 ms
#define FC_OFFSET_CURRENT 5 // calculate with a current of 0.5A
118,6 → 119,7
 
// update actual Current
Capacity.ActualCurrent = Current;
Capacity.ActualPower = (UBat * Current) / 10; // in 0.1W
 
// update used capacity
SubCounter += Current;
/beta/Code Redesign killagreg/capacity.h
7,6 → 7,7
{
uint16_t ActualCurrent; // in 0.1A Steps
uint16_t UsedCapacity; // in mAh
uint16_t ActualPower; // in 0.1W Steps
} __attribute__((packed)) Capacity_t;
 
extern Capacity_t Capacity;
/beta/Code Redesign killagreg/menu.c
188,10 → 188,10
LCD_printfxy(0,2,"Roll %4i(%3i)",AdValueAccRoll/2, AdBiasAccRoll/2); // factor 2 because of adding 2 samples in ADC ISR
LCD_printfxy(0,3,"Z %4i(%3i)",AdValueAccTop, AdBiasAccTop);
break;
case 7://Discharge
LCD_printfxy(0,0,"Battery");
LCD_printfxy(0,1,"Voltage: %3i.%1iV",UBat/10, UBat%10);
LCD_printfxy(0,2,"Current: %3i.%1iA",Capacity.ActualCurrent/10, Capacity.ActualCurrent%10);
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,3,"Discharge: %5imAh", Capacity.UsedCapacity);
break;
case 8:// Remote Control