[Add][AW-CCS][main]

2021.04.13 / Folus Wen

Actions:
1. define.h add AW-ChargeLab & AW-CCS definition.
2. Model name info parsing by library implement.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Projects/AW-CCS/Apps/Makefile

@@ -4,6 +4,7 @@ export PATH=/bin:/sbin:/usr/bin:$(SDK_PATH_TARGET)/usr/bin:$PATH
 #define library variable
 Lib_Module_RFID = "-L../../../Modularization" -lModule_RFID
 Lib_Module_Upgrade = "-L../../../Modularization" -lModule_Upgrade
+Lib_Module_RatedCurrent = "-L../../../Modularization" -lModule_RatedCurrent
 Lib_SQLite3 = "-L../../../Modularization/ocppfiles" -lsqlite3
 
 EXI_ENGINE= CCS/v2g/api/api.c \
@@ -102,8 +103,8 @@ Module_AlarmDetect_Task:
 Module_CSU_Task:
 	@echo "===== Module_CSU_Task ============================================"
 	rm -f main 
-	$(CC) -D $(Project) "-I../../" "-include../../../Modularization/ocppfiles/sqlite3.h" "-include../../../Modularization/Module_Upgrade.h" "-include../../../Modularization/Module_RFID.h" -O0 -g3 -Wall -c -fmessage-length=0 -o main.o "./main.c"
-	$(CC) -o main main.o ${Lib_Module_RFID} ${Lib_Module_Upgrade} ${Lib_SQLite3}
+	$(CC) -D $(Project) "-I../../" "-include../../../Modularization/ocppfiles/sqlite3.h" "-include../../../Modularization/Module_Upgrade.h" "-include../../../Modularization/Module_RFID.h" "-include../../../Modularization/Module_RatedCurrent.h" -O0 -g3 -Wall -c -fmessage-length=0 -o main.o "./main.c"
+	$(CC) -o main main.o ${Lib_Module_RFID} ${Lib_Module_Upgrade} ${Lib_SQLite3} ${Lib_Module_RatedCurrent}
 	rm -f *.o
 	mv -f main ../Images/root		
 	@echo \

EVSE/Projects/AW-CCS/Apps/main.c

@@ -1,7 +1,6 @@
 #include	"define.h"
 #include 	"main.h"
 
-
 //==========================
 // System basic sample constant
 //==========================
@@ -89,7 +88,7 @@ struct timeb					endChargingTime[AC_QUANTITY];
 sqlite3 *localDb;
 
 struct SysConfigData			SysConfigOrg;
-
+ParsingRatedCur 				modelnameInfo={0};
 //=================================
 // Common routine
 //=================================
@@ -1618,6 +1617,8 @@ int LoadSysConfigAndInfo(struct SysConfigData *ptr)
 			ShmCharger->isCcsEnable = ON;
 	}
 
+	RatedCurrentParsing((char*)ShmSysConfigAndInfo->SysConfig.ModelName, &modelnameInfo);
+
 	return PASS;
 }
 
@@ -1902,36 +1903,39 @@ void InitEthernet()
 	DEBUG_INFO("Initial Ethernet OK\n");
 }
 
