Merge remote-tracking branch 'origin/DO360'

EVSE/Projects/DO360/Apps/main.c

@@ -112,6 +112,7 @@
 #define     CONTACTOR_AUTO_ON_TIME      60
 #define     CONTACTOR_AUTO_OFF_TIME     300
 #define     WAIT_DISPENSER_STOP_TIMEOUT 3               // unit: second
+#define     STARTTRANSATION_TIME        1
 
 char 	*valid_Internet[2] 	  = {"8.8.8.8", "180.76.76.76"};
 unsigned char mask_table[] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 };
@@ -219,6 +220,9 @@ unsigned short GetTotalParallelCabinetPower(void);
 void MCabinetParallelingProcess(void);
 void SCabinetControllProcess(void);
 
+bool Is_WebServer_Alive(void);
+void Run_WebServer_Service(void);
+
 bool Get_Ocpp_ConnectionStatus(void);
 void Run_Ocpp_Service(void);
 bool Is_Ocpp_Task_Alive(void);
@@ -425,7 +429,7 @@ bool isModelNameMatch = true;
 //char* rfidPortName = "/dev/ttyS2";
 #if ENABLE_PCBA_TEST == 0
 char* fwVersion = "V2.03.00.0000.00";
-char* subVersion = "01";
+char* subVersion = "03";
 #else
 char* fwVersion = "PCBA.00.04";
 char* subVersion = "00";
@@ -3206,6 +3210,21 @@ int CheckTimeOut(char *start)
     return result;
 }
 
+
+bool Is_WebServer_Alive(void)
+{
+    if(system("pidof -s lighttpd > /dev/null") != 0)
+    {
+        return false;
+    }
+    return true;
+}
+
+void Run_WebServer_Service(void)
+{
+    system("/root/web.sh");
+}
+
 //===============================================
 // Ocpp_Service
 //===============================================
@@ -5869,8 +5888,11 @@ char CheckUpdateProcess()
                                     retFail++;
                                 }
                                 LOG_INFO("Upgrade %s", isPass == PASS ? "Success" : "Fail");
-                                sleep(3);
-                                isPass = Upgrade_UART(uartFd, Type, UPGRADE_DORC2, new_str, (char *)ShmSysConfigAndInfo->SysConfig.ModelName);
+                                if(ShmChargerInfo->Control.SysCtrl.bits.SecondRelayBoardEnable)
+                                {
+                                    sleep(3);
+                                    isPass = Upgrade_UART(uartFd, Type, UPGRADE_DORC2, new_str, (char *)ShmSysConfigAndInfo->SysConfig.ModelName);
+                                }
                             }
                             else
                             {
@@ -6620,7 +6642,7 @@ void RunningCostHandler(void)
         if(strlen((char *)strCost) > 0)
         {
             if(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.SystemStatus >= S_REASSIGN_CHECK &&
-                ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.SystemStatus <= S_ALARM)
+                ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.SystemStatus <= S_CHARGING)
             {
                 RunningCostParsing(i, strCost);
             }
@@ -7484,6 +7506,11 @@ void UpdateChargingTimestamp(char *timestamp)
 
 void OcppStartTransaction(byte gunIndex)
 {
+    if(_triggerTransaction[gunIndex])
+    {
+        return;
+    }
+
     // clean deduct info
     Clean_DeductInfo(gunIndex);
     // set deduct user id
@@ -8870,6 +8897,12 @@ void CheckTask()
         system ("/root/Module_InternalComm &");
         //ShmChargerInfo->Control.SysCtrl.bits.NeedSoftReset = true;
     }
+
+    if(!Is_WebServer_Alive())
+    {
+        LOG_ERROR("lighttpd not running, restart it.");
+        Run_WebServer_Service();
+    }
 }
 
 void InitialDHCP()
@@ -10491,6 +10524,16 @@ int main(void)
                         GetClockTime(&_ConnectorAuthorizing_Time[gun_index]);
                     }
 
+                    if(!_triggerTransaction[gun_index] &&
+                        ShmChargerInfo->Control.CustomerCode == _CUSTOMER_CODE_TCC &&
+                        ShmSysConfigAndInfo->SysInfo.ConnectorInfo[gun_index].AuthInfo.AuthType == _AuthType_RemoteStart)
+                    {
+                        if(GetTimeoutValue(_ConnectorAuthorizing_Time[gun_index]) / uSEC_VAL >= STARTTRANSATION_TIME)
+                        {
+                            OcppStartTransaction(gun_index);
+                        }
+                    }
+
                     if(GetTimeoutValue(_ConnectorAuthorizing_Time[gun_index]) / uSEC_VAL >= FORCE_BALANCE_TIME)
                     {
                         FouceAnnounceAccountBalance(gun_index);
@@ -10523,6 +10566,7 @@ int main(void)
                         {
                             LOG_INFO("*********** Gun %d Preparing State Timeout ***********", gun_index + 1);
                         }
+                        OcppStopTransaction(gun_index);
                         setChargerMode(gun_index, MODE_IDLE);
                     }
                     else
@@ -10541,11 +10585,13 @@ int main(void)
                             ShmSysConfigAndInfo->SysInfo.ConnectorInfo[gun_index].Parameter.bits.NeedCleanAuthorizeInfo = false;
 
                             LOG_INFO("*********** Gun %d User Stop Plug In ***********", gun_index + 1);
+                            OcppStopTransaction(gun_index);
                             setChargerMode(gun_index, MODE_IDLE);
                         }
                         else if(isEvBoardStopChargeFlag(gun_index) == YES)
                         {
                             LOG_INFO("********** Gun %d Alarm Stop (S_AUTHORIZING) **********", gun_index + 1);
+                            OcppStopTransaction(gun_index);
                             setChargerMode(gun_index, MODE_IDLE);
                         }
                     }