Browse Source

[Improve][AW-CCS][Module_CCS]

2020.12.29 / Folus Wen

Actions:
1. Slac implement MMTYPE_VENDOR_VS_PL_LNK_STATUS_CNF.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 4 years ago
parent
commit
603bcbdadc
2 changed files with 40 additions and 61 deletions
  1. 21 44
      EVSE/Projects/AW-CCS/Apps/CCS/Module_CCS.c
  2. 19 17
      EVSE/Projects/AW-CCS/Apps/CCS/Module_CCS.h

+ 21 - 44
EVSE/Projects/AW-CCS/Apps/CCS/Module_CCS.c

@@ -701,49 +701,6 @@ double DiffTimeb_fork2_Error_Monitor(struct timeb ST, struct timeb ET)
     return t_diff;
 }
 
-int CreateShareMemory()
-{
-    int MeterSMId;
-
-    //create ShmSysConfigAndInfo
-    if ((MeterSMId = shmget(ShmSysConfigAndInfoKey, sizeof(struct SysConfigAndInfo), IPC_CREAT | 0777)) < 0)
-    {
-        SAVE_SYS_LOG_MSG_EVCOMM("%s\n", "[main]CreateShareMemory:shmget ShmSysConfigAndInfo NG");
-        return 0;
-    }
-    else if ((ShmSysConfigAndInfo = shmat(MeterSMId, NULL, 0)) == (void *) -1)
-    {
-        SAVE_SYS_LOG_MSG_EVCOMM("%s\n", "[main]CreateShareMemory:shmat ShmSysConfigAndInfo NG");
-        return 0;
-    }
-    memset(ShmSysConfigAndInfo,0,sizeof(struct SysConfigAndInfo));
-    //create ShmStatusCodeData
-    if ((MeterSMId = shmget(ShmStatusCodeKey, sizeof(struct StatusCodeData), IPC_CREAT | 0777)) < 0)
-    {
-        SAVE_SYS_LOG_MSG_EVCOMM("%s\n", "[main]CreateShareMemory:shmget ShmStatusCodeData NG");
-        return 0;
-    }
-    else if ((ShmStatusCodeData = shmat(MeterSMId, NULL, 0)) == (void *) -1)
-    {
-        SAVE_SYS_LOG_MSG_EVCOMM("%s\n", "[main]CreateShareMemory:shmat ShmStatusCodeData NG");
-        return 0;
-    }
-    memset(ShmStatusCodeData,0,sizeof(struct StatusCodeData));
-    //create ShmCcsData
-    if ((MeterSMId = shmget(ShmCcsCommKey, sizeof(struct CcsData), IPC_CREAT | 0777)) < 0)
-    {
-        SAVE_SYS_LOG_MSG_EVCOMM("%s\n", "[main]CreateShareMemory:shmget ShmCcsData NG");
-        return 0;
-    }
-    else if ((ShmCcsData = shmat(MeterSMId, NULL, 0)) == (void *) -1)
-    {
-        SAVE_SYS_LOG_MSG_EVCOMM("%s\n", "[main]CreateShareMemory:shmat ShmCcsData NG");
-        return 0;
-    }
-    memset(ShmCcsData,0,sizeof(struct CcsData));
-    return 1;
-}
-
 /*===========================================================================
 FUNCTION: ShareMemory_Init
 DESCRIPTION:
@@ -1028,7 +985,7 @@ GLOBAL VARIABLES:
 =============================================================================*/
 void Qca7kPowerReset()
 {
-    printf("\n[CCS Board]Reset QCA7000...\n");
+    //printf("\n[CCS Board]Reset QCA7000...\n");
     system("echo 1 > /sys/class/gpio/gpio88/value");
     usleep(500000);
     system("echo 0 > /sys/class/gpio/gpio88/value");
@@ -3900,6 +3857,26 @@ int MmeProcess(unsigned char *Buffer, int DataLength)
             break;
 		}
 
