/branches/V0.86d_MartinW_Jeti+V0.20/capacity.c |
---|
71,7 → 71,7 |
Capacity.UsedCapacity = 0; |
Capacity.ActualPower = 0; |
Capacity.MinOfMaxPWM = 0; |
Capacity.RemainCapacity = (EE_Parameter.UserParam1*100); |
//Capacity.RemainCapacity = (EE_Parameter.UserParam1*100); |
update_timer = SetDelay(CAPACITY_UPDATE_INTERVAL); |
} |
139,9 → 139,13 |
{ |
Capacity.UsedCapacity++; // we have one mAh more |
SubCounter -= SUB_COUNTER_LIMIT; // keep the remaining sub part |
#ifdef WITH_REMAINCAPACITY // only include functions if DEBUG is defined in main.h |
#warning : "### with REMAIN CAPACITY ###" |
Capacity.RemainCapacity=(EE_Parameter.UserParam1*100)-Capacity.UsedCapacity; //Added by metro |
if((Capacity.RemainCapacity<=0)&&(Capacity.RemainCapacity%10==0)&&(EE_Parameter.UserParam1!=0)) beeptime = 1000; |
if((Capacity.RemainCapacity<=500)&&(Capacity.RemainCapacity%100==0)&&(EE_Parameter.UserParam1!=0)) beeptime = 10000; |
#endif |
} |
/branches/V0.86d_MartinW_Jeti+V0.20/capacity.h |
---|
6,7 → 6,11 |
unsigned short ActualCurrent; // in 0.1A Steps |
unsigned short ActualPower; // in 0.1W |
signed short UsedCapacity; // in mAh //Modified by metro |
#ifdef WITH_REMAINCAPACITY // only include functions if DEBUG is defined in main.h |
#warning : "### with REMAIN CAPACITY ###" |
signed short RemainCapacity; // in mAh //Added by metro |
#endif |
unsigned char MinOfMaxPWM; // BL Power Limit |
} __attribute__((packed)) Capacity_t; |
/branches/V0.86d_MartinW_Jeti+V0.20/fc.c |
---|
240,7 → 240,14 |
DebugOut.Analog[20] = ServoNickValue; |
DebugOut.Analog[22] = Capacity.ActualCurrent; |
#ifdef WITH_REMAINCAPACITY // only include functions if DEBUG is defined in main.h |
#warning : "### with REMAIN CAPACITY ###" |
DebugOut.Analog[23] = Capacity.RemainCapacity; |
#else |
DebugOut.Analog[23] = Capacity.UsedCapacity; |
#endif |
DebugOut.Analog[24] = SollHoehe/5; |
// DebugOut.Analog[22] = FromNaviCtrl_Value.GpsZ; |
// DebugOut.Analog[29] = FromNaviCtrl_Value.SerialDataOkay; |
/branches/V0.86d_MartinW_Jeti+V0.20/led.c |
---|
54,7 → 54,7 |
else |
if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing > 220)) {if(J16Bitmask & 128) J16_ON; else J16_OFF;} |
else |
if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing == 5)) {if(J16Bitmask & 128) J16_OFF; else J16_ON;} |
if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing == 5)) {if(J16Bitmask & 128) J16_OFF; else J16_ON;} // MartinW, if Led on/Off not working, trimm your R/C correctly. Not nessessary to modify J16Timing == 5 |
else |
if(!J16Blinkcount--) |
{ |
/branches/V0.86d_MartinW_Jeti+V0.20/main.h |
---|
12,7 → 12,8 |
#define WITH_JETI_SIMULATION |
#define WITH_ExternControl |
#define WITH_FULL_ANALOG_TEXT |
#define WITHSPECTRUM |
#define WITHSPECTRUM |
#define WITH_REMAINCAPACITY |
#else |
#endif |
22,9 → 23,9 |
//#define WITH_ExternControl /// MartinW; memsave |
//#define WITH_ORIGINAL_MOTORSMOOTHING /// MartinW; memsave 63312-63164 |
//#define WITH_JETI_SIMULATION /// MartinW; memsave 63312-63016 |
#define WITH_JETI_BEEP /// MartinW; 63072-63038; 63216-63050 |
//#define WITH_PANOTRIGGER /// MartinW; 64336-64112 |
//#define WITH_HOTTMENU /// Metro; |
//#define WITH_REMAINCAPACITY /// Metro; |
/branches/V0.86d_MartinW_Jeti+V0.20/makefile |
---|
1,7 → 1,7 |
#-------------------------------------------------------------------- |
# MCU name |
MCU = atmega1284p |
#MCU = atmega644p |
#MCU = atmega1284p |
MCU = atmega644p |
F_CPU = 20000000 |
#------------------------------------------------------------------- |
VERSION_MAJOR = 0 |
/branches/V0.86d_MartinW_Jeti+V0.20/version.txt |
---|
491,3 → 491,5 |
- Motortest bug removed; only one Motor at the same Time |
- Hottmenü deaktiviert. |
led |