Merge branch 'DO360'

EVSE/Projects/DO360/Apps/main.c

@@ -150,6 +150,7 @@ void _SelfTestTimeout(void);
 void CheckConnectionTimeout(void);
 bool IsConnectorWholeIdle();
 void SetAcContactor(unsigned char OnOff);
+void UpdateErrorCodeToOcpp(byte index);
 
 #define DEBUG_INFO_MSG(format, args...) StoreLogMsg_1("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 #define DEBUG_WARN_MSG(format, args...) StoreLogMsg_1("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
@@ -2609,6 +2610,7 @@ void ChargingTerminalProcess(byte gunIndex)
 
 void ChargingAlarmProcess(byte gunIndex)
 {
+    UpdateErrorCodeToOcpp(gunIndex);
     setChargerMode(gunIndex, MODE_ALARM);
 }
 
@@ -2662,6 +2664,11 @@ void EmcOccureByString(char *code)
 			if ((chargingInfo[gun]->SystemStatus > S_IDLE && chargingInfo[gun]->SystemStatus < S_TERMINATING) ||
 					(chargingInfo[gun]->SystemStatus >= S_CCS_PRECHARGE_ST0 && chargingInfo[gun]->SystemStatus <= S_CCS_PRECHARGE_ST1))
 			{
+		        if (strncmp((char *)chargingInfo[gun]->ConnectorAlarmCode, "", 6) == EQUAL)
+		        {
+                    memcpy(chargingInfo[gun]->ConnectorAlarmCode, code, 6);
+		        }
+
 			    ChargingAlarmProcess(gun);
 			}
 		}