|
@@ -3005,8 +3005,12 @@ void GetMaxVolAndCurMethod(byte index, float *vol, float *cur)
|
|
|
if (maxChargingCur[index] != 0 && maxChargingCur[index] <= *cur)
|
|
|
*cur = maxChargingCur[index];
|
|
|
|
|
|
- if (_chargingData[index]->ChargingProfileCurrent != 0 && _chargingData[index]->ChargingProfileCurrent <= *cur)
|
|
|
+ if (_chargingData[index]->SystemStatus == S_CHARGING &&
|
|
|
+ _chargingData[index]->ChargingProfileCurrent >= 0 &&
|
|
|
+ _chargingData[index]->ChargingProfileCurrent <= *cur)
|
|
|
+ {
|
|
|
*cur = _chargingData[index]->ChargingProfileCurrent;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
void GetMaxPowerMethod(byte index, float *pow)
|
|
@@ -3014,8 +3018,12 @@ void GetMaxPowerMethod(byte index, float *pow)
|
|
|
if (maxChargingPow != 0 && maxChargingPow <= *pow)
|
|
|
*pow = maxChargingPow;
|
|
|
|
|
|
- if (_chargingData[index]->ChargingProfilePower != 0 && _chargingData[index]->ChargingProfilePower <= *pow)
|
|
|
+ if (_chargingData[index]->SystemStatus == S_CHARGING &&
|
|
|
+ _chargingData[index]->ChargingProfilePower >= 0 &&
|
|
|
+ _chargingData[index]->ChargingProfilePower <= *pow)
|
|
|
+ {
|
|
|
*pow = _chargingData[index]->ChargingProfilePower;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
time_t GetRtcInfoForEpoch()
|