2021-04-07 / Wendell

Actions
1. fix communication issue with psu when emergency button pressed
2. fix power cabinet connection issue with dispenser
3. modify parallel relay logic
4. add new model name rule
5. add qr code display logic compatible with all model
6. fix final cost bug when alarm occur
7. synchronize output power with dispenser
8. fix 4G APN setting issue
9. fix UpdateErrorCodeToOcpp timing issue

Files
1. As follow commit history

Image version : D0.12.XX.XXXX.XX

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);
 			}
 		}