Merge remote-tracking branch 'origin/DD360UCar'

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.04.00.0000.00"; // Phihong version
-char* DebugVersion = "v2.04.03";      // Software debug version
+char *fwVersion = "V2.05.00.0000.00"; // Phihong version
+char* DebugVersion = "v2.05.00";      // Software debug version
 //sqlite3 *localDb;
 bool isDb_ready;
 

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

@@ -323,8 +323,11 @@ void CANReceiver(int fd)
             memset(&frame, 0, sizeof(struct can_frame));
 
             for (_index = 0; _index < pSysConfig->TotalConnectorCount; _index++) {
+                pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(_index);
                 // 檢查是否有收到EV小板訊號
-                if ((time((time_t*)NULL) - ShmDcCommonData->EVDisconnectTime[_index]) > 3 && !ShmDcCommonData->EVDisconnectFlag[_index]) {
+                if ((time((time_t*)NULL) - ShmDcCommonData->EVDisconnectTime[_index]) > 3 &&
+                    !ShmDcCommonData->EVDisconnectFlag[_index] && 
+                    pDcChargingInfo->SystemStatus != S_UPDATE) {
                     ShmDcCommonData->EVDisconnectTime[_index] = time((time_t*)NULL);
                     ShmDcCommonData->EVDisconnectFlag[_index] = TRUE;
                     log_error("Lost ev board %d can bus data!!!!", _index);

EVSE/Projects/DD360UCar/Apps/ModuleInternalComm/RelayBoard.c

@@ -1215,6 +1215,7 @@ static void SetFanModuleSpeed(void)
         }
 
         //log_info("_setFanSpeed = %d \n", _setFanSpeed);
+        //log_info("ShmFanModuleData->SetFan1Speed = %d \n", ShmFanModuleData->SetFan1Speed);
         _fanSpeed.speed[0] = _setFanSpeed;
 
         _fanSpeed.speed[1] = _setFanSpeed;

EVSE/Projects/DD360UCar/Apps/ModulePrimary/Module_PrimaryComm.c

@@ -214,8 +214,6 @@ static void checkChillerStatus(Gpio_out *gpio)
         {
             pChillerInfo->ChillerSwitch = YES;
             pChillerInfo->ChillerOnTime = time((time_t *)NULL);
-            if (chillerCount >= 2)
-                ShmFanModuleData->SetFan1Speed = 7000;
         }
         else
         {
@@ -264,6 +262,9 @@ static void checkChillerStatus(Gpio_out *gpio)
         if(pChillerInfo->ChillerSwitch == YES)
         {
             _chillerNeedOn = YES;
+            if (chillerCount >= 2) {
+                ShmFanModuleData->SetFan1Speed = 7000;
+            }
         }
     }
 

EVSE/Projects/DD360UCar/Apps/ReadCmdline.c

@@ -722,6 +722,7 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
     }
 
     //kill ev task
+    ShmDcCommonData->DebugFlag = 1;
     system("killall Module_EvComm");
 
     pSysInfo->CurGunSelected = _GunIndex;
@@ -730,7 +731,7 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
 
         curGun = pSysInfo->CurGunSelected;
         pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(curGun);
-
+        
         //fix gun 1
         switch (pDcChargingInfo->SystemStatus) {
         case S_IDLE:
@@ -944,9 +945,10 @@ void RunUnconditionalChargeIndex1(char *v1, char *v2, char *v3)
             pDcChargingInfo->PresentChargingPower = 0;
 
             if (stopChg == pSysConfig->TotalConnectorCount) {
+                
                 system("/root/Module_EvComm &");
                 sleep(3);
-
+                ShmDcCommonData->DebugFlag = 0;
                 for (_GunIndex = 0; _GunIndex < pSysConfig->TotalConnectorCount; _GunIndex++) {
                     pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(_GunIndex);