/branches/metro/v0.82a metro_Akku+/Hex-Files/Flight-Ctrl_MEGA1284p_V0_82a.hex |
---|
File deleted |
/branches/metro/v0.82a metro_Akku+/Hex-Files/Flight-Ctrl_MEGA1284p_V0_82a_S3D.hex |
---|
File deleted |
/branches/metro/v0.82a metro_Akku+/Hex-Files/Flight-Ctrl_MEGA644_V0_82a.hex |
---|
File deleted |
/branches/metro/v0.82a metro_Akku+/Hex-Files/Flight-Ctrl_MEGA644_V0_82a_S3D.hex |
---|
File deleted |
/branches/metro/v0.82a metro_Akku+/capacity.c |
---|
71,6 → 71,7 |
Capacity.UsedCapacity = 0; |
Capacity.ActualPower = 0; |
Capacity.MinOfMaxPWM = 0; |
Capacity.RemainCapacity = (EE_Parameter.UserParam1*100); |
update_timer = SetDelay(CAPACITY_UPDATE_INTERVAL); |
} |
138,6 → 139,10 |
{ |
Capacity.UsedCapacity++; // we have one mAh more |
SubCounter -= SUB_COUNTER_LIMIT; // keep the remaining sub part |
Capacity.RemainCapacity=(EE_Parameter.UserParam1*100)-Capacity.UsedCapacity; //Added by metro |
if((Capacity.RemainCapacity<=500)&&(Capacity.RemainCapacity%100==0)&&(EE_Parameter.UserParam1!=0)) beeptime = 10000; |
} |
} // EOF check delay update timer |
} |
/branches/metro/v0.82a metro_Akku+/capacity.h |
---|
5,7 → 5,8 |
{ |
unsigned short ActualCurrent; // in 0.1A Steps |
unsigned short ActualPower; // in 0.1W |
unsigned short UsedCapacity; // in mAh |
signed short UsedCapacity; // in mAh //Modified by metro |
signed short RemainCapacity; // in mAh //Added by metro |
unsigned char MinOfMaxPWM; // BL Power Limit |
} __attribute__((packed)) Capacity_t; |
/branches/metro/v0.82a metro_Akku+/fc.c |
---|
57,6 → 57,21 |
#include "mymath.h" |
#include "isqrt.h" |
//MartinW; added vars |
unsigned char loop1, loop2, loop3; |
unsigned char settingdest = 5; |
int keynumber=-7; |
unsigned short CurrentOffset = 0;/// |
unsigned char pos1, pos2, pos3, pos4=0; |
unsigned char Motors0,Motors1,Motors2,Motors3,Motors4,Motors5,Motors6,Motors7; |
unsigned char Motors0max,Motors1max,Motors2max,Motors3max,Motors4max,Motors5max,Motors6max,Motors7max; |
unsigned short MotorsTmax; |
unsigned char updatemotors=5; |
//MartinW; added vars |
unsigned char h,m,s; |
unsigned int BaroExpandActive = 0; |
int MesswertNick,MesswertRoll,MesswertGier,MesswertGierBias, RohMesswertNick,RohMesswertRoll; |
187,7 → 202,7 |
DebugOut.Analog[15] = Motor[3].SetPoint; |
DebugOut.Analog[20] = ServoNickValue; |
DebugOut.Analog[22] = Capacity.ActualCurrent; |
DebugOut.Analog[23] = Capacity.UsedCapacity; |
DebugOut.Analog[23] = Capacity.RemainCapacity; |
// DebugOut.Analog[22] = FromNaviCtrl_Value.GpsZ; |
// DebugOut.Analog[29] = FromNaviCtrl_Value.SerialDataOkay; |
DebugOut.Analog[29] = Capacity.MinOfMaxPWM; |
368,7 → 383,7 |
static signed long tmpl,tmpl2,tmpl3,tmpl4; |
static signed int oldNick, oldRoll, d2Roll, d2Nick; |
signed long winkel_nick, winkel_roll; |
unsigned char i; |
// unsigned char i; |
MesswertGier = (signed int) AdNeutralGier - AdWertGier; |
MesswertNick = (signed int) AdWertNickFilter / 8; |
MesswertRoll = (signed int) AdWertRollFilter / 8; |
/branches/metro/v0.82a metro_Akku+/flight.pnproj |
---|
1,0 → 0,0 |
<Project name="Flight-Ctrl"><File path="uart.h"></File><File path="jeti.h"></File><File path="main.c"></File><File path="main.h"></File><File path="makefile"></File><File path="uart.c"></File><File path="printf_P.h"></File><File path="timer0.c"></File><File path="timer0.h"></File><File path="old_macros.h"></File><File path="twimaster.c"></File><File path="version.txt"></File><File path="twimaster.h"></File><File path="rc.c"></File><File path="rc.h"></File><File path="fc.h"></File><File path="menu.h"></File><File path="menu.c"></File><File path="_Settings.h"></File><File path="analog.c"></File><File path="analog.h"></File><File path="GPS.c"></File><File path="gps.h"></File><File path="License.txt"></File><File path="spi.h"></File><File path="spi.c"></File><File path="led.h"></File><File path="led.c"></File><File path="fc.c"></File><File path="mymath.c"></File><File path="mymath.h"></File><File path="isqrt.S"></File><File path="Spektrum.c"></File><File path="Spektrum.h"></File><File path="eeprom.h"></File><File path="eeprom.c"></File><File path="libfc.h"></File><File path="debug.c"></File><File path="debug.h"></File></Project> |
<Project name="Flight-Ctrl"><File path="analog.c"></File><File path="analog.h"></File><File path="capacity.c"></File><File path="capacity.h"></File><File path="debug.c"></File><File path="debug.h"></File><File path="eeprom.c"></File><File path="eeprom.h"></File><File path="fc.c"></File><File path="fc.h"></File><File path="GPS.c"></File><File path="gps.h"></File><File path="isqrt.h"></File><File path="isqrt.S"></File><File path="jetimenu.c"></File><File path="jetimenu.h"></File><File path="led.c"></File><File path="led.h"></File><File path="libfc.h"></File><File path="main.c"></File><File path="main.h"></File><File path="makefile"></File><File path="menu.c"></File><File path="menu.h"></File><File path="mymath.c"></File><File path="mymath.h"></File><File path="old_macros.h"></File><File path="printf_P.h"></File><File path="rc.c"></File><File path="rc.h"></File><File path="Settings.h"></File><File path="Spektrum.c"></File><File path="Spektrum.h"></File><File path="spi.c"></File><File path="spi.h"></File><File path="timer0.c"></File><File path="timer0.h"></File><File path="twimaster.c"></File><File path="twimaster.h"></File><File path="uart.c"></File><File path="uart.h"></File></Project> |
/branches/metro/v0.82a metro_Akku+/jetimenu.c |
---|
32,7 → 32,7 |
JetiBox_printfxy(6,0,"Status"); |
} |
if(NC_ErrorCode) JetiBox_printfxy(6,0,"ERROR: %2d",NC_ErrorCode); |
JetiBox_printfxy(0,1,"%4i %2i:%02i",Capacity.UsedCapacity,FlugSekunden/60,FlugSekunden%60); |
JetiBox_printfxy(0,1,"%4i %2i:%02i",Capacity.RemainCapacity,FlugSekunden/60,FlugSekunden%60); |
if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG) |
{ |
JetiBox_printfxy(10,1,"%4im%c", (int16_t)(HoehenWert/100),VarioCharacter); |
59,7 → 59,7 |
void Menu_Battery(uint8_t key) |
{ //0123456789ABCDEF |
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); |
JetiBox_printfxy(0,1,"%4iW %6imAh",Capacity.ActualPower, Capacity.RemainCapacity); |
} |
/branches/metro/v0.82a metro_Akku+/main.c |
---|
51,6 → 51,7 |
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
#include "main.h" |
//MartinW MaxSize is 63488 bytes |
unsigned char PlatinenVersion = 10; |
unsigned char SendVersionToNavi = 1; |
153,13 → 154,12 |
ADC_Init(); |
I2C_Init(1); |
SPI_MasterInit(); |
Capacity_Init(); |
LIBFC_Init(); |
GRN_ON; |
sei(); |
ParamSet_Init(); |
Capacity_Init(); //Moved by metro |
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
// + Check connected BL-Ctrls |
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
359,7 → 359,7 |
FromNaviCtrl.CompassValue = -1; |
NaviDataOkay = 0; |
} |
if(UBat < BattLowVoltageWarning) |
if((UBat < BattLowVoltageWarning)||((Capacity.RemainCapacity<=0)&&(EE_Parameter.UserParam1!=0))) //Modified by metro |
{ |
FC_StatusFlags |= FC_STATUS_LOWBAT; |
if(BeepMuster == 0xffff) |
/branches/metro/v0.82a metro_Akku+/makefile |
---|
7,6 → 7,7 |
VERSION_MAJOR = 0 |
VERSION_MINOR = 82 |
VERSION_PATCH = 0 |
NAMEEXT = akku001 |
VERSION_SERIAL_MAJOR = 11 # Serial Protocol |
VERSION_SERIAL_MINOR = 0 # Serial Protocol |
NC_SPI_COMPATIBLE = 16 # Navi-Kompatibilität |
42,22 → 43,22 |
# Target file name (without extension). |
ifeq ($(VERSION_PATCH), 0) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)a_SVN$(REV) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)a_SVN$(REV)_$(NAMEEXT) |
endif |
ifeq ($(VERSION_PATCH), 1) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)b_SVN$(REV) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)b_SVN$(REV)_$(NAMEEXT) |
endif |
ifeq ($(VERSION_PATCH), 2) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)c_SVN$(REV) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)c_SVN$(REV)_$(NAMEEXT) |
endif |
ifeq ($(VERSION_PATCH), 3) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)d_SVN$(REV) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)d_SVN$(REV)_$(NAMEEXT) |
endif |
ifeq ($(VERSION_PATCH), 4) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)e_SVN$(REV) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)e_SVN$(REV)_$(NAMEEXT) |
endif |
ifeq ($(VERSION_PATCH), 5) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)f_SVN$(REV) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)f_SVN$(REV)_$(NAMEEXT) |
endif |
ifeq ($(VERSION_PATCH), 6) |
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)g_SVN$(REV) |