[Improve][AW-CCS][Module_CCS]

2021.10.12 / Folus Wen

Actions:
1. 15118 process improve.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Projects/AW-CCS/Apps/CCS/Module_CCS.h

@@ -40,21 +40,10 @@
 
 //#define TEST_WITH_ETH0
 
-#define SAVE_SYS_LOG_MSG_EVCOMM_SWITCH		ENABLE
-#define DEBUG_PRINTF_EVCOMM_SHOW			ENABLE
-#define DEBUG_PRINTF_EVCOMM_BRIEF_SHOW		ENABLE
-#define DEBUG_PRINTF_EVCOMM_DETAIL_SHOW		DISABLE
-#define	DEBUG_PRINTF_EVCOMM_SYSTEM_LOG_SHOW	ENABLE
-
-
-#define V2GT_MSG_PROTOCOL_DIN70121                  0
-#define V2GT_MSG_PROTOCOL_ISO15118_2014             1    //i.e. ISO15118-2 (ISO 1)
-#define V2GT_MSG_PROTOCOL_ISO15118_2018             2    //i.e. ISO15118-20 (ISO 2)
-
 #define	QcaInterface						"eth1"
 #define SupportBcbToggle
 #define	SdpUdpServerPort					15118
-#define	SdpTcpServerPort					59438		//49152-65535
+#define	SdpTcpServerPort					50438		//49152-65535
 #define	IPV6_LINK_LOCAL_PREFIX				0xFE80
 #define V2GTP_MSG_RX_BUFFER_SIZE            (64*1024)   //65,536 = 65.5KB
 #define V2GTP_MSG_TX_BUFFER_SIZE            (64*1024)   //65,536 = 65.5KB

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

@@ -17,8 +17,6 @@ INPUT:
 OUTPUT:
 GLOBAL VARIABLES:
 =============================================================================*/
-
-
 void HPAVKeyNMK(uint8_t NMK [], const char *string)
 
 {
@@ -53,7 +51,6 @@ void HPAVKeyNMK(uint8_t NMK [], const char *string)
     return;
 }
 
-
 void HPAVKeyNID(uint8_t NID[], const uint8_t NMK[], uint8_t level)
 {
     struct sha256 sha256;
@@ -267,8 +264,8 @@ void SHA256Write(struct sha256 *sha256, void const *memory, uint16_t extent)
 
     return;
 }
-void SHAEncode(uint8_t memory[], uint32_t number)
 