-int SpawnTask()
+int SpawnTask(uint8_t gun_index)
 {
-	system ("pkill Module_");
-	system ("pkill OcppBackend");
-
-	if((ShmSysConfigAndInfo->SysConfig.ModelName[10] == 'T') || (ShmSysConfigAndInfo->SysConfig.ModelName[10] == 'D'))
-	{
-		system("/root/Module_4g &");
-	}
-	else if(ShmSysConfigAndInfo->SysConfig.ModelName[10] == 'W')
+	if(gun_index == 0)
 	{
-		system("/root/Module_Wifi &");
-	}
+		system ("pkill Module_");
+		system ("pkill OcppBackend");
+
+		if((ShmSysConfigAndInfo->SysConfig.ModelName[10] == 'T') || (ShmSysConfigAndInfo->SysConfig.ModelName[10] == 'D'))
+		{
+			system("/root/Module_4g &");
+		}
+		else if(ShmSysConfigAndInfo->SysConfig.ModelName[10] == 'W')
+		{
+			system("/root/Module_Wifi &");
+		}
 
-	system("/root/Module_EventLogging &");
+		system("/root/Module_EventLogging &");
 
-	if(strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") != 0)
-	{
-		ocpp_process_start();
-	}
-	else
-	{
-		DEBUG_INFO("OCPP URL is empty, need to create a configuration table !!!\n");
-		ocpp_process_start();
+		if(strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") != 0)
+		{
+			ocpp_process_start();
+		}
+		else
+		{
+			DEBUG_INFO("OCPP URL is empty, need to create a configuration table !!!\n");
+			ocpp_process_start();
+		}
+		system ("/root/Module_AlarmDetect &");
+		system ("/root/Module_InternalComm &");
+		system ("/root/Module_Speaker &");
+		system ("/root/Module_ProduceUtils &");
+		system ("/root/Module_LcmControl &");
 	}
-	system ("/root/Module_AlarmDetect &");
-	system ("/root/Module_InternalComm &");
-	system ("/root/Module_Speaker &");
-	system ("/root/Module_ProduceUtils &");
-	system ("/root/Module_LcmControl &");
 
 	return PASS;
 }
@@ -1951,47 +1955,49 @@ int InitQca7000()
 	return result;
 }
 
-int Initialization()
+int Initialization(uint8_t gun_index)
 {
 	int result = PASS;
 
-	LoadSysConfigAndInfo(&ShmSysConfigAndInfo->SysConfig);
+	if(gun_index == 0)
+	{
+		LoadSysConfigAndInfo(&ShmSysConfigAndInfo->SysConfig);
 
-	InitGPIO();
+		InitGPIO();
 
-	InitEthernet();
+		InitEthernet();
 
-	if(InitQca7000() != PASS)
-	{
-		DEBUG_ERROR("QCA7000 initial fail.\n");
-		result = FAIL;
-	}
+		if(InitQca7000() != PASS)
+		{
+			DEBUG_ERROR("QCA7000 initial fail.\n");
+			result = FAIL;
+		}
 
-	if(DB_Open(localDb) != PASS)
-	{
-		DEBUG_ERROR("Local database initial fail.\n");
-		result = FAIL;
-	}
+		if(DB_Open(localDb) != PASS)
+		{
+			DEBUG_ERROR("Local database initial fail.\n");
+			result = FAIL;
+		}
 
-	for(int gun_index=0;gun_index< AC_QUANTITY;gun_index++)
-		ShmCharger->gun_info[gun_index].isOperactive = DB_Get_Operactive(localDb, gun_index);
+		if((rfidFd = InitRfidPort()) == FAIL)
+		{
+			DEBUG_ERROR("RFID port initial fail.\n");
+			result = FAIL;
+		}
 
-	if((rfidFd = InitRfidPort()) == FAIL)
-	{
-		DEBUG_ERROR("RFID port initial fail.\n");
-		result = FAIL;
-	}
+		if((wtdFd = InitWatchDog()) == FAIL)
+		{
+			DEBUG_ERROR("Watchdog initial fail.\n");
+			result = FAIL;
+		}
 
-	if((wtdFd = InitWatchDog()) == FAIL)
-	{
-		DEBUG_ERROR("Watchdog initial fail.\n");
-		result = FAIL;
+		if(result == PASS)
+			DEBUG_INFO("Initialization OK.\n");
+		else
+			DEBUG_INFO("Initialization Fail.\n");
 	}
 
-	if(result == PASS)
-		DEBUG_INFO("Initialization OK.\n");
-	else
-		DEBUG_INFO("Initialization Fail.\n");
+	ShmCharger->gun_info[gun_index].isOperactive = DB_Get_Operactive(localDb, gun_index);
 
 	return result;
 }
@@ -3746,7 +3752,6 @@ int main(void)
 			 *	TODO:
 			 *	1. Power saving logic
 			 */
-
 			if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A)
 			{
 				ftime(&startTime[gun_index][TMR_IDX_POWERSAVING_STATE_B]);
@@ -3902,8 +3907,8 @@ int main(void)
 						setLedMotion(gun_index,LED_ACTION_INIT);
 
 						//CSU Initialization & task spawn
-						if((Initialization() != PASS) ||
-						   (SpawnTask() != PASS))
+						if((Initialization(gun_index) != PASS) ||
+						   (SpawnTask(gun_index) != PASS))
 						{
 							ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CsuInitFailed = ON;
 						}

EVSE/Projects/define.h

@@ -43,18 +43,27 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
     #define GB_QUANTITY             0
     #define AC_QUANTITY             1
     #define GENERAL_GUN_QUANTITY    0
-    #define PSU_QUANTITY            2
+    #define PSU_QUANTITY            0
     #define ONE_CONNECTOR_USE       0
-#elif BYTONGB
-	#define MAX_PSU_QUANTITY        62
-	#define CHAdeMO_QUANTITY        1
-	#define CCS_QUANTITY            1
-	#define GB_QUANTITY             0
-	#define AC_QUANTITY             1
-    #define GENERAL_GUN_QUANTITY	0
-	#define PSU_QUANTITY            2
-	#define ONE_CONNECTOR_USE       0
-#elif DW30
+#elif defined AWChargeLab
+    #define MAX_PSU_QUANTITY        62
+    #define CHAdeMO_QUANTITY        1
+    #define CCS_QUANTITY            1
+    #define GB_QUANTITY             0
+    #define AC_QUANTITY             1
+    #define GENERAL_GUN_QUANTITY    0
+    #define PSU_QUANTITY            0
+    #define ONE_CONNECTOR_USE       0
+#elif defined AWCCS
+    #define MAX_PSU_QUANTITY        62
+    #define CHAdeMO_QUANTITY        1
+    #define CCS_QUANTITY            1
+    #define GB_QUANTITY             0
+    #define AC_QUANTITY             1
+    #define GENERAL_GUN_QUANTITY    0
+    #define PSU_QUANTITY            0
+    #define ONE_CONNECTOR_USE       0
+#elif defined DW30
 	#define MAX_PSU_QUANTITY        62
 	#define CHAdeMO_QUANTITY        0
 	#define CCS_QUANTITY            1
@@ -63,7 +72,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
     #define GENERAL_GUN_QUANTITY	0
 	#define PSU_QUANTITY            2
 	#define ONE_CONNECTOR_USE       0
-#elif DM30
+#elif defined DM30
 	#define MAX_PSU_QUANTITY        62
 	#define CHAdeMO_QUANTITY        0
 	#define CCS_QUANTITY            1
@@ -72,7 +81,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
     #define GENERAL_GUN_QUANTITY	0
 	#define PSU_QUANTITY            2
 	#define ONE_CONNECTOR_USE       0
-#elif DS60120
+#elif defined DS60120
 	#define MAX_PSU_QUANTITY        62
 	#define CHAdeMO_QUANTITY        2
 	#define CCS_QUANTITY            2
@@ -81,7 +90,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
     #define GENERAL_GUN_QUANTITY	0
 	#define PSU_QUANTITY            2
 	#define ONE_CONNECTOR_USE       0
-#elif DS60210
+#elif defined DS60210
 	#define MAX_PSU_QUANTITY        62
 	#define CHAdeMO_QUANTITY        1
 	#define CCS_QUANTITY            1
@@ -90,7 +99,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
     #define GENERAL_GUN_QUANTITY	0
 	#define PSU_QUANTITY            2
 	#define ONE_CONNECTOR_USE       0
-#elif PlugIt360
+#elif defined PlugIt360
     #define MAX_PSU_QUANTITY        62
     #define CHAdeMO_QUANTITY        0
     #define CCS_QUANTITY            1
@@ -99,7 +108,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
     #define GENERAL_GUN_QUANTITY	0
     #define PSU_QUANTITY            2
     #define ONE_CONNECTOR_USE       0
-#elif DD360
+#elif defined DD360
     #define MAX_PSU_QUANTITY        62
     #define CHAdeMO_QUANTITY        2
     #define CCS_QUANTITY            2
@@ -108,7 +117,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
     #define GENERAL_GUN_QUANTITY	0
     #define PSU_QUANTITY            2
     #define ONE_CONNECTOR_USE       0
-#elif DD360Audi
+#elif defined DD360Audi
     #define MAX_PSU_QUANTITY        62
     #define CHAdeMO_QUANTITY        2
     #define CCS_QUANTITY            2
@@ -117,7 +126,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
     #define GENERAL_GUN_QUANTITY    0
     #define PSU_QUANTITY            2
     #define ONE_CONNECTOR_USE       0
-#elif DO360
+#elif defined DO360
     #define MAX_PSU_QUANTITY        62
     #define CHAdeMO_QUANTITY        0
     #define CCS_QUANTITY            0
@@ -126,7 +135,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
     #define GENERAL_GUN_QUANTITY    4
     #define PSU_QUANTITY            6
     #define ONE_CONNECTOR_USE       0
-#elif ATE
+#elif defined ATE
     #define MAX_PSU_QUANTITY        62
     #define CHAdeMO_QUANTITY        0
     #define CCS_QUANTITY            1