| /branches/metro/v0.82a metro_Akku+/Hex-Files/Flight-Ctrl_MEGA644_V0_82a_SVN1828_akku003.hex |
|---|
| File deleted |
| /branches/metro/v0.82a metro_Akku+/capacity.c |
|---|
| 139,20 → 139,8 |
| { |
| Capacity.UsedCapacity++; // we have one mAh more |
| SubCounter -= SUB_COUNTER_LIMIT; // keep the remaining sub part |
| //Added by metro |
| Capacity.RemainCapacity=(EE_Parameter.UserParam1*100)-Capacity.UsedCapacity; |
| if((Capacity.RemainCapacity<=0)&&(Capacity.RemainCapacity%100==0)&&(EE_Parameter.UserParam1!=0)) |
| { |
| FC_StatusFlags |= FC_STATUS_LOWBAT; |
| if(BeepMuster == 0xffff) |
| { |
| beeptime = (abs(Capacity.RemainCapacity/100)+1)*2000; |
| BeepMuster = 0x0400; |
| } |
| } |
| else if(!beeptime) FC_StatusFlags &= ~FC_STATUS_LOWBAT; |
| //End Added by metro |
| 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; |
| } |
| /branches/metro/v0.82a metro_Akku+/capacity.h |
|---|
| 5,7 → 5,7 |
| { |
| 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 |
|---|
| 202,8 → 202,7 |
| DebugOut.Analog[15] = Motor[3].SetPoint; |
| DebugOut.Analog[20] = ServoNickValue; |
| DebugOut.Analog[22] = Capacity.ActualCurrent; |
| DebugOut.Analog[23] = Capacity.UsedCapacity; |
| DebugOut.Analog[24] = Capacity.RemainCapacity; |
| DebugOut.Analog[23] = Capacity.RemainCapacity; |
| // DebugOut.Analog[22] = FromNaviCtrl_Value.GpsZ; |
| // DebugOut.Analog[29] = FromNaviCtrl_Value.SerialDataOkay; |
| DebugOut.Analog[29] = Capacity.MinOfMaxPWM; |
| /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); |
| /branches/metro/v0.82a metro_Akku+/main.c |
|---|
| 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,7 → 7,7 |
| VERSION_MAJOR = 0 |
| VERSION_MINOR = 82 |
| VERSION_PATCH = 0 |
| NAMEEXT = akku003 |
| NAMEEXT = akku002 |
| VERSION_SERIAL_MAJOR = 11 # Serial Protocol |
| VERSION_SERIAL_MINOR = 0 # Serial Protocol |
| NC_SPI_COMPATIBLE = 16 # Navi-Kompatibilität |
| /branches/metro/v0.82a metro_Akku+/spi.c |
|---|
| 185,7 → 185,7 |
| case SPI_FCCMD_ACCU: |
| ToNaviCtrl.Param.Int[0] = Capacity.ActualCurrent; // 0.1A |
| ToNaviCtrl.Param.Int[1] = Capacity.UsedCapacity; // mAh |
| ToNaviCtrl.Param.Int[1] = Capacity.RemainCapacity; // mAh |
| ToNaviCtrl.Param.Byte[4] = (unsigned char) UBat; // 0.1V |
| ToNaviCtrl.Param.Byte[5] = (unsigned char) BattLowVoltageWarning; //0.1V |
| break; |
| /branches/metro/v0.82a metro_Akku+/uart.c |
|---|
| 104,7 → 104,7 |
| "Hovergas ", |
| "Current [0.1A] ", |
| "Capacity [mAh] ", |
| "RemainCap[mAh] ", |
| "24 ", |
| "25 ", //25 |
| "26 ", |
| "27 ", |
| /branches/metro/v0.82a metro_Akku+/version.txt |
|---|
| 439,22 → 439,11 |
| - Waypont-Events z.B. zum Triggern der Kamera |
| - Gyro-Sytbility: Werte bis 16 möglich |
| Beitrag im Forum http://forum.mikrokopter.de/topic-post266941.html |
| 9.1.2011 metro |
| 9.1.2011 Akku001 metro |
| - UserParameter1 gibt die Akkukapazität in 100mAh schritten an. Achtung: Reserve einrechnen. |
| - Im Jeti Menü und im MK-Tool wird nun die verbleibende Kapazität angezeigt. Bei UserParm=0 geht der Wert ins Negative. |
| - Unter 500mAh Pipt die FC zudem immer wenn 100mAh verbraucht sind. |
| - Bei 0mAh kommt die AkkuWarnung. |
| 11.1.2011 Akku002 metro |
| - Verbleibende Kapazität wird auch an NC weitergereicht |
| 18.1.2011 Akku003 metro |
| -Änderungen gemäss http://forum.mikrokopter.de/topic-post266824.html#post266824 |