[Improve][Modularization][all]

2022.12.12 / Folus Wen

Actions:
1. Fix source code define issue in new compiler.

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_RFID.c

@@ -170,7 +170,7 @@ int at_command(int uart, unsigned char* cmd,int length, unsigned char* rx)
 	
 	//sleep(2); //required to make flush work, for some reason
 	tcflush(uart,TCIOFLUSH);
-	if(write(uart, cmd, length) >= ARRAY_SIZE(cmd))
+	if(write(uart, cmd, length) >= length)
 	{
 		usleep(100000);
 		len = read(uart, rx, 512);

EVSE/Modularization/ocpp20/JsonParser.c

@@ -8,6 +8,8 @@ extern void CheckTransactionPacket(char *uuid);
 typedef void (*FunCallErrorPtr)(char *id, char *errorCode, char *errorDescription,char *payload);
 typedef void (*FunPtr)(char *payload, int gun_index);
 typedef int (*FunCallPtr)(char *uuid, char *payload);
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 
 

EVSE/Modularization/ocpp20/MessageHandler.c

@@ -16724,7 +16724,7 @@ int handlePublishFirmwareRequest(char *uuid, char *payload)
 
 		if(json_object_object_get(PublishFirmware, "checksum") != NULL)
 		{
-			sprintf((char*)ShmOCPP20Data->PublishFirmware.requestId, "%s", json_object_get_string(json_object_object_get(PublishFirmware, "checksum")));
+			sprintf((char*)ShmOCPP20Data->PublishFirmware.checksum, "%s", json_object_get_string(json_object_object_get(PublishFirmware, "checksum")));
 		}
 
 		// Optional data

EVSE/Modularization/ocpp20/Module_OcppBackend20.c

@@ -1,5 +1,6 @@
 #include "Module_OcppBackend20.h"
-
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 
 struct lws 								*wsi_client;

EVSE/Modularization/ocpp20/hashmap.c

@@ -6,6 +6,8 @@
  */
 #include "Module_OcppBackend20.h"
 
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 static pthread_mutex_t mutexMap = PTHREAD_MUTEX_INITIALIZER;
 

EVSE/Modularization/ocppfiles/JsonParser.c

@@ -8,6 +8,8 @@ extern void CheckTransactionPacket(char *uuid);
 typedef void (*FunCallErrorPtr)(char *id, char *errorCode, char *errorDescription,char *payload);
 typedef void (*FunPtr)(char *payload, int gun_index);
 typedef int (*FunCallPtr)(char *uuid, char *payload);
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 
 

EVSE/Modularization/ocppfiles/Module_OcppBackend.c

@@ -1,5 +1,6 @@
 #include "Module_OcppBackend.h"
-
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 
 struct lws 								*wsi_client;

EVSE/Modularization/ocppfiles/hashmap.c

@@ -5,7 +5,8 @@
  *      Author: foluswen
  */
 #include "Module_OcppBackend.h"
-
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 static pthread_mutex_t mutexMap = PTHREAD_MUTEX_INITIALIZER;
 

EVSE/Modularization/ocppph/JsonParser.c

@@ -8,6 +8,8 @@ extern void CheckTransactionPacket(char *uuid);
 typedef void (*FunCallErrorPtr)(char *id, char *errorCode, char *errorDescription,char *payload);
 typedef void (*FunPtr)(char *payload, int gun_index);
 typedef int (*FunCallPtr)(char *uuid, char *payload);
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 
 

EVSE/Modularization/ocppph/Module_OcppBackend.c

@@ -1,5 +1,6 @@
 #include "Module_OcppBackend.h"
-
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 
 struct lws 								*wsi_client;

EVSE/Modularization/ocppph/hashmap.c

@@ -5,7 +5,8 @@
  *      Author: foluswen
  */
 #include "Module_OcppBackend.h"
-
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 static pthread_mutex_t mutexMap = PTHREAD_MUTEX_INITIALIZER;
 

EVSE/Projects/AX80/Apps/Makefile

@@ -121,7 +121,7 @@ Module_Dispenser:
 Module_LcmControl_Wistron_Task:
 	@echo "===== Module_LcmControl_Wistron_Task ==================================="
 	rm -f Module_LcmControl_Wistron
-	$(CC) -D $(Project) "-I../../../Modularization/ocppfiles/" "-I./" "-I../../" "-I../../../GPL/mosquitto-2.0.13/release/usr/local/include/" "-include../../../GPL/json-c-json-c-0.13.1-20180305/release/include/json-c/json.h" "-include../../../Modularization/Module_RatedCurrent.h" -O0  -Wall -fmessage-length=0 LCM_Wistron/LcmCommandDriver.c LCM_Wistron/Module_LcmControl_Wistron.c -lm -lrt ${Lib_JSONC} ${Lib_Module_RatedCurrent} ${Lib_MOSQUITTO} -o Module_LcmControl_Wistron
+	$(CC) -D $(Project) "-I../../../Modularization/ocppfiles/" "-I../../../GPL/json-c-json-c-0.13.1-20180305/release/include/" "-I./" "-I../../" "-I../../../GPL/mosquitto-2.0.13/release/usr/local/include/" "-include../../../GPL/json-c-json-c-0.13.1-20180305/release/include/json-c/json.h" "-include../../../Modularization/Module_RatedCurrent.h" -O0  -Wall -fmessage-length=0 LCM_Wistron/LcmCommandDriver.c LCM_Wistron/Module_LcmControl_Wistron.c -lm -lrt ${Lib_JSONC} ${Lib_Module_RatedCurrent} ${Lib_MOSQUITTO} -o Module_LcmControl_Wistron
 	rm -f *.o	
 	mv -f Module_LcmControl_Wistron ../Images/root
 

EVSE/Projects/define.h

@@ -2748,6 +2748,8 @@ struct GBTData
 /**************************ISO15118_2014: 2014************************************/
 /**************************ISO15118_2018: 2018************************************/
 /************************************************************************************/
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 enum ResponseCodeType_DIN70121		{ OK_DIN70121 = 0, OK_NewSessionEstablished_DIN70121 = 1, OK_OldSessionJoined_DIN70121 = 2, OK_CertificateExpiresSoon_DIN70121 = 3,
 									   FAILED_DIN70121 = 4, FAILED_SequenceError_DIN70121 = 5, FAILED_ServiceIDInvalid_DIN70121 = 6, FAILED_UnknownSession_DIN70121 = 7,