[Improve][Modularization][Module_EventLogging]

2021.05.31 / Folus Wen

Actions:
1. Status code log info add charging gun status.

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Modularization/Module_EventLogging.c

@@ -506,6 +506,84 @@ int DB_Network_Insert_Record(sqlite3 *db)
 	return result;
 }
 
+//================================================
+// Common routin
+//================================================
+char* getSystemModeName(unsigned char mode)
+{
+	char* result;
+
+	switch(mode)
+	{
+		case SYS_MODE_BOOTING:
+			result = "booting";
+			break;
+		case SYS_MODE_IDLE:
+			result = "idle";
+			break;
+		case SYS_MODE_AUTHORIZING:
+			result = "authorizing";
+			break;
+		case SYS_MODE_PREPARING:
+			result = "preparing";
+			break;
+		case SYS_MODE_CHARGING:
+			result = "charging";
+			break;
+		case SYS_MODE_TERMINATING:
+			result = "terminating";
+			break;
+		case SYS_MODE_COMPLETE:
+			result = "complete";
+			break;
+		case SYS_MODE_ALARM:
+			result = "alarm";
+			break;
+		case SYS_MODE_FAULT:
+			result = "fault";
+			break;
+		case SYS_MODE_MAINTAIN:
+			result = "maintain";
+			break;
+		case SYS_MODE_RESERVATION:
+			result = "reservation";
+			break;
+		case SYS_MODE_BOOKING:
+			result = "booking";
+			break;
+		case SYS_MODE_DEBUG:
+			result = "debug";
+			break;
+		case SYS_MODE_UPDATE:
+			result = "upgrade";
+			break;
+		default:
+			result = "unknown";
+			break;
+	}
+
+	return result;
+}
+
+int getConnectorStatus(char *status)
+{
+	int result = FAIL;
+
+	sprintf(status, " ");
+	if(ShmSysConfigAndInfo->SysConfig.ModelName[0] == 'A')
+	{
+		for(uint8_t gun_index=0;gun_index<AC_QUANTITY;gun_index++)
+		{
+			if(ShmSysConfigAndInfo->SysConfig.ModelName[9+(gun_index*-1)] != '0')
+			{
+				sprintf(status, "%s, Gun-%d: %s", status, (gun_index+1), getSystemModeName(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus));
+			}
+		}
+	}
+
+	return result;
+}
+
 //================================================
 // Main process
 //================================================
@@ -513,12 +591,11 @@ int main(void)
 {
 	int ByteCount,BitCount;
 	unsigned char tmp, EventCodeTmp[7], EventCodeDisp[7];
+	char connectorStatus[512];
 
 	if(InitShareMemory() == FAIL)
 	{
-		#ifdef SystemLogMessage
 		DEBUG_ERROR("InitShareMemory NG\n");
-		#endif
 		if(ShmStatusCodeData!=NULL)
 		{
 			ShmStatusCodeData->AlarmCode.AlarmEvents.bits.FailToCreateShareMemory=1;
@@ -564,8 +641,8 @@ int main(void)
 							ShmStatusCodeData->FaultCode.PreviousFaultVal[ByteCount]|=(1<<BitCount);
 							AddFaultCodeToBuf(EventCodeDisp);
 						}
-
-						EVENT_INFO("%s\n", EventCodeTmp);
+						getConnectorStatus(connectorStatus);
+						EVENT_INFO("%s%s\n", EventCodeTmp, connectorStatus);
 						DB_Event_Insert_Record(localDb, EventCodeTmp);
 					}
 				}
@@ -597,7 +674,8 @@ int main(void)
 							ShmStatusCodeData->AlarmCode.PreviousAlarmVal[ByteCount]|=(1<<BitCount);
 							AddFaultCodeToBuf(EventCodeDisp);
 						}
-						EVENT_INFO("%s\n", EventCodeTmp);
+						getConnectorStatus(connectorStatus);
+						EVENT_INFO("%s%s\n", EventCodeTmp, connectorStatus);
 						DB_Event_Insert_Record(localDb, EventCodeTmp);
 					}
 				}
@@ -629,7 +707,8 @@ int main(void)
 							ShmStatusCodeData->InfoCode.PreviousInfoVal[ByteCount]|=(1<<BitCount);
 							AddFaultCodeToBuf(EventCodeDisp);
 						}
-						EVENT_INFO("%s\n", EventCodeTmp);
+						getConnectorStatus(connectorStatus);
+						EVENT_INFO("%s%s\n", EventCodeTmp, connectorStatus);
 						DB_Event_Insert_Record(localDb, EventCodeTmp);
 					}
 				}

EVSE/Projects/AW-CCS/Apps/LCM/Module_LcmControl.c

@@ -1803,7 +1803,7 @@ void setPresentChargedDuration(uint8_t gun_index)
 	uint16_t hour;
 	uint16_t minute;
 	uint16_t second;
-	uint16_t PresentChargedDuration = ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration;
+	uint32_t PresentChargedDuration = ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration;
 
 	memset(data, 0x00, ARRAY_SIZE(data));
 	memset(time, 0x00, ARRAY_SIZE(time));