+	    case MMTYPE_VENDOR_VS_PL_LNK_STATUS_CNF:
+		{
+			struct QcaVendorMmeHeader *RecvPacket;
+			RecvPacket = (struct QcaVendorMmeHeader *)Buffer;
+
+			if(RecvPacket->MBODY[1]==0)
+			{
+				//PLC disconnected
+				sprintf((char*)buf_log_evcomm,
+					"[QCA7K][Rx][MMTYPE_VENDOR_VS_PL_LNK_STATUS_CNF]Got PLC Link Status:%d",
+					RecvPacket->MBODY[1]);
+				SAVE_SYS_LOG_MSG_EVCOMM("%s\n", buf_log_evcomm);
+				Update_V2G_Flow_Status(Other_Fault);
+			}
+			else
+				Update_V2G_Flow_Status(CM_SET_KEY_REQ);
+		ftime(&SeqStartTime);
+			break;
+		}
+
 	    default:
 		{
 	        break;

+ 19 - 17
EVSE/Projects/AW-CCS/Apps/CCS/Module_CCS.h

@@ -67,24 +67,26 @@
 /***********************************************/
 /*** MMTYPE (Management Message Type) **/
 /**********************************************/
-#define MMTYPE_CM_SET_KEY_REQ				0x6008
-#define MMTYPE_CM_SET_KEY_CNF				0x6009
-#define MMTYPE_CM_SLAC_PARM_REQ				0x6064
-#define MMTYPE_CM_SLAC_PARM_CNF				0x6065
-#define MMTYPE_CM_START_ATTEN_CHAR_IND		0x606A
-#define MMTYPE_CM_MNBC_SOUND_IND			0x6076
-#define MMTYPE_CM_ATTEN_CHAR_IND			0x606E
-#define MMTYPE_CM_ATTEN_CHAR_RSP			0x606F
-#define MMTYPE_CM_VALIDATE_REQ				0x6078
-#define MMTYPE_CM_VALIDATE_CNF				0x6079
-#define MMTYPE_CM_SLAC_MATCH_REQ			0x607C
-#define MMTYPE_CM_SLAC_MATCH_CNF			0x607D
-#define MMTYPE_CM_ATTEN_PROFILE_IND			0x6086
+#define MMTYPE_CM_SET_KEY_REQ					0x6008
+#define MMTYPE_CM_SET_KEY_CNF					0x6009
+#define MMTYPE_CM_SLAC_PARM_REQ					0x6064
+#define MMTYPE_CM_SLAC_PARM_CNF					0x6065
+#define MMTYPE_CM_START_ATTEN_CHAR_IND			0x606A
+#define MMTYPE_CM_MNBC_SOUND_IND				0x6076
+#define MMTYPE_CM_ATTEN_CHAR_IND				0x606E
+#define MMTYPE_CM_ATTEN_CHAR_RSP				0x606F
+#define MMTYPE_CM_VALIDATE_REQ					0x6078
+#define MMTYPE_CM_VALIDATE_CNF					0x6079
+#define MMTYPE_CM_SLAC_MATCH_REQ				0x607C
+#define MMTYPE_CM_SLAC_MATCH_CNF				0x607D
+#define MMTYPE_CM_ATTEN_PROFILE_IND				0x6086
 //following are the vendor specific type
-#define MMTYPE_VENDOR_VS_HOST_ACTION	 	0xA062		//Embedded Host Action Requested Indication MME
-#define MMTYPE_VENDOR_ATTEN_CHAR			0xA14E		//Attenuation Characteristics MME (VS_ATTEN_CHAR)
-#define MMTYPE_VENDOR_VS_NW_INFO			0xA038		//Network Info MME
-#define MMTYPE_VENDOR_VS_NW_INFO_CNF		0xA039		//Network Info MME
+#define MMTYPE_VENDOR_VS_HOST_ACTION	 		0xA062		//Embedded Host Action Requested Indication MME
+#define MMTYPE_VENDOR_ATTEN_CHAR				0xA14E		//Attenuation Characteristics MME (VS_ATTEN_CHAR)
+#define MMTYPE_VENDOR_VS_NW_INFO				0xA038		//Network Info MME
+#define MMTYPE_VENDOR_VS_NW_INFO_CNF			0xA039		//Network Info MME
+#define MMTYPE_VENDOR_VS_PL_LNK_STATUS       	0xA0B8      //Powerline Link Status /*+++ 20200808, vern, for PLC connection monitoring ---*/
+#define MMTYPE_VENDOR_VS_PL_LNK_STATUS_CNF    	0xA0B9      //Powerline Link Status /*+++ 20200808, vern, for PLC connection monitoring ---*/
 
 /***********************************************/
 /************** V2GTP Payload Type ************/