forked from achamaikin/CCSModuleSW30Web
stable beta version
This commit is contained in:
@@ -114,8 +114,8 @@ typedef struct {
|
|||||||
uint16_t measuredChargingVoltage;
|
uint16_t measuredChargingVoltage;
|
||||||
uint16_t measuredChargingCurrent;
|
uint16_t measuredChargingCurrent;
|
||||||
uint16_t highestVoltageOfBatteryCell;
|
uint16_t highestVoltageOfBatteryCell;
|
||||||
uint8_t groupNrOfCellWithHighestVoltage;
|
//uint8_t groupNrOfCellWithHighestVoltage;
|
||||||
uint16_t currentChargeState;
|
uint8_t currentChargeState;
|
||||||
uint16_t estimatedRemainingChargingTime;
|
uint16_t estimatedRemainingChargingTime;
|
||||||
|
|
||||||
}GBT_BCS_t;
|
}GBT_BCS_t;
|
||||||
|
|||||||
@@ -299,8 +299,12 @@ void GBT_ChargerTask(){
|
|||||||
//GBT_ChargerCurrentStatus.chargingPermissible = 0b1111111111111100;//NOT PERMITTED
|
//GBT_ChargerCurrentStatus.chargingPermissible = 0b1111111111111100;//NOT PERMITTED
|
||||||
GBT_ChargerCurrentStatus.chargingPermissible = 0b1111111111111101;
|
GBT_ChargerCurrentStatus.chargingPermissible = 0b1111111111111101;
|
||||||
GBT_ChargerCurrentStatus.chargingTime = (get_Current_Time() - GBT_TimeChargingStarted)/60;
|
GBT_ChargerCurrentStatus.chargingTime = (get_Current_Time() - GBT_TimeChargingStarted)/60;
|
||||||
GBT_ChargerCurrentStatus.outputCurrent = 4000 - GBT_EDCAN_Output.requestedCurrent;
|
// GBT_ChargerCurrentStatus.outputCurrent = 4000 - GBT_EDCAN_Output.requestedCurrent;
|
||||||
GBT_ChargerCurrentStatus.outputVoltage = GBT_EDCAN_Output.requestedVoltage;
|
// GBT_ChargerCurrentStatus.outputVoltage = GBT_EDCAN_Output.requestedVoltage;
|
||||||
|
GBT_ChargerCurrentStatus.outputCurrent = 4000 - GBT_EDCAN_Input.measuredCurrent;
|
||||||
|
GBT_ChargerCurrentStatus.outputVoltage = GBT_EDCAN_Input.measuredVoltage;
|
||||||
|
GBT_EDCAN_Output.chargingElapsedTimeMin = (get_Current_Time() - GBT_TimeChargingStarted)/60;
|
||||||
|
GBT_EDCAN_Output.chargingElapsedTimeSec = (get_Current_Time() - GBT_TimeChargingStarted)%60;
|
||||||
|
|
||||||
if(j_rx.state == 0) GBT_SendCCS();
|
if(j_rx.state == 0) GBT_SendCCS();
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
charger_gbt.c:61:6:GBT_Init 1
|
charger_gbt.c:61:6:GBT_Init 1
|
||||||
charger_gbt.c:70:6:GBT_ChargerTask 69
|
charger_gbt.c:70:6:GBT_ChargerTask 69
|
||||||
charger_gbt.c:357:6:GBT_SwitchState 14
|
charger_gbt.c:361:6:GBT_SwitchState 14
|
||||||
charger_gbt.c:381:10:GBT_StateTick 1
|
charger_gbt.c:385:10:GBT_StateTick 1
|
||||||
charger_gbt.c:385:6:GBT_Delay 1
|
charger_gbt.c:389:6:GBT_Delay 1
|
||||||
charger_gbt.c:389:6:GBT_Stop 2
|
charger_gbt.c:393:6:GBT_Stop 2
|
||||||
charger_gbt.c:394:6:GBT_Error 1
|
charger_gbt.c:398:6:GBT_Error 1
|
||||||
charger_gbt.c:399:6:GBT_ForceStop 1
|
charger_gbt.c:403:6:GBT_ForceStop 1
|
||||||
charger_gbt.c:406:6:GBT_Reset 1
|
charger_gbt.c:410:6:GBT_Reset 1
|
||||||
charger_gbt.c:427:6:GBT_Start 1
|
charger_gbt.c:431:6:GBT_Start 1
|
||||||
|
|||||||
37732
Debug/GbTModuleSW.list
37732
Debug/GbTModuleSW.list
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user