2022-06-16 / Simon Xue

Action:
1. [Fix] IP Address parsing error
2. [Mod] Gun voltage and current information log.

Files
As the following commit history files

Image Version:2.08.XX.XXXX.XX

EVSE/Projects/DD360UCar/Apps/CSU/Ethernet.c

@@ -98,7 +98,7 @@ static int isReachableInternet(void)
         while (fgets(buf, sizeof(buf), fp) != NULL) {
             if (strstr(buf, "inet addr:") > 0) {
                 sscanf(buf, "%*s%s", tmp);
-                substr(tmp, tmp, strspn(tmp, "addr:"), strlen(buf) - strspn(tmp, "addr:"));
+                substr(tmp, tmp, strspn(tmp, "addr:"), strlen(tmp) - strspn(tmp, "addr:"));
 
                 if (strcmp(tmp, (char *)pSysConfig->Eth0Interface.EthIpAddress) != EQUAL) {
                     strcpy((char *) pSysConfig->Eth0Interface.EthIpAddress, tmp);

EVSE/Projects/DD360UCar/Apps/CSU/main.c

@@ -82,8 +82,8 @@ uint8_t bd0_2_status = 0;
 uint8_t bd1_1_status = 0;
 uint8_t bd1_2_status = 0;
 
-char *fwVersion = "V2.07.00.0000.00"; // Phihong version
-char* DebugVersion = "V2.07.04";      // Software debug version
+char *fwVersion = "V2.08.00.0000.00"; // Phihong version
+char* DebugVersion = "V2.08.00";      // Software debug version
 //sqlite3 *localDb;
 bool isDb_ready;
 
@@ -4009,14 +4009,12 @@ int main(void)
              pSysInfo->SelfTestSeq,
              ShmPsuData->Work_Step);
 
-    if (pSysInfo->SelfTestSeq == _STEST_FAIL ||
-            ShmPsuData->Work_Step == _NO_WORKING ||
-            pInfoCode->InfoEvents.bits.CcsSeccTimeoutQCA7000Comm == YES //DS60-120 add
-       ) {
-            for (gunIndex = 0; gunIndex < pSysConfig->TotalConnectorCount; gunIndex++) {
+    if (pSysInfo->SelfTestSeq == _STEST_FAIL ||ShmPsuData->Work_Step == _NO_WORKING ||
+        pInfoCode->InfoEvents.bits.CcsSeccTimeoutQCA7000Comm == YES ) {
+        ChangeLcmByIndex(_LCM_MAINTAIN);
+        for (gunIndex = 0; gunIndex < pSysConfig->TotalConnectorCount; gunIndex++) {
             setChargerMode(gunIndex, MODE_MAINTAIN);
         }
-        ChangeLcmByIndex(_LCM_MAINTAIN);
     } else {
         for (gunIndex = 0; gunIndex < pSysConfig->TotalConnectorCount; gunIndex++) {
             setChargerMode(gunIndex, MODE_IDLE);

EVSE/Projects/DD360UCar/Apps/ModuleDoComm/DoComm.c

@@ -2321,7 +2321,6 @@ static int CheckNetworkStatus(void)
 {
     char *ipAddr = (char *)&pSysConfig->Eth0Interface.EthIpAddress;
 
-    //printf("Check network IP Header = %s\n", ipAddr);
     if (strstr(ipAddr, CMP_ETH_IP_HEAD) != NULL) {
         return 1;
     }

EVSE/Projects/DD360UCar/Apps/ModuleEvComm/Module_EvRxComm.c

@@ -34,6 +34,8 @@ uint8_t TempArray_2[TempArraySize]={0};
 uint8_t ptemp_1 = 0;
 uint8_t ptemp_2 = 0;
 bool firstcircule = true;
+float EvTargetVolt[2] = { 0 };
+float EvTargetCur[2] = { 0 };
 
 //------------------------------------------------------------------------------
 extern bool AbnormalStopAnalysis(uint8_t gun_index, uint8_t *errCode);
@@ -565,7 +567,15 @@ void CANReceiver(int fd)
                         }
                     }
                 }
-
+                if (pDcChargingInfo->EvBatterytargetVoltage > (EvTargetVolt[targetGun] + 3) ||
+                    pDcChargingInfo->EvBatterytargetVoltage < (EvTargetVolt[targetGun] - 3) ||
+                    pDcChargingInfo->EvBatterytargetCurrent >(EvTargetCur[targetGun] + 1) ||
+                    pDcChargingInfo->EvBatterytargetCurrent < (EvTargetCur[targetGun] - 1)) {
+                    log_info("Gun%d Battery TargetVoltage = %.1f , TargetCurrent = %.1f",
+                        targetGun, pDcChargingInfo->EvBatterytargetVoltage, pDcChargingInfo->EvBatterytargetCurrent);
+                    EvTargetVolt[targetGun] = pDcChargingInfo->EvBatterytargetVoltage;
+                    EvTargetCur[targetGun] = pDcChargingInfo->EvBatterytargetCurrent;
+                }
                 //log_info("EvBatterytargetVoltage = %f ", pDcChargingInfo->EvBatterytargetVoltage);
                 //log_info("EvBatterytargetCurrent = %f ", pDcChargingInfo->EvBatterytargetCurrent);
                 //log_info("BatteryVoltage = %d ",

EVSE/Projects/DD360UCar/Apps/ModuleEvComm/Module_EvTxComm.c

@@ -396,25 +396,27 @@ static void SetPresentChargingOutputCap(void)
 
     //DS60-120 add
     if ((LogInfo[0][EV_LOG_OUTPUT_CAP_POW] <= pow1 - 5 ||
-            LogInfo[0][EV_LOG_OUTPUT_CAP_POW] >= pow1 + 5) ||
-            (LogInfo[0][EV_LOG_OUTPUT_CAP_CUR] <= cur1 - 5 ||
-             LogInfo[0][EV_LOG_OUTPUT_CAP_CUR] >= cur1 + 5) ||
-            (LogInfo[1][EV_LOG_OUTPUT_CAP_POW] <= pow2 - 5 ||
-             LogInfo[1][EV_LOG_OUTPUT_CAP_POW] >= pow2 + 5) ||
-            (LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] <= cur2 - 5 ||
-             LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] >= cur2 + 5)
-       ) {
-        //log_info("----------------------------------------------------- ");
-        log_info("To EV (Real) Power_1 = %.1f, Cur_1 = %.1f, Power_2 = %.1f, Cur_2 = %.1f",
-                 pow1 / 10, cur1 / 10, pow2 / 10, cur2 / 10);
-        //log_info("----------------------------------------------------- ");
-
+        LogInfo[0][EV_LOG_OUTPUT_CAP_POW] >= pow1 + 5) ||
+        (LogInfo[0][EV_LOG_OUTPUT_CAP_CUR] <= cur1 - 5 ||
+            LogInfo[0][EV_LOG_OUTPUT_CAP_CUR] >= cur1 + 5)
+        ) {
+        log_info("Gun0 To EV Power_1 = %3.1fkW, Cur_1 = %3.1fA", pow1 / 10, cur1 / 10);
         LogInfo[0][EV_LOG_OUTPUT_CAP_POW] = pow1;
         LogInfo[0][EV_LOG_OUTPUT_CAP_CUR] = cur1;
-        LogInfo[1][EV_LOG_OUTPUT_CAP_POW] = pow2;
-        LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] = cur2;
         chargingData_1->RealMaxCurrent = cur1;
         chargingData_1->RealMaxPower = pow1;
+    }
+
+    if ((LogInfo[1][EV_LOG_OUTPUT_CAP_POW] <= pow2 - 5 ||
+        LogInfo[1][EV_LOG_OUTPUT_CAP_POW] >= pow2 + 5) ||
+        (LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] <= cur2 - 5 ||
+        LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] >= cur2 + 5)
+       ) {
+        log_info("Gun1 To EV Power_2 = %3.1fkW, Cur_2 = %3.1fA", pow2 / 10, cur2 / 10);
+
+        LogInfo[1][EV_LOG_OUTPUT_CAP_POW] = pow2;
+        LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] = cur2;
+
 
         if (pSysConfig->TotalConnectorCount == 2) {
             chargingData_2->RealMaxCurrent = cur2;
@@ -538,22 +540,27 @@ static void SetPresentChargingOutputPower(void)
 
     //DS60-120 add
     if ((LogInfo[0][EV_LOG_NOW_OUTPUT_VOL] >= vol1 + CHK_VOL_RANGE) ||
-            (LogInfo[0][EV_LOG_NOW_OUTPUT_VOL] <= vol1 - CHK_VOL_RANGE) ||
-            (LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] >= cur1 + CHK_CUR_RANGE) ||
-            (LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] <= cur1 - CHK_CUR_RANGE) ||
-            (LogInfo[1][EV_LOG_NOW_OUTPUT_VOL] >= vol2 + CHK_VOL_RANGE) ||
-            (LogInfo[1][EV_LOG_NOW_OUTPUT_VOL] <= vol2 - CHK_VOL_RANGE) ||
-            (LogInfo[1][EV_LOG_NOW_OUTPUT_CUR] >= cur2 + CHK_CUR_RANGE) ||
-            (LogInfo[1][EV_LOG_NOW_OUTPUT_CUR] <= cur2 - CHK_CUR_RANGE)
-       ) {
-        log_info("G1-> Vol=%.1f, Cur=%.1f - G2-> Vol = %.1f, Cur = %.1f",
-            vol1 / 10,
-            cur1 / 10,
-            vol2 / 10,
-            cur2 / 10);
+        (LogInfo[0][EV_LOG_NOW_OUTPUT_VOL] <= vol1 - CHK_VOL_RANGE) ||
+        (LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] >= cur1 + CHK_CUR_RANGE) ||
+        (LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] <= cur1 - CHK_CUR_RANGE)) {
+
+        log_info("Gun0 Set Output Voltage=%3.1fV, Cur=%3.1fA",
+                vol1 / 10,
+                cur1 / 10);
 
         LogInfo[0][EV_LOG_NOW_OUTPUT_VOL] = vol1;
         LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] = cur1;
+    }
+
+    if ((LogInfo[1][EV_LOG_NOW_OUTPUT_VOL] >= vol2 + CHK_VOL_RANGE) ||
+        (LogInfo[1][EV_LOG_NOW_OUTPUT_VOL] <= vol2 - CHK_VOL_RANGE) ||
+        (LogInfo[1][EV_LOG_NOW_OUTPUT_CUR] >= cur2 + CHK_CUR_RANGE) ||
+        (LogInfo[1][EV_LOG_NOW_OUTPUT_CUR] <= cur2 - CHK_CUR_RANGE)) {
+
+        log_info("Gun1 Set Output Voltage=%3.1fV, Cur=%3.1fA",
+                vol2 / 10,
+                cur2 / 10);
+
         LogInfo[1][EV_LOG_NOW_OUTPUT_VOL] = vol2;
         LogInfo[1][EV_LOG_NOW_OUTPUT_CUR] = cur2;
     }