Bladeren bron

[Improve][Moduralization][Module_OcppBackend]

2020.10.29 / Folus Wen

Actions:
1. EVSE/Modularization/ocppfiles/MessageHandler.c cancel period sent out StatusNotification message.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 4 jaren geleden
bovenliggende
commit
401eb4896d
2 gewijzigde bestanden met toevoegingen van 25 en 2 verwijderingen
  1. 6 1
      EVSE/Modularization/ocppfiles/MessageHandler.c
  2. 19 1
      EVSE/Projects/AW-CCS/Apps/main.c

+ 6 - 1
EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -2604,7 +2604,12 @@ void CheckSystemValue(void)
 		}
 
 		if(isWebsocketSendable &&
-		   (((statusModeChage[gun_index] == TRUE) || ((time((time_t*)NULL)-clientTime.StatusNotification[gun_index]) > (server_cycle_Status + (GunStatusInterval*gun_index))) || ((cpinitateMsg.bits[gun_index].StatusNotificationReq == 1) && ((time((time_t*)NULL)-clientTime.StatusNotification[gun_index]) > 10)))) )
+				(
+						(statusModeChage[gun_index] == TRUE) ||
+						//((time((time_t*)NULL)-clientTime.StatusNotification[gun_index]) > (server_cycle_Status + (GunStatusInterval*gun_index))) ||
+						((cpinitateMsg.bits[gun_index].StatusNotificationReq == 1) && ((time((time_t*)NULL)-clientTime.StatusNotification[gun_index]) > 10))
+				)
+		  )
 		{
 			if(SystemInitial > 0)
 				SystemInitial -= 1;

+ 19 - 1
EVSE/Projects/AW-CCS/Apps/main.c

@@ -81,6 +81,7 @@ struct PrimaryMcuData			*ShmPrimaryMcuData;
 struct FanModuleData			*ShmFanModuleData;
 struct RelayModuleData			*ShmRelayModuleData;
 struct OCPP16Data				*ShmOCPP16Data;
+struct OCPP20Data				*ShmOCPP20Data;
 struct Charger					*ShmCharger;
 
 struct timeb					startTime[AC_QUANTITY][10];
@@ -411,6 +412,23 @@ int CreatShareMemory()
    	}
    	memset(ShmOCPP16Data,0,sizeof(struct OCPP16Data));
 
+   	//creat ShmOCPP20Data
+	if ((MeterSMId = shmget(ShmOcpp20ModuleKey, sizeof(struct OCPP20Data), IPC_CREAT | 0777)) < 0)
+	{
+
+		DEBUG_ERROR("shmget OCPP20Data NG\n");
+
+		result = FAIL;
+	}
+	else if ((ShmOCPP20Data = shmat(MeterSMId, NULL, 0)) == (void *) -1)
+	{
+
+		DEBUG_ERROR("shmat OCPP20Data NG\n");
+
+		result = FAIL;
+	}
+	memset(ShmOCPP20Data,0,sizeof(struct OCPP20Data));
+
 	//creat ShmCharger
    	if ((MeterSMId = shmget(ShmChargerKey, sizeof(struct Charger), IPC_CREAT | 0777)) < 0)
     {
@@ -1111,7 +1129,7 @@ int SpawnTask()
 	system ("pkill Module_ProduceUtils");
 	system ("pkill Module_LcmControl");
 
-	if(ShmSysConfigAndInfo->SysConfig.ModelName[10] == 'T')
+	if((ShmSysConfigAndInfo->SysConfig.ModelName[10] == 'T') || (ShmSysConfigAndInfo->SysConfig.ModelName[10] == 'D'))
 	{
 		system("/root/Module_4g &");
 	}