Browse Source

2019-12-30 /Folus Wen

Actions:
1. EVSE/Modularization/Module_Upgrade.c modify function name from GetTimeoutValue to getTimeoutValue.

Files:
1. As follow commit history.
FolusWen 5 năm trước cách đây
mục cha
commit
40d70aef61

+ 4 - 4
EVSE/Modularization/Module_Upgrade.c

@@ -733,7 +733,7 @@ int Upgrade_UART(unsigned char uartfd,unsigned int Type,unsigned char TargetAddr
 //================================================
 // CANBUS update function
 //================================================
-unsigned long GetTimeoutValue(struct timeval _sour_time)
+unsigned long getTimeoutValue(struct timeval _sour_time)
 {
 	struct timeval _end_time;
 	gettimeofday(&_end_time, NULL);
@@ -761,7 +761,7 @@ int CAN_Download_REQ(int canfd,unsigned int Slave_Addr, unsigned int imageSize)
 	{
 		struct timeval timer;
 		gettimeofday(&timer, NULL);
-		while (GetTimeoutValue(timer) < 5000000)
+		while (getTimeoutValue(timer) < 5000000)
 		{
 			struct can_frame frame;
 			int len;
@@ -798,7 +798,7 @@ int CAN_Start_BLK_Trans(int canfd,unsigned int Slave_Addr,unsigned int Block_No,
 	{
 		struct timeval timer;
 		gettimeofday(&timer, NULL);
-		while (GetTimeoutValue(timer) < 1000000)
+		while (getTimeoutValue(timer) < 1000000)
 		{
 			struct can_frame frame;
 			int len;
@@ -852,7 +852,7 @@ int CAN_Download_FIN(int canfd,unsigned int Slave_Addr)
 	{
 		struct timeval timer;
 		gettimeofday(&timer, NULL);
-		while (GetTimeoutValue(timer) < 1000000)
+		while (getTimeoutValue(timer) < 1000000)
 		{
 			struct can_frame frame;
 			int len;

+ 1 - 1
EVSE/Projects/DM30/Apps/Makefile

@@ -43,7 +43,7 @@ Module_CSU_Task:
 	rm -f main 
 	$(CC) -O0 -g3 -Wall -c -fmessage-length=0 -o timeout.o "./timeout.c"
 	$(CC) "-I../../../Modularization/" -O0 -g3 -Wall -c -fmessage-length=0 -o main.o "./main.c" 
-	$(CC) -o Module_CSU main.o timeout.o ${Lib_Module_RFID}
+	$(CC) -o Module_CSU main.o timeout.o ${Lib_Module_RFID} ${Lib_Module_Upgrade}
 	rm -f *.o
 	mv -f main ../Images/root		
 	@echo \ 

BIN
EVSE/Projects/DM30/Apps/main.o


BIN
EVSE/Projects/DM30/Images/root/FactoryConfig


BIN
EVSE/Projects/DM30/Images/root/Module_EventLogging


BIN
EVSE/Projects/DM30/Images/root/Module_InternalComm


BIN
EVSE/rootfs/root/Module_4g


BIN
EVSE/rootfs/root/Module_Wifi


BIN
EVSE/rootfs/root/OcppBackend


BIN
EVSE/rootfs/root/WebService


BIN
EVSE/rootfs/root/logPackTools