|
@@ -67,7 +67,7 @@ float _outCur_2 = 0;
|
|
|
|
|
|
|
|
|
|
|
|
-float maxChargingVol[2] = { 5000, 9500 };
|
|
|
+float maxChargingVol[2] = { 9500, 9500 };
|
|
|
|
|
|
float maxChargingCur[2] = { 5000, 2000 };
|
|
|
float maxChargingPow = 0;
|
|
@@ -2267,8 +2267,20 @@ void CANReceiver()
|
|
|
break;
|
|
|
case ACK_GET_OUTPUT_REQ: {
|
|
|
_chargingData[targetGun]->EvBatterySoc = frame.data[1];
|
|
|
+
|
|
|
+
|
|
|
_chargingData[targetGun]->EvBatterytargetVoltage = (float)((frame.data[3] << 8) + frame.data[2]) / 10;
|
|
|
+ if (_chargingData[targetGun]->EvBatterytargetVoltage > maxChargingVol[targetGun] * 0.1) {
|
|
|
+ _chargingData[targetGun]->EvBatterytargetVoltage = maxChargingVol[targetGun] * 0.1;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
_chargingData[targetGun]->EvBatterytargetCurrent = (float)((frame.data[5] << 8) + frame.data[4]) / 10;
|
|
|
+ if (_chargingData[targetGun]->EvBatterytargetCurrent > maxChargingCur[targetGun] * 0.1) {
|
|
|
+ _chargingData[targetGun]->EvBatterytargetCurrent = maxChargingCur[targetGun] * 0.1;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
_chargingData[targetGun]->RemainChargingDuration = ((short) frame.data[7] << 8) + (short) frame.data[6];
|
|
|
|
|
|
if (_chargingData[targetGun]->Type == _Type_Chademo) {
|