+void SHAEncode(uint8_t memory[], uint32_t number)
 {
     *memory++ = (uint8_t)(number >> 24);
     *memory++ = (uint8_t)(number >> 16);

EVSE/Projects/AW-CCS/Apps/CCS/NidNmk.h

@@ -11,26 +11,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if FIRMWARE_VERSION_COMPILE_SETTING_RELEASE_MODE == ENABLE
-//Saving System Log
-#define SAVE_SYS_LOG_MSG_NIDNMK_SWITCH         DISABLE      //ENABLE, DISABLE
-
-//Configuration for Debug Print Messages
-#define DEBUG_PRINTF_NIDNMK_SHOW               DISABLE      //ENABLE, DISABLE
-#define DEBUG_PRINTF_NIDNMK_BRIEF_SHOW         DISABLE      //ENABLE, DISABLE
-#define DEBUG_PRINTF_NIDNMK_DETAIL_SHOW        DISABLE      //ENABLE, DISABLE
-#define DEBUG_PRINTF_NIDNMK_SYSTEM_LOG_SHOW    DISABLE      //ENABLE, DISABLE
-#else //debug mode
-//Saving System Log
-#define SAVE_SYS_LOG_MSG_NIDNMK_SWITCH         ENABLE      //ENABLE, DISABLE
-
-//Configuration for Debug Print Messages
-#define DEBUG_PRINTF_NIDNMK_SHOW               ENABLE      //ENABLE, DISABLE
-#define DEBUG_PRINTF_NIDNMK_BRIEF_SHOW         ENABLE      //ENABLE, DISABLE
-#define DEBUG_PRINTF_NIDNMK_DETAIL_SHOW        ENABLE      //ENABLE, DISABLE
-#define DEBUG_PRINTF_NIDNMK_SYSTEM_LOG_SHOW    ENABLE      //ENABLE, DISABLE
-#endif
-
 typedef struct sha256
 {
 
@@ -58,37 +38,3 @@ void SHA256Write(struct sha256 *sha256, void const *memory, uint16_t extent);
 void SHAEncode(uint8_t memory [], uint32_t number);
 void SHA256Fetch(struct sha256 *sha256, uint8_t digest []);
 
-//System Log
-#if SAVE_SYS_LOG_MSG_NIDNMK_SWITCH == ENABLE
-    #define SAVE_SYS_LOG_MSG_NIDNMK     StoreLogMsg
-#else
-    #define SAVE_SYS_LOG_MSG_NIDNMK(...)
-#endif
-
-//Debug Message
-#if DEBUG_PRINTF_NIDNMK_SHOW == ENABLE
-    //Brief Messages
-    #if DEBUG_PRINTF_NIDNMK_BRIEF_SHOW == ENABLE
-        #define DEBUG_PRINTF_NIDNMK_BRIEF      printf
-    #else
-        #define DEBUG_PRINTF_NIDNMK_BRIEF(...)
-    #endif
-
-    //Detail Messages
-    #if DEBUG_PRINTF_NIDNMK_DETAIL_SHOW == ENABLE
-        #define DEBUG_PRINTF_NIDNMK_DETAIL     printf
-    #else
-        #define DEBUG_PRINTF_NIDNMK_DETAIL(...)
-    #endif
-
-    //System Log Messages
-    #if DEBUG_PRINTF_NIDNMK_SYSTEM_LOG_SHOW == ENABLE
-        #define DEBUG_PRINTF_NIDNMK_SYSTEM_LOG    printf
-    #else
-        #define DEBUG_PRINTF_NIDNMK_SYSTEM_LOG(...)
-    #endif
-#else
-    #define DEBUG_PRINTF_NIDNMK_BRIEF(...)
-    #define DEBUG_PRINTF_NIDNMK_DETAIL(...)
-    #define DEBUG_PRINTF_NIDNMK_SYSTEM_LOG(...)
-#endif

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

@@ -1,3 +1,9 @@
+/*
+ * Module_CCS.c
+ *
+ *  Created on: 2020/03/16
+ *      Author: foluswen
+ */
 #include 	<sys/time.h>
 #include 	<sys/timeb.h>
 #include    <sys/types.h>

EVSE/Projects/AW-CCS/Apps/CCS/SystemLogMessage.h

@@ -1,48 +1,36 @@
+/*
+ * Module_CCS.c
+ *
+ *  Created on: 2020/03/16
+ *      Author: foluswen
+ */
 #ifndef SystemLogMessage_H
 #define SystemLogMessage_H
 
-/*SystemLog message*/
 #define SystemLogMessage            //for engineer to do analysis
 //#define ConsloePrintLog
 
-//System Log
-#if SAVE_SYS_LOG_MSG_EVCOMM_SWITCH == ENABLE
-    #define SAVE_SYS_LOG_MSG_EVCOMM(format, args...) StoreLogMsg("[%s:%d][%s] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define SAVE_SYS_LOG_MSG_EVCOMM
+//#define DEBUG_PRINTF_EVCOMM_DETAIL_SHOW
+
+// Normal debug Message
+#ifdef SAVE_SYS_LOG_MSG_EVCOMM
+	#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__), __LINE__, __FUNCTION__, ##args)
+	#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__), __LINE__, __FUNCTION__, ##args)
+	#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__), __LINE__, __FUNCTION__, ##args)
 #else
-    #define SAVE_SYS_LOG_MSG_EVCOMM(...)
+    #define DEBUG_INFO(...)
+	#define DEBUG_WARN(...)
+	#define DEBUG_ERROR(...)
 #endif
 
-//Debug Message
-#if DEBUG_PRINTF_EVCOMM_SHOW == ENABLE
-    //Brief Messages
-    #if DEBUG_PRINTF_EVCOMM_BRIEF_SHOW == ENABLE
-        #define DEBUG_PRINTF_EVCOMM_BRIEF(format, args...) StoreLogMsg("[%s:%d][%s] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-    #else
-        #define DEBUG_PRINTF_EVCOMM_BRIEF(...)
-    #endif
-
-    //Detail Messages
-    #if DEBUG_PRINTF_EVCOMM_DETAIL_SHOW == ENABLE
-        #define DEBUG_PRINTF_EVCOMM_DETAIL(format, args...) StoreLogMsg("[%s:%d][%s] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-    #else
-        #define DEBUG_PRINTF_EVCOMM_DETAIL(...)
-    #endif
-
-    //System Log Messages
-    #if DEBUG_PRINTF_EVCOMM_SYSTEM_LOG_SHOW == ENABLE
-        #define DEBUG_PRINTF_EVCOMM_SYSTEM_LOG(format, args...) StoreLogMsg("[%s:%d][%s] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-    #else
-        #define DEBUG_PRINTF_EVCOMM_SYSTEM_LOG(...)
-    #endif
+// Detail debug Message, will effect SLAC if enable
+#ifdef DEBUG_PRINTF_EVCOMM_DETAIL_SHOW
+	#define DEBUG_PRINTF_EVCOMM_DETAIL(format, args...) StoreLogMsg("[%s:%d][%s][Detail] "format, (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__), __LINE__, __FUNCTION__, ##args)
 #else
-    #define DEBUG_PRINTF_EVCOMM_BRIEF(...)
-    #define DEBUG_PRINTF_EVCOMM_DETAIL(...)
-    #define DEBUG_PRINTF_EVCOMM_SYSTEM_LOG(...)
+	#define DEBUG_PRINTF_EVCOMM_DETAIL(...)
 #endif
 
-#define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__), __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__), __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__), __LINE__, __FUNCTION__, ##args)
 
 int StoreLogMsg(const char *fmt, ...);
 

EVSE/Projects/AW-CCS/Apps/CCS/define_ccs.h

@@ -73,13 +73,16 @@
 #define CCS_AC_SIG_METER_READING                "SIG_METER_READING_ABCDE-0123456789" //max = 64 bytes
 
 /*CCS Protocol ID*/
-#define V2GT_MSG_PROTOCOL_DIN70121                  0
-#define V2GT_MSG_PROTOCOL_ISO15118_2014             1    //i.e. ISO15118-2 (ISO 1)
-#define V2GT_MSG_PROTOCOL_ISO15118_2018             2    //i.e. ISO15118-20 (ISO 2)
-#define V2GT_MSG_PROTOCOL_HIGHEST_PRIORITY          255  //for auto detect highest priority protocol
+enum V2GT_MSG_PROTOCOL
+{
+	V2GT_MSG_PROTOCOL_DIN70121=0,
+	V2GT_MSG_PROTOCOL_ISO15118_2014,			//i.e. ISO15118-2 (ISO 1)
+	V2GT_MSG_PROTOCOL_ISO15118_2018,			//i.e. ISO15118-20 (ISO 2)
+	V2GT_MSG_PROTOCOL_HIGHEST_PRIORITY=255		//for auto detect highest priority protocol
+};
 
 #define V2GT_MSG_PROTOCOL_PREFERENCE                V2GT_MSG_PROTOCOL_ISO15118_2014
-#define CCS_ENERGY_TRANSFER_MODE                    MODE_AC_THREE_PHASE_CORE
+#define CCS_ENERGY_TRANSFER_MODE                    MODE_AC_SINGLE_PHASE_CORE
                                                     //DC: MODE_DC_EXTENDED (default)
                                                     //AC: MODE_AC_SINGLE_PHASE_CORE, MODE_AC_THREE_PHASE_CORE
 
@@ -87,26 +90,28 @@
 #define SET_5_PWM_ONCE_RX_CM_SLAC_PARM_REQ                  1
 #define SET_5_PWM_ONCE_GET_PERMISSION_IN_AUTHORIZATIONRES   2
 
-#define FIRMWARE_VERSION_COMPILE_SETTING_RELEASE_MODE       ENABLE  //default: ENABLE: release; DISABLE: debug
-#define NEW_SLAC_ARCHITECTURE_SWITCH                        ENABLE  //defualt: ENABLE
-#define CAN_RAMDOM_MATCHING_ID_MECHANISM                    ENABLE  //defualt: ENABLE
-#define CAN_RX_TIMEOUT_MECHANISM                            DISABLE  //defualt: ENABLE
+#define FIRMWARE_VERSION_COMPILE_SETTING_RELEASE_MODE       DISABLE	//default: ENABLE: release; DISABLE: debug
+#define CAN_RAMDOM_MATCHING_ID_MECHANISM                    ENABLE	//defualt: ENABLE
+#define CAN_RX_TIMEOUT_MECHANISM                            DISABLE	//defualt: ENABLE
 #define SLAC_FIRST_RESPONSE_METHOD                          SET_5_PWM_ONCE_GET_PERMISSION_IN_AUTHORIZATIONRES
 
-#define TCPDUMP_PACKETS_SNIFFER_SWITCH                      DISABLE //default: DISABLE
-#define CANDUMP_PACKETS_SNIFFER_SWITCH                      DISABLE //default: DISABLE
+#define TCPDUMP_PACKETS_SNIFFER_SWITCH                      DISABLE	//default: DISABLE
+#define CANDUMP_PACKETS_SNIFFER_SWITCH                      DISABLE	//default: DISABLE
 
-#define DYNAMIC_ETH0_IP_MECHANISM                           ENABLE //default: DISABLE
-#define CP_PROTECTION_MECHANISM                             ENABLE  //default: ENABLE
-#define PP_PROTECTION_MECHANISM                             DISABLE //default: DISABLE
-#define SUDO_PSD_PARAMETER_MECHANISM                        ENABLE  //default: ENABLE
+#define DYNAMIC_ETH0_IP_MECHANISM                           ENABLE	//default: DISABLE
+#define CP_PROTECTION_MECHANISM                             ENABLE	//default: ENABLE
+#define PP_PROTECTION_MECHANISM                             DISABLE	//default: DISABLE
+#define SUDO_PSD_PARAMETER_MECHANISM                        ENABLE	//default: ENABLE
 #define TESLA_SLOW_INCREASE_CURRENT_FUNCTION                DISABLE
 #define V2G_SECC_TIMEOUT_PROTECTION                         ENABLE
 #define PATCH_FOR_BMW_I3_BUG_EVSEMAXIMUMVOLTAGELIMIT_599V   ENABLE   //default: ENABLE; CE/UL: DISABLE
 
 //CSU CAN Message EV Stop Type
-#define EV_NORMAL_STOP      1
-#define EV_EMERGENCY_STOP   2
+enum EV_STOP_TYPE
+{
+	EV_NORMAL_STOP=1,
+	EV_EMERGENCY_STOP
+};
 
 //CSU CAN Message GFD Isolation Status Type
 #define GFD_Invalid       0     //ongoing
@@ -161,7 +166,7 @@
 #define CSUCOMMAC_SHM              (ShmCharger->gun_info[0].acCcsInfo)
 #define EVCOMM_SYS_INFO            (ShmSysConfigAndInfo->SysInfo.CcsChargingData[0])
 #define SLAC_INFO                  (ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].evcc_slac_data)
-#define CCS_HANDSHAKE_PROTOCOLS    (ccs_handshake.supportedAppProtocolReq.AppProtocol)
+#define CCS_HANDSHAKE_PROTOCOLS    (v2gObject.appHandshake.supportedAppProtocolReq.AppProtocol)
 
 #define GPIO_SYS_DIR 		       "/sys/class/gpio"
 #define GPIO_2_23_AM_IO_1          87