2022-01-05 / Simon Xue

Action
1. Modify precharge countdown.

Files
1. As follow commit history

Image version : V1.19.XX.XXXX.XX

EVSE/Projects/DD360/Apps/CSU/main.c

@@ -83,7 +83,7 @@ uint8_t bd1_1_status = 0;
 uint8_t bd1_2_status = 0;
 
 char *fwVersion = "V1.19.00.0000.00"; // "V0.16.00.0000.00";
-char* DebugVersion = "v1.19.2";
+char* DebugVersion = "v1.19.3";
 //sqlite3 *localDb;
 bool isDb_ready;
 
@@ -4797,6 +4797,7 @@ int main(void)
                         pSysInfo->OrderCharging = NO_DEFINE;
                     }
                     StopSystemTimeoutDet();
+                    gettimeofday(&pDcChargingInfo->PreChargeTimer, NULL);
                 }
 
                 isRessign = NO;

EVSE/Projects/DD360/Apps/Debug/CSU/subdir.mk

@@ -0,0 +1,45 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../CSU/Ethernet.c \
+../CSU/OCPP.c \
+../CSU/Primary.c \
+../CSU/RFID.c \
+../CSU/SelfTest.c \
+../CSU/WatchDog.c \
+../CSU/ZipFile.c \
+../CSU/main.c 
+
+OBJS += \
+./CSU/Ethernet.o \
+./CSU/OCPP.o \
+./CSU/Primary.o \
+./CSU/RFID.o \
+./CSU/SelfTest.o \
+./CSU/WatchDog.o \
+./CSU/ZipFile.o \
+./CSU/main.o 
+
+C_DEPS += \
+./CSU/Ethernet.d \
+./CSU/OCPP.d \
+./CSU/Primary.d \
+./CSU/RFID.d \
+./CSU/SelfTest.d \
+./CSU/WatchDog.d \
+./CSU/ZipFile.d \
+./CSU/main.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+CSU/%.o: ../CSU/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/DataBase/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../DataBase/DataBase.c 
+
+OBJS += \
+./DataBase/DataBase.o 
+
+C_DEPS += \
+./DataBase/DataBase.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+DataBase/%.o: ../DataBase/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/Define/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Define/define.c 
+
+OBJS += \
+./Define/define.o 
+
+C_DEPS += \
+./Define/define.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Define/%.o: ../Define/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/Log/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Log/log.c 
+
+OBJS += \
+./Log/log.o 
+
+C_DEPS += \
+./Log/log.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Log/%.o: ../Log/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/ModuleChkSysTask/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleChkSysTask/Module_ChkSysTask.c 
+
+OBJS += \
+./ModuleChkSysTask/Module_ChkSysTask.o 
+
+C_DEPS += \
+./ModuleChkSysTask/Module_ChkSysTask.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleChkSysTask/%.o: ../ModuleChkSysTask/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/ModuleDoComm/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleDoComm/DoComm.c 
+
+OBJS += \
+./ModuleDoComm/DoComm.o 
+
+C_DEPS += \
+./ModuleDoComm/DoComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleDoComm/%.o: ../ModuleDoComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/ModuleEvComm/subdir.mk

@@ -0,0 +1,42 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleEvComm/AbnormalCCS.c \
+../ModuleEvComm/AbnormalCHA.c \
+../ModuleEvComm/AbnormalGBT.c \
+../ModuleEvComm/AbnormalState.c \
+../ModuleEvComm/Ev_Comm.c \
+../ModuleEvComm/Module_EvRxComm.c \
+../ModuleEvComm/Module_EvTxComm.c 
+
+OBJS += \
+./ModuleEvComm/AbnormalCCS.o \
+./ModuleEvComm/AbnormalCHA.o \
+./ModuleEvComm/AbnormalGBT.o \
+./ModuleEvComm/AbnormalState.o \
+./ModuleEvComm/Ev_Comm.o \
+./ModuleEvComm/Module_EvRxComm.o \
+./ModuleEvComm/Module_EvTxComm.o 
+
+C_DEPS += \
+./ModuleEvComm/AbnormalCCS.d \
+./ModuleEvComm/AbnormalCHA.d \
+./ModuleEvComm/AbnormalGBT.d \
+./ModuleEvComm/AbnormalState.d \
+./ModuleEvComm/Ev_Comm.d \
+./ModuleEvComm/Module_EvRxComm.d \
+./ModuleEvComm/Module_EvTxComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleEvComm/%.o: ../ModuleEvComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/ModuleEventLog/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleEventLog/Module_EventLogging.c 
+
+OBJS += \
+./ModuleEventLog/Module_EventLogging.o 
+
+C_DEPS += \
+./ModuleEventLog/Module_EventLogging.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleEventLog/%.o: ../ModuleEventLog/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/ModuleInternalComm/subdir.mk

@@ -0,0 +1,42 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleInternalComm/AcPlug.c \
+../ModuleInternalComm/FanBoard.c \
+../ModuleInternalComm/LEDlight.c \
+../ModuleInternalComm/Module_InternalComm.c \
+../ModuleInternalComm/Module_InternalCommOrg.c \
+../ModuleInternalComm/RelayBoard.c \
+../ModuleInternalComm/internalComm.c 
+
+OBJS += \
+./ModuleInternalComm/AcPlug.o \
+./ModuleInternalComm/FanBoard.o \
+./ModuleInternalComm/LEDlight.o \
+./ModuleInternalComm/Module_InternalComm.o \
+./ModuleInternalComm/Module_InternalCommOrg.o \
+./ModuleInternalComm/RelayBoard.o \
+./ModuleInternalComm/internalComm.o 
+
+C_DEPS += \
+./ModuleInternalComm/AcPlug.d \
+./ModuleInternalComm/FanBoard.d \
+./ModuleInternalComm/LEDlight.d \
+./ModuleInternalComm/Module_InternalComm.d \
+./ModuleInternalComm/Module_InternalCommOrg.d \
+./ModuleInternalComm/RelayBoard.d \
+./ModuleInternalComm/internalComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleInternalComm/%.o: ../ModuleInternalComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/ModuleLcmCtrl/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleLcmCtrl/Module_LcmControl.c 
+
+OBJS += \
+./ModuleLcmCtrl/Module_LcmControl.o 
+
+C_DEPS += \
+./ModuleLcmCtrl/Module_LcmControl.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleLcmCtrl/%.o: ../ModuleLcmCtrl/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/ModulePrimary/subdir.mk

@@ -0,0 +1,27 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModulePrimary/Module_PrimaryComm.c \
+../ModulePrimary/PrimaryComm.c 
+
+OBJS += \
+./ModulePrimary/Module_PrimaryComm.o \
+./ModulePrimary/PrimaryComm.o 
+
+C_DEPS += \
+./ModulePrimary/Module_PrimaryComm.d \
+./ModulePrimary/PrimaryComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModulePrimary/%.o: ../ModulePrimary/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/ModulePsuComm/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModulePsuComm/Module_PsuComm.c 
+
+OBJS += \
+./ModulePsuComm/Module_PsuComm.o 
+
+C_DEPS += \
+./ModulePsuComm/Module_PsuComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModulePsuComm/%.o: ../ModulePsuComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/ModuleUpdateFW/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleUpdateFW/Module_UpdateFW.c 
+
+OBJS += \
+./ModuleUpdateFW/Module_UpdateFW.o 
+
+C_DEPS += \
+./ModuleUpdateFW/Module_UpdateFW.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleUpdateFW/%.o: ../ModuleUpdateFW/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/SelectGun/SelectGun.d

@@ -0,0 +1 @@
+SelectGun/SelectGun.o: ../SelectGun/SelectGun.c

EVSE/Projects/DD360/Apps/Debug/SelectGun/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../SelectGun/SelectGun.c 
+
+OBJS += \
+./SelectGun/SelectGun.o 
+
+C_DEPS += \
+./SelectGun/SelectGun.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+SelectGun/%.o: ../SelectGun/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/ShareMemory/shmMem.d

@@ -0,0 +1,17 @@
+ShareMemory/shmMem.o: ../ShareMemory/shmMem.c \
+ ../ShareMemory/../Define/define.h \
+ ../ShareMemory/../SelectGun/SelectGun.h ../ShareMemory/../common.h \
+ ../ShareMemory/../Log/log.h ../ShareMemory/../Config.h \
+ ../ShareMemory/shmMem.h
+
+../ShareMemory/../Define/define.h:
+
+../ShareMemory/../SelectGun/SelectGun.h:
+
+../ShareMemory/../common.h:
+
+../ShareMemory/../Log/log.h:
+
+../ShareMemory/../Config.h:
+
+../ShareMemory/shmMem.h:

EVSE/Projects/DD360/Apps/Debug/ShareMemory/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ShareMemory/shmMem.c 
+
+OBJS += \
+./ShareMemory/shmMem.o 
+
+C_DEPS += \
+./ShareMemory/shmMem.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ShareMemory/%.o: ../ShareMemory/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Debug/makefile

@@ -0,0 +1,72 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm -rf
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include ShareMemory/subdir.mk
+-include SelectGun/subdir.mk
+-include ModuleUpdateFW/subdir.mk
+-include ModulePsuComm/subdir.mk
+-include ModulePrimary/subdir.mk
+-include ModuleLcmCtrl/subdir.mk
+-include ModuleInternalComm/subdir.mk
+-include ModuleEventLog/subdir.mk
+-include ModuleEvComm/subdir.mk
+-include ModuleDoComm/subdir.mk
+-include ModuleChkSysTask/subdir.mk
+-include Log/subdir.mk
+-include Define/subdir.mk
+-include DataBase/subdir.mk
+-include CSU/subdir.mk
+-include subdir.mk
+-include objects.mk
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(CC_DEPS)),)
+-include $(CC_DEPS)
+endif
+ifneq ($(strip $(C++_DEPS)),)
+-include $(C++_DEPS)
+endif
+ifneq ($(strip $(C_UPPER_DEPS)),)
+-include $(C_UPPER_DEPS)
+endif
+ifneq ($(strip $(CXX_DEPS)),)
+-include $(CXX_DEPS)
+endif
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+ifneq ($(strip $(CPP_DEPS)),)
+-include $(CPP_DEPS)
+endif
+endif
+
+-include ../makefile.defs
+
+# Add inputs and outputs from these tool invocations to the build variables 
+
+# All Target
+all: DD360Audi_V1.17
+
+# Tool invocations
+DD360Audi_V1.17: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: Cross G++ Linker'
+	arm-linux-gnueabihf-g++  -o "DD360Audi_V1.17" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(CC_DEPS)$(C++_DEPS)$(EXECUTABLES)$(OBJS)$(C_UPPER_DEPS)$(CXX_DEPS)$(C_DEPS)$(CPP_DEPS) DD360Audi_V1.17
+	-@echo ' '
+
+.PHONY: all clean dependents
+
+-include ../makefile.targets

EVSE/Projects/DD360/Apps/Debug/objects.mk

@@ -0,0 +1,8 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+USER_OBJS :=
+
+LIBS :=
+

EVSE/Projects/DD360/Apps/Debug/sources.mk

@@ -0,0 +1,42 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+C_UPPER_SRCS := 
+CXX_SRCS := 
+C++_SRCS := 
+OBJ_SRCS := 
+CC_SRCS := 
+ASM_SRCS := 
+C_SRCS := 
+CPP_SRCS := 
+O_SRCS := 
+S_UPPER_SRCS := 
+CC_DEPS := 
+C++_DEPS := 
+EXECUTABLES := 
+OBJS := 
+C_UPPER_DEPS := 
+CXX_DEPS := 
+C_DEPS := 
+CPP_DEPS := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+CSU \
+DataBase \
+Define \
+. \
+Log \
+ModuleChkSysTask \
+ModuleDoComm \
+ModuleEvComm \
+ModuleEventLog \
+ModuleInternalComm \
+ModuleLcmCtrl \
+ModulePrimary \
+ModulePsuComm \
+ModuleUpdateFW \
+SelectGun \
+ShareMemory \
+

EVSE/Projects/DD360/Apps/Debug/subdir.mk

@@ -0,0 +1,39 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../FactoryConfig.c \
+../OutputTask.c \
+../ReadCmdline.c \
+../common.c \
+../simulation.c \
+../timeout.c 
+
+OBJS += \
+./FactoryConfig.o \
+./OutputTask.o \
+./ReadCmdline.o \
+./common.o \
+./simulation.o \
+./timeout.o 
+
+C_DEPS += \
+./FactoryConfig.d \
+./OutputTask.d \
+./ReadCmdline.d \
+./common.d \
+./simulation.d \
+./timeout.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+%.o: ../%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360/Apps/Define/define.h

@@ -673,6 +673,7 @@ struct ChargingInfoData
     unsigned char       isEVCCIDVerify;
     unsigned char       CCSGunType;
     struct timeval      PreChargeTimer;
+    unsigned char       _SaftyDetect;
 };
 
 typedef struct

EVSE/Projects/DD360/Apps/ModuleDoComm/DoComm.c

@@ -854,6 +854,7 @@ static void addFaultCodeToBuf(uint8_t *Code)
                Code,
                strlen((char *)Code));
         pSysWarning->WarningCount++;
+        log_info("Warning Code:%s",Code);
     }
 }
 
@@ -912,7 +913,7 @@ static int powerCabinetStatusProcess(uint8_t dataLen, uint8_t *data)
     //uint8_t statusCodeError = 0;
 
     if (dataLen > 0) {
-        Hexdump((uint8_t *)data, dataLen);
+        //Hexdump((uint8_t *)data, dataLen);
 
         remaindLen = dataLen % WARNING_CODE_SIZE;
 
@@ -923,7 +924,7 @@ static int powerCabinetStatusProcess(uint8_t dataLen, uint8_t *data)
 
         if (dataLen < WARNING_CODE_SIZE) {
             log_error("fail status code length = %d", dataLen);
-            Hexdump(data, dataLen);
+            //Hexdump(data, dataLen);
             if (pSysWarning->WarningCount > 0) {
                 for (i = 0; i < pSysWarning->WarningCount; i++) {
                     usleep(128);
@@ -993,7 +994,7 @@ static int powerCabinetStatusProcess(uint8_t dataLen, uint8_t *data)
     } else {
         if (CompareArrayIsZero(data, WARNING_CODE_SIZE) == false) {
             log_error("power cabinet status code data length is zero, but have data");
-            Hexdump((uint8_t *)data, WARNING_CODE_SIZE);
+            //Hexdump((uint8_t *)data, WARNING_CODE_SIZE);
         }
     }
 
@@ -1446,9 +1447,11 @@ static int writeConnectorState(int fd, uint8_t plugNum, uint8_t id)
                     (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode,
                     WARNING_CODE_SIZE);
             vendorErrorCodeTmp[plugNum][6] = '\0';
+            /*
             log_info("1 ID = %d, VendorErrorCode = %s",
                      plugNum,
                      (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode);
+                     */
         } else {
             if (strncmp(&vendorErrorCodeTmp[plugNum][0],
                         (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode,
@@ -1458,9 +1461,11 @@ static int writeConnectorState(int fd, uint8_t plugNum, uint8_t id)
                         (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode,
                         WARNING_CODE_SIZE);
                 vendorErrorCodeTmp[plugNum][6] = '\0';
+                /*
                 log_info("2 ID = %d, VendorErrorCode = %s",
                          plugNum,
                          (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode);
+                         */
             }
         }
     }
@@ -2054,7 +2059,9 @@ static void systemStatusProcess(int fd, uint8_t totalGun, uint8_t plugNum, uint8
     case S_PREPARING_FOR_EVSE: //insaulation test
     case S_CCS_PRECHARGE_ST0:
     case S_CCS_PRECHARGE_ST1:
+
         writeChargingTarget(fd, plugNum, gunID);
+
 		if (pDcChargingInfo->PantographFlag)
 			writeGroundFaultDetection(fd, 1, gunID);
 

EVSE/Projects/DD360/Apps/ModuleLcmCtrl/Module_LcmControl.c

@@ -31,7 +31,7 @@ static struct ChargingInfoData *pDcChargingInfo = NULL;
 static struct ChargingInfoData *pAcChargingInfo = NULL;
 
 bool needReloadQr = true;
-
+bool _saftydetect = false;
 bool _isShow = false; //DS60-120 add
 uint8_t _showInformIndex = 0; //DS60-120 add
 
@@ -241,9 +241,9 @@ short __show_waitgunplug_value    = 0x0468;
 uint8_t _showwaitgunplug_left     = 80;
 uint8_t _showwaitgunplug_right    = 81;
 #else
-short __show_handshark_value    = 0x1464;
-short __show_GFD_value          = 0x1466;
-short __show_precharge_value    = 0x1468;
+short __show_handshark_value    = 0x0464;
+short __show_GFD_value          = 0x0466;
+short __show_precharge_value    = 0x0468;
 
 uint8_t _show_handshark_dark    = 67;
 uint8_t _show_handshark_light   = 68;
@@ -573,6 +573,7 @@ void ChangeWarningFunc()
     //log_info("WarningCount = %d ", pSysWarning->WarningCount);
 //#if !defined DD360 && !defined DD360Audi && !defined DD360ComBox
     for (i = 0; (i + pSysWarning->PageIndex * 5) < pSysWarning->WarningCount; i++) {
+        log_info("Warming Code[%d]:%s",i,&pSysWarning->WarningCode[i][0]);
         memset(cmd, 0x00, sizeof(cmd));
         if ((i) >= 5) {
             break;
@@ -1817,6 +1818,7 @@ void ProcessPageInfo()
 #endif //defined DD360Audi
 
     case _LCM_IDLE: {
+
         if (pSysConfig->isRFID) {
             ChangeDisplay2Value(__main_rfid, _main_rfid);
         } else {
@@ -2085,25 +2087,49 @@ void ProcessPageInfo()
             if (_currentPage == _LCM_PRE_CHARGE && !isShowAc) {
                 if (pSysInfo->CurGunSelected == i) {
                     ChangeBattMapAndValue(_currentPage, pDcChargingInfo->EvBatterySoc);
-                    uint8_t precharg_time = (GetPreChargeTimeoutValue(pDcChargingInfo->PreChargeTimer)/1.5) / uSEC_VAL;
+                    uint8_t precharg_time = (GetPreChargeTimeoutValue(pDcChargingInfo->PreChargeTimer)/1) / uSEC_VAL;
                     if (precharg_time > PRECHARGING_TTIMEOUT)
                         precharg_time = PRECHARGING_TTIMEOUT;
                     ChangeTimeValue(PRECHARGING_TTIMEOUT- precharg_time);
 
                     if (pDcChargingInfo->SystemStatus >= S_REASSIGN_CHECK &&
                             pDcChargingInfo->SystemStatus <= S_PREPARING_FOR_EV) {
+                        pDcChargingInfo->_SaftyDetect = false;
                         ChangeDisplay2Value(__show_handshark_value, _show_handshark_light);
                         ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
                         ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+
                     } else if (pDcChargingInfo->SystemStatus == S_PREPARING_FOR_EVSE) {
-                        ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
-                        ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
-                        ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                        if (pDcChargingInfo->Type == _Type_Chademo || pDcChargingInfo->Type == _Type_GB) {
+                            if (pDcChargingInfo->_SaftyDetect == false ) {
+                                ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                                ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
+                                ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                                if (pDcChargingInfo->EvBatterytargetVoltage == 0)
+                                    pDcChargingInfo->_SaftyDetect = true;
+                            } else {
+                                ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                                ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
+                                ChangeDisplay2Value(__show_precharge_value, _show_precharge_light);
+                            }
+                        } else {
+                            ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                            ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
+                            ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                        }
                     } else if (pDcChargingInfo->SystemStatus == S_CCS_PRECHARGE_ST0 ||
                             pDcChargingInfo->SystemStatus == S_CCS_PRECHARGE_ST1) {
-                        ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
-                        ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
-                        ChangeDisplay2Value(__show_precharge_value, _show_precharge_light);
+                        if (pDcChargingInfo->_SaftyDetect == false ) {
+                            ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                            ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
+                            ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                            if (pDcChargingInfo->EvBatterytargetVoltage == 0)
+                                pDcChargingInfo->_SaftyDetect = true;
+                        } else {
+                            ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                            ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
+                            ChangeDisplay2Value(__show_precharge_value, _show_precharge_light);
+                        }
                     } else {
                         ChangeDisplay2Value(__show_handshark_value, _disappear);
                         ChangeDisplay2Value(__show_GFD_value, _disappear);

EVSE/Projects/DD360Audi/Apps/CSU/main.c

@@ -83,7 +83,7 @@ uint8_t bd1_1_status = 0;
 uint8_t bd1_2_status = 0;
 
 char *fwVersion = "V1.19.00.0000.00"; // "V0.16.00.0000.00";
-char* DebugVersion = "v1.19.2";
+char* DebugVersion = "v1.19.3";
 //sqlite3 *localDb;
 bool isDb_ready;
 
@@ -4797,6 +4797,7 @@ int main(void)
                         pSysInfo->OrderCharging = NO_DEFINE;
                     }
                     StopSystemTimeoutDet();
+                    gettimeofday(&pDcChargingInfo->PreChargeTimer, NULL);
                 }
 
                 isRessign = NO;

EVSE/Projects/DD360Audi/Apps/Debug/CSU/subdir.mk

@@ -0,0 +1,45 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../CSU/Ethernet.c \
+../CSU/OCPP.c \
+../CSU/Primary.c \
+../CSU/RFID.c \
+../CSU/SelfTest.c \
+../CSU/WatchDog.c \
+../CSU/ZipFile.c \
+../CSU/main.c 
+
+OBJS += \
+./CSU/Ethernet.o \
+./CSU/OCPP.o \
+./CSU/Primary.o \
+./CSU/RFID.o \
+./CSU/SelfTest.o \
+./CSU/WatchDog.o \
+./CSU/ZipFile.o \
+./CSU/main.o 
+
+C_DEPS += \
+./CSU/Ethernet.d \
+./CSU/OCPP.d \
+./CSU/Primary.d \
+./CSU/RFID.d \
+./CSU/SelfTest.d \
+./CSU/WatchDog.d \
+./CSU/ZipFile.d \
+./CSU/main.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+CSU/%.o: ../CSU/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/DataBase/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../DataBase/DataBase.c 
+
+OBJS += \
+./DataBase/DataBase.o 
+
+C_DEPS += \
+./DataBase/DataBase.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+DataBase/%.o: ../DataBase/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/Define/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Define/define.c 
+
+OBJS += \
+./Define/define.o 
+
+C_DEPS += \
+./Define/define.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Define/%.o: ../Define/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/Log/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Log/log.c 
+
+OBJS += \
+./Log/log.o 
+
+C_DEPS += \
+./Log/log.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Log/%.o: ../Log/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/ModuleChkSysTask/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleChkSysTask/Module_ChkSysTask.c 
+
+OBJS += \
+./ModuleChkSysTask/Module_ChkSysTask.o 
+
+C_DEPS += \
+./ModuleChkSysTask/Module_ChkSysTask.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleChkSysTask/%.o: ../ModuleChkSysTask/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/ModuleDoComm/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleDoComm/DoComm.c 
+
+OBJS += \
+./ModuleDoComm/DoComm.o 
+
+C_DEPS += \
+./ModuleDoComm/DoComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleDoComm/%.o: ../ModuleDoComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/ModuleEvComm/subdir.mk

@@ -0,0 +1,42 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleEvComm/AbnormalCCS.c \
+../ModuleEvComm/AbnormalCHA.c \
+../ModuleEvComm/AbnormalGBT.c \
+../ModuleEvComm/AbnormalState.c \
+../ModuleEvComm/Ev_Comm.c \
+../ModuleEvComm/Module_EvRxComm.c \
+../ModuleEvComm/Module_EvTxComm.c 
+
+OBJS += \
+./ModuleEvComm/AbnormalCCS.o \
+./ModuleEvComm/AbnormalCHA.o \
+./ModuleEvComm/AbnormalGBT.o \
+./ModuleEvComm/AbnormalState.o \
+./ModuleEvComm/Ev_Comm.o \
+./ModuleEvComm/Module_EvRxComm.o \
+./ModuleEvComm/Module_EvTxComm.o 
+
+C_DEPS += \
+./ModuleEvComm/AbnormalCCS.d \
+./ModuleEvComm/AbnormalCHA.d \
+./ModuleEvComm/AbnormalGBT.d \
+./ModuleEvComm/AbnormalState.d \
+./ModuleEvComm/Ev_Comm.d \
+./ModuleEvComm/Module_EvRxComm.d \
+./ModuleEvComm/Module_EvTxComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleEvComm/%.o: ../ModuleEvComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/ModuleEventLog/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleEventLog/Module_EventLogging.c 
+
+OBJS += \
+./ModuleEventLog/Module_EventLogging.o 
+
+C_DEPS += \
+./ModuleEventLog/Module_EventLogging.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleEventLog/%.o: ../ModuleEventLog/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/ModuleInternalComm/subdir.mk

@@ -0,0 +1,42 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleInternalComm/AcPlug.c \
+../ModuleInternalComm/FanBoard.c \
+../ModuleInternalComm/LEDlight.c \
+../ModuleInternalComm/Module_InternalComm.c \
+../ModuleInternalComm/Module_InternalCommOrg.c \
+../ModuleInternalComm/RelayBoard.c \
+../ModuleInternalComm/internalComm.c 
+
+OBJS += \
+./ModuleInternalComm/AcPlug.o \
+./ModuleInternalComm/FanBoard.o \
+./ModuleInternalComm/LEDlight.o \
+./ModuleInternalComm/Module_InternalComm.o \
+./ModuleInternalComm/Module_InternalCommOrg.o \
+./ModuleInternalComm/RelayBoard.o \
+./ModuleInternalComm/internalComm.o 
+
+C_DEPS += \
+./ModuleInternalComm/AcPlug.d \
+./ModuleInternalComm/FanBoard.d \
+./ModuleInternalComm/LEDlight.d \
+./ModuleInternalComm/Module_InternalComm.d \
+./ModuleInternalComm/Module_InternalCommOrg.d \
+./ModuleInternalComm/RelayBoard.d \
+./ModuleInternalComm/internalComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleInternalComm/%.o: ../ModuleInternalComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/ModuleLcmCtrl/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleLcmCtrl/Module_LcmControl.c 
+
+OBJS += \
+./ModuleLcmCtrl/Module_LcmControl.o 
+
+C_DEPS += \
+./ModuleLcmCtrl/Module_LcmControl.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleLcmCtrl/%.o: ../ModuleLcmCtrl/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/ModulePrimary/subdir.mk

@@ -0,0 +1,27 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModulePrimary/Module_PrimaryComm.c \
+../ModulePrimary/PrimaryComm.c 
+
+OBJS += \
+./ModulePrimary/Module_PrimaryComm.o \
+./ModulePrimary/PrimaryComm.o 
+
+C_DEPS += \
+./ModulePrimary/Module_PrimaryComm.d \
+./ModulePrimary/PrimaryComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModulePrimary/%.o: ../ModulePrimary/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/ModulePsuComm/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModulePsuComm/Module_PsuComm.c 
+
+OBJS += \
+./ModulePsuComm/Module_PsuComm.o 
+
+C_DEPS += \
+./ModulePsuComm/Module_PsuComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModulePsuComm/%.o: ../ModulePsuComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/ModuleUpdateFW/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleUpdateFW/Module_UpdateFW.c 
+
+OBJS += \
+./ModuleUpdateFW/Module_UpdateFW.o 
+
+C_DEPS += \
+./ModuleUpdateFW/Module_UpdateFW.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleUpdateFW/%.o: ../ModuleUpdateFW/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/SelectGun/SelectGun.d

@@ -0,0 +1 @@
+SelectGun/SelectGun.o: ../SelectGun/SelectGun.c

EVSE/Projects/DD360Audi/Apps/Debug/SelectGun/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../SelectGun/SelectGun.c 
+
+OBJS += \
+./SelectGun/SelectGun.o 
+
+C_DEPS += \
+./SelectGun/SelectGun.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+SelectGun/%.o: ../SelectGun/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/ShareMemory/shmMem.d

@@ -0,0 +1,17 @@
+ShareMemory/shmMem.o: ../ShareMemory/shmMem.c \
+ ../ShareMemory/../Define/define.h \
+ ../ShareMemory/../SelectGun/SelectGun.h ../ShareMemory/../common.h \
+ ../ShareMemory/../Log/log.h ../ShareMemory/../Config.h \
+ ../ShareMemory/shmMem.h
+
+../ShareMemory/../Define/define.h:
+
+../ShareMemory/../SelectGun/SelectGun.h:
+
+../ShareMemory/../common.h:
+
+../ShareMemory/../Log/log.h:
+
+../ShareMemory/../Config.h:
+
+../ShareMemory/shmMem.h:

EVSE/Projects/DD360Audi/Apps/Debug/ShareMemory/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ShareMemory/shmMem.c 
+
+OBJS += \
+./ShareMemory/shmMem.o 
+
+C_DEPS += \
+./ShareMemory/shmMem.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ShareMemory/%.o: ../ShareMemory/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Debug/makefile

@@ -0,0 +1,72 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm -rf
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include ShareMemory/subdir.mk
+-include SelectGun/subdir.mk
+-include ModuleUpdateFW/subdir.mk
+-include ModulePsuComm/subdir.mk
+-include ModulePrimary/subdir.mk
+-include ModuleLcmCtrl/subdir.mk
+-include ModuleInternalComm/subdir.mk
+-include ModuleEventLog/subdir.mk
+-include ModuleEvComm/subdir.mk
+-include ModuleDoComm/subdir.mk
+-include ModuleChkSysTask/subdir.mk
+-include Log/subdir.mk
+-include Define/subdir.mk
+-include DataBase/subdir.mk
+-include CSU/subdir.mk
+-include subdir.mk
+-include objects.mk
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(CC_DEPS)),)
+-include $(CC_DEPS)
+endif
+ifneq ($(strip $(C++_DEPS)),)
+-include $(C++_DEPS)
+endif
+ifneq ($(strip $(C_UPPER_DEPS)),)
+-include $(C_UPPER_DEPS)
+endif
+ifneq ($(strip $(CXX_DEPS)),)
+-include $(CXX_DEPS)
+endif
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+ifneq ($(strip $(CPP_DEPS)),)
+-include $(CPP_DEPS)
+endif
+endif
+
+-include ../makefile.defs
+
+# Add inputs and outputs from these tool invocations to the build variables 
+
+# All Target
+all: DD360Audi_V1.17
+
+# Tool invocations
+DD360Audi_V1.17: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: Cross G++ Linker'
+	arm-linux-gnueabihf-g++  -o "DD360Audi_V1.17" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(CC_DEPS)$(C++_DEPS)$(EXECUTABLES)$(OBJS)$(C_UPPER_DEPS)$(CXX_DEPS)$(C_DEPS)$(CPP_DEPS) DD360Audi_V1.17
+	-@echo ' '
+
+.PHONY: all clean dependents
+
+-include ../makefile.targets

EVSE/Projects/DD360Audi/Apps/Debug/objects.mk

@@ -0,0 +1,8 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+USER_OBJS :=
+
+LIBS :=
+

EVSE/Projects/DD360Audi/Apps/Debug/sources.mk

@@ -0,0 +1,42 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+C_UPPER_SRCS := 
+CXX_SRCS := 
+C++_SRCS := 
+OBJ_SRCS := 
+CC_SRCS := 
+ASM_SRCS := 
+C_SRCS := 
+CPP_SRCS := 
+O_SRCS := 
+S_UPPER_SRCS := 
+CC_DEPS := 
+C++_DEPS := 
+EXECUTABLES := 
+OBJS := 
+C_UPPER_DEPS := 
+CXX_DEPS := 
+C_DEPS := 
+CPP_DEPS := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+CSU \
+DataBase \
+Define \
+. \
+Log \
+ModuleChkSysTask \
+ModuleDoComm \
+ModuleEvComm \
+ModuleEventLog \
+ModuleInternalComm \
+ModuleLcmCtrl \
+ModulePrimary \
+ModulePsuComm \
+ModuleUpdateFW \
+SelectGun \
+ShareMemory \
+

EVSE/Projects/DD360Audi/Apps/Debug/subdir.mk

@@ -0,0 +1,39 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../FactoryConfig.c \
+../OutputTask.c \
+../ReadCmdline.c \
+../common.c \
+../simulation.c \
+../timeout.c 
+
+OBJS += \
+./FactoryConfig.o \
+./OutputTask.o \
+./ReadCmdline.o \
+./common.o \
+./simulation.o \
+./timeout.o 
+
+C_DEPS += \
+./FactoryConfig.d \
+./OutputTask.d \
+./ReadCmdline.d \
+./common.d \
+./simulation.d \
+./timeout.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+%.o: ../%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360Audi/Apps/Define/define.h

@@ -673,6 +673,7 @@ struct ChargingInfoData
     unsigned char       isEVCCIDVerify;
     unsigned char       CCSGunType;
     struct timeval      PreChargeTimer;
+    unsigned char       _SaftyDetect;
 };
 
 typedef struct

EVSE/Projects/DD360Audi/Apps/ModuleDoComm/DoComm.c

@@ -854,6 +854,7 @@ static void addFaultCodeToBuf(uint8_t *Code)
                Code,
                strlen((char *)Code));
         pSysWarning->WarningCount++;
+        log_info("Warning Code:%s",Code);
     }
 }
 
@@ -912,7 +913,7 @@ static int powerCabinetStatusProcess(uint8_t dataLen, uint8_t *data)
     //uint8_t statusCodeError = 0;
 
     if (dataLen > 0) {
-        Hexdump((uint8_t *)data, dataLen);
+        //Hexdump((uint8_t *)data, dataLen);
 
         remaindLen = dataLen % WARNING_CODE_SIZE;
 
@@ -923,7 +924,7 @@ static int powerCabinetStatusProcess(uint8_t dataLen, uint8_t *data)
 
         if (dataLen < WARNING_CODE_SIZE) {
             log_error("fail status code length = %d", dataLen);
-            Hexdump(data, dataLen);
+            //Hexdump(data, dataLen);
             if (pSysWarning->WarningCount > 0) {
                 for (i = 0; i < pSysWarning->WarningCount; i++) {
                     usleep(128);
@@ -993,7 +994,7 @@ static int powerCabinetStatusProcess(uint8_t dataLen, uint8_t *data)
     } else {
         if (CompareArrayIsZero(data, WARNING_CODE_SIZE) == false) {
             log_error("power cabinet status code data length is zero, but have data");
-            Hexdump((uint8_t *)data, WARNING_CODE_SIZE);
+            //Hexdump((uint8_t *)data, WARNING_CODE_SIZE);
         }
     }
 
@@ -1446,9 +1447,11 @@ static int writeConnectorState(int fd, uint8_t plugNum, uint8_t id)
                     (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode,
                     WARNING_CODE_SIZE);
             vendorErrorCodeTmp[plugNum][6] = '\0';
+            /*
             log_info("1 ID = %d, VendorErrorCode = %s",
                      plugNum,
                      (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode);
+                     */
         } else {
             if (strncmp(&vendorErrorCodeTmp[plugNum][0],
                         (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode,
@@ -1458,9 +1461,11 @@ static int writeConnectorState(int fd, uint8_t plugNum, uint8_t id)
                         (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode,
                         WARNING_CODE_SIZE);
                 vendorErrorCodeTmp[plugNum][6] = '\0';
+                /*
                 log_info("2 ID = %d, VendorErrorCode = %s",
                          plugNum,
                          (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode);
+                         */
             }
         }
     }
@@ -2054,7 +2059,9 @@ static void systemStatusProcess(int fd, uint8_t totalGun, uint8_t plugNum, uint8
     case S_PREPARING_FOR_EVSE: //insaulation test
     case S_CCS_PRECHARGE_ST0:
     case S_CCS_PRECHARGE_ST1:
+
         writeChargingTarget(fd, plugNum, gunID);
+
 		if (pDcChargingInfo->PantographFlag)
 			writeGroundFaultDetection(fd, 1, gunID);
 

EVSE/Projects/DD360Audi/Apps/ModuleLcmCtrl/Module_LcmControl.c

@@ -31,7 +31,7 @@ static struct ChargingInfoData *pDcChargingInfo = NULL;
 static struct ChargingInfoData *pAcChargingInfo = NULL;
 
 bool needReloadQr = true;
-
+bool _saftydetect = false;
 bool _isShow = false; //DS60-120 add
 uint8_t _showInformIndex = 0; //DS60-120 add
 
@@ -241,9 +241,9 @@ short __show_waitgunplug_value    = 0x0468;
 uint8_t _showwaitgunplug_left     = 80;
 uint8_t _showwaitgunplug_right    = 81;
 #else
-short __show_handshark_value    = 0x1464;
-short __show_GFD_value          = 0x1466;
-short __show_precharge_value    = 0x1468;
+short __show_handshark_value    = 0x0464;
+short __show_GFD_value          = 0x0466;
+short __show_precharge_value    = 0x0468;
 
 uint8_t _show_handshark_dark    = 67;
 uint8_t _show_handshark_light   = 68;
@@ -573,6 +573,7 @@ void ChangeWarningFunc()
     //log_info("WarningCount = %d ", pSysWarning->WarningCount);
 //#if !defined DD360 && !defined DD360Audi && !defined DD360ComBox
     for (i = 0; (i + pSysWarning->PageIndex * 5) < pSysWarning->WarningCount; i++) {
+        log_info("Warming Code[%d]:%s",i,&pSysWarning->WarningCode[i][0]);
         memset(cmd, 0x00, sizeof(cmd));
         if ((i) >= 5) {
             break;
@@ -1817,6 +1818,7 @@ void ProcessPageInfo()
 #endif //defined DD360Audi
 
     case _LCM_IDLE: {
+
         if (pSysConfig->isRFID) {
             ChangeDisplay2Value(__main_rfid, _main_rfid);
         } else {
@@ -2085,25 +2087,49 @@ void ProcessPageInfo()
             if (_currentPage == _LCM_PRE_CHARGE && !isShowAc) {
                 if (pSysInfo->CurGunSelected == i) {
                     ChangeBattMapAndValue(_currentPage, pDcChargingInfo->EvBatterySoc);
-                    uint8_t precharg_time = (GetPreChargeTimeoutValue(pDcChargingInfo->PreChargeTimer)/1.5) / uSEC_VAL;
+                    uint8_t precharg_time = (GetPreChargeTimeoutValue(pDcChargingInfo->PreChargeTimer)/1) / uSEC_VAL;
                     if (precharg_time > PRECHARGING_TTIMEOUT)
                         precharg_time = PRECHARGING_TTIMEOUT;
                     ChangeTimeValue(PRECHARGING_TTIMEOUT- precharg_time);
 
                     if (pDcChargingInfo->SystemStatus >= S_REASSIGN_CHECK &&
                             pDcChargingInfo->SystemStatus <= S_PREPARING_FOR_EV) {
+                        pDcChargingInfo->_SaftyDetect = false;
                         ChangeDisplay2Value(__show_handshark_value, _show_handshark_light);
                         ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
                         ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+
                     } else if (pDcChargingInfo->SystemStatus == S_PREPARING_FOR_EVSE) {
-                        ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
-                        ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
-                        ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                        if (pDcChargingInfo->Type == _Type_Chademo || pDcChargingInfo->Type == _Type_GB) {
+                            if (pDcChargingInfo->_SaftyDetect == false ) {
+                                ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                                ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
+                                ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                                if (pDcChargingInfo->EvBatterytargetVoltage == 0)
+                                    pDcChargingInfo->_SaftyDetect = true;
+                            } else {
+                                ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                                ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
+                                ChangeDisplay2Value(__show_precharge_value, _show_precharge_light);
+                            }
+                        } else {
+                            ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                            ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
+                            ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                        }
                     } else if (pDcChargingInfo->SystemStatus == S_CCS_PRECHARGE_ST0 ||
                             pDcChargingInfo->SystemStatus == S_CCS_PRECHARGE_ST1) {
-                        ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
-                        ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
-                        ChangeDisplay2Value(__show_precharge_value, _show_precharge_light);
+                        if (pDcChargingInfo->_SaftyDetect == false ) {
+                            ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                            ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
+                            ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                            if (pDcChargingInfo->EvBatterytargetVoltage == 0)
+                                pDcChargingInfo->_SaftyDetect = true;
+                        } else {
+                            ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                            ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
+                            ChangeDisplay2Value(__show_precharge_value, _show_precharge_light);
+                        }
                     } else {
                         ChangeDisplay2Value(__show_handshark_value, _disappear);
                         ChangeDisplay2Value(__show_GFD_value, _disappear);

EVSE/Projects/DD360ComBox/Apps/CSU/main.c

@@ -83,7 +83,7 @@ uint8_t bd1_1_status = 0;
 uint8_t bd1_2_status = 0;
 
 char *fwVersion = "V1.19.00.0000.00"; // "V0.16.00.0000.00";
-char* DebugVersion = "v1.19.2";
+char* DebugVersion = "v1.19.3";
 //sqlite3 *localDb;
 bool isDb_ready;
 
@@ -4797,6 +4797,7 @@ int main(void)
                         pSysInfo->OrderCharging = NO_DEFINE;
                     }
                     StopSystemTimeoutDet();
+                    gettimeofday(&pDcChargingInfo->PreChargeTimer, NULL);
                 }
 
                 isRessign = NO;

EVSE/Projects/DD360ComBox/Apps/Debug/CSU/subdir.mk

@@ -0,0 +1,45 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../CSU/Ethernet.c \
+../CSU/OCPP.c \
+../CSU/Primary.c \
+../CSU/RFID.c \
+../CSU/SelfTest.c \
+../CSU/WatchDog.c \
+../CSU/ZipFile.c \
+../CSU/main.c 
+
+OBJS += \
+./CSU/Ethernet.o \
+./CSU/OCPP.o \
+./CSU/Primary.o \
+./CSU/RFID.o \
+./CSU/SelfTest.o \
+./CSU/WatchDog.o \
+./CSU/ZipFile.o \
+./CSU/main.o 
+
+C_DEPS += \
+./CSU/Ethernet.d \
+./CSU/OCPP.d \
+./CSU/Primary.d \
+./CSU/RFID.d \
+./CSU/SelfTest.d \
+./CSU/WatchDog.d \
+./CSU/ZipFile.d \
+./CSU/main.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+CSU/%.o: ../CSU/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/DataBase/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../DataBase/DataBase.c 
+
+OBJS += \
+./DataBase/DataBase.o 
+
+C_DEPS += \
+./DataBase/DataBase.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+DataBase/%.o: ../DataBase/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/Define/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Define/define.c 
+
+OBJS += \
+./Define/define.o 
+
+C_DEPS += \
+./Define/define.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Define/%.o: ../Define/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/Log/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Log/log.c 
+
+OBJS += \
+./Log/log.o 
+
+C_DEPS += \
+./Log/log.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Log/%.o: ../Log/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/ModuleChkSysTask/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleChkSysTask/Module_ChkSysTask.c 
+
+OBJS += \
+./ModuleChkSysTask/Module_ChkSysTask.o 
+
+C_DEPS += \
+./ModuleChkSysTask/Module_ChkSysTask.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleChkSysTask/%.o: ../ModuleChkSysTask/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/ModuleDoComm/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleDoComm/DoComm.c 
+
+OBJS += \
+./ModuleDoComm/DoComm.o 
+
+C_DEPS += \
+./ModuleDoComm/DoComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleDoComm/%.o: ../ModuleDoComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/ModuleEvComm/subdir.mk

@@ -0,0 +1,42 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleEvComm/AbnormalCCS.c \
+../ModuleEvComm/AbnormalCHA.c \
+../ModuleEvComm/AbnormalGBT.c \
+../ModuleEvComm/AbnormalState.c \
+../ModuleEvComm/Ev_Comm.c \
+../ModuleEvComm/Module_EvRxComm.c \
+../ModuleEvComm/Module_EvTxComm.c 
+
+OBJS += \
+./ModuleEvComm/AbnormalCCS.o \
+./ModuleEvComm/AbnormalCHA.o \
+./ModuleEvComm/AbnormalGBT.o \
+./ModuleEvComm/AbnormalState.o \
+./ModuleEvComm/Ev_Comm.o \
+./ModuleEvComm/Module_EvRxComm.o \
+./ModuleEvComm/Module_EvTxComm.o 
+
+C_DEPS += \
+./ModuleEvComm/AbnormalCCS.d \
+./ModuleEvComm/AbnormalCHA.d \
+./ModuleEvComm/AbnormalGBT.d \
+./ModuleEvComm/AbnormalState.d \
+./ModuleEvComm/Ev_Comm.d \
+./ModuleEvComm/Module_EvRxComm.d \
+./ModuleEvComm/Module_EvTxComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleEvComm/%.o: ../ModuleEvComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/ModuleEventLog/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleEventLog/Module_EventLogging.c 
+
+OBJS += \
+./ModuleEventLog/Module_EventLogging.o 
+
+C_DEPS += \
+./ModuleEventLog/Module_EventLogging.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleEventLog/%.o: ../ModuleEventLog/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/ModuleInternalComm/subdir.mk

@@ -0,0 +1,42 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleInternalComm/AcPlug.c \
+../ModuleInternalComm/FanBoard.c \
+../ModuleInternalComm/LEDlight.c \
+../ModuleInternalComm/Module_InternalComm.c \
+../ModuleInternalComm/Module_InternalCommOrg.c \
+../ModuleInternalComm/RelayBoard.c \
+../ModuleInternalComm/internalComm.c 
+
+OBJS += \
+./ModuleInternalComm/AcPlug.o \
+./ModuleInternalComm/FanBoard.o \
+./ModuleInternalComm/LEDlight.o \
+./ModuleInternalComm/Module_InternalComm.o \
+./ModuleInternalComm/Module_InternalCommOrg.o \
+./ModuleInternalComm/RelayBoard.o \
+./ModuleInternalComm/internalComm.o 
+
+C_DEPS += \
+./ModuleInternalComm/AcPlug.d \
+./ModuleInternalComm/FanBoard.d \
+./ModuleInternalComm/LEDlight.d \
+./ModuleInternalComm/Module_InternalComm.d \
+./ModuleInternalComm/Module_InternalCommOrg.d \
+./ModuleInternalComm/RelayBoard.d \
+./ModuleInternalComm/internalComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleInternalComm/%.o: ../ModuleInternalComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/ModuleLcmCtrl/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleLcmCtrl/Module_LcmControl.c 
+
+OBJS += \
+./ModuleLcmCtrl/Module_LcmControl.o 
+
+C_DEPS += \
+./ModuleLcmCtrl/Module_LcmControl.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleLcmCtrl/%.o: ../ModuleLcmCtrl/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/ModulePrimary/subdir.mk

@@ -0,0 +1,27 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModulePrimary/Module_PrimaryComm.c \
+../ModulePrimary/PrimaryComm.c 
+
+OBJS += \
+./ModulePrimary/Module_PrimaryComm.o \
+./ModulePrimary/PrimaryComm.o 
+
+C_DEPS += \
+./ModulePrimary/Module_PrimaryComm.d \
+./ModulePrimary/PrimaryComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModulePrimary/%.o: ../ModulePrimary/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/ModulePsuComm/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModulePsuComm/Module_PsuComm.c 
+
+OBJS += \
+./ModulePsuComm/Module_PsuComm.o 
+
+C_DEPS += \
+./ModulePsuComm/Module_PsuComm.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModulePsuComm/%.o: ../ModulePsuComm/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/ModuleUpdateFW/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ModuleUpdateFW/Module_UpdateFW.c 
+
+OBJS += \
+./ModuleUpdateFW/Module_UpdateFW.o 
+
+C_DEPS += \
+./ModuleUpdateFW/Module_UpdateFW.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ModuleUpdateFW/%.o: ../ModuleUpdateFW/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/SelectGun/SelectGun.d

@@ -0,0 +1 @@
+SelectGun/SelectGun.o: ../SelectGun/SelectGun.c

EVSE/Projects/DD360ComBox/Apps/Debug/SelectGun/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../SelectGun/SelectGun.c 
+
+OBJS += \
+./SelectGun/SelectGun.o 
+
+C_DEPS += \
+./SelectGun/SelectGun.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+SelectGun/%.o: ../SelectGun/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/ShareMemory/shmMem.d

@@ -0,0 +1,17 @@
+ShareMemory/shmMem.o: ../ShareMemory/shmMem.c \
+ ../ShareMemory/../Define/define.h \
+ ../ShareMemory/../SelectGun/SelectGun.h ../ShareMemory/../common.h \
+ ../ShareMemory/../Log/log.h ../ShareMemory/../Config.h \
+ ../ShareMemory/shmMem.h
+
+../ShareMemory/../Define/define.h:
+
+../ShareMemory/../SelectGun/SelectGun.h:
+
+../ShareMemory/../common.h:
+
+../ShareMemory/../Log/log.h:
+
+../ShareMemory/../Config.h:
+
+../ShareMemory/shmMem.h:

EVSE/Projects/DD360ComBox/Apps/Debug/ShareMemory/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../ShareMemory/shmMem.c 
+
+OBJS += \
+./ShareMemory/shmMem.o 
+
+C_DEPS += \
+./ShareMemory/shmMem.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+ShareMemory/%.o: ../ShareMemory/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Debug/makefile

@@ -0,0 +1,72 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm -rf
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include ShareMemory/subdir.mk
+-include SelectGun/subdir.mk
+-include ModuleUpdateFW/subdir.mk
+-include ModulePsuComm/subdir.mk
+-include ModulePrimary/subdir.mk
+-include ModuleLcmCtrl/subdir.mk
+-include ModuleInternalComm/subdir.mk
+-include ModuleEventLog/subdir.mk
+-include ModuleEvComm/subdir.mk
+-include ModuleDoComm/subdir.mk
+-include ModuleChkSysTask/subdir.mk
+-include Log/subdir.mk
+-include Define/subdir.mk
+-include DataBase/subdir.mk
+-include CSU/subdir.mk
+-include subdir.mk
+-include objects.mk
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(CC_DEPS)),)
+-include $(CC_DEPS)
+endif
+ifneq ($(strip $(C++_DEPS)),)
+-include $(C++_DEPS)
+endif
+ifneq ($(strip $(C_UPPER_DEPS)),)
+-include $(C_UPPER_DEPS)
+endif
+ifneq ($(strip $(CXX_DEPS)),)
+-include $(CXX_DEPS)
+endif
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+ifneq ($(strip $(CPP_DEPS)),)
+-include $(CPP_DEPS)
+endif
+endif
+
+-include ../makefile.defs
+
+# Add inputs and outputs from these tool invocations to the build variables 
+
+# All Target
+all: DD360Audi_V1.17
+
+# Tool invocations
+DD360Audi_V1.17: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: Cross G++ Linker'
+	arm-linux-gnueabihf-g++  -o "DD360Audi_V1.17" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(CC_DEPS)$(C++_DEPS)$(EXECUTABLES)$(OBJS)$(C_UPPER_DEPS)$(CXX_DEPS)$(C_DEPS)$(CPP_DEPS) DD360Audi_V1.17
+	-@echo ' '
+
+.PHONY: all clean dependents
+
+-include ../makefile.targets

EVSE/Projects/DD360ComBox/Apps/Debug/objects.mk

@@ -0,0 +1,8 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+USER_OBJS :=
+
+LIBS :=
+

EVSE/Projects/DD360ComBox/Apps/Debug/sources.mk

@@ -0,0 +1,42 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+C_UPPER_SRCS := 
+CXX_SRCS := 
+C++_SRCS := 
+OBJ_SRCS := 
+CC_SRCS := 
+ASM_SRCS := 
+C_SRCS := 
+CPP_SRCS := 
+O_SRCS := 
+S_UPPER_SRCS := 
+CC_DEPS := 
+C++_DEPS := 
+EXECUTABLES := 
+OBJS := 
+C_UPPER_DEPS := 
+CXX_DEPS := 
+C_DEPS := 
+CPP_DEPS := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+CSU \
+DataBase \
+Define \
+. \
+Log \
+ModuleChkSysTask \
+ModuleDoComm \
+ModuleEvComm \
+ModuleEventLog \
+ModuleInternalComm \
+ModuleLcmCtrl \
+ModulePrimary \
+ModulePsuComm \
+ModuleUpdateFW \
+SelectGun \
+ShareMemory \
+

EVSE/Projects/DD360ComBox/Apps/Debug/subdir.mk

@@ -0,0 +1,39 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../FactoryConfig.c \
+../OutputTask.c \
+../ReadCmdline.c \
+../common.c \
+../simulation.c \
+../timeout.c 
+
+OBJS += \
+./FactoryConfig.o \
+./OutputTask.o \
+./ReadCmdline.o \
+./common.o \
+./simulation.o \
+./timeout.o 
+
+C_DEPS += \
+./FactoryConfig.d \
+./OutputTask.d \
+./ReadCmdline.d \
+./common.d \
+./simulation.d \
+./timeout.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+%.o: ../%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: Cross GCC Compiler'
+	arm-linux-gnueabihf-gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

EVSE/Projects/DD360ComBox/Apps/Define/define.h

@@ -673,6 +673,7 @@ struct ChargingInfoData
     unsigned char       isEVCCIDVerify;
     unsigned char       CCSGunType;
     struct timeval      PreChargeTimer;
+    unsigned char       _SaftyDetect;
 };
 
 typedef struct

EVSE/Projects/DD360ComBox/Apps/ModuleDoComm/DoComm.c

@@ -854,6 +854,7 @@ static void addFaultCodeToBuf(uint8_t *Code)
                Code,
                strlen((char *)Code));
         pSysWarning->WarningCount++;
+        log_info("Warning Code:%s",Code);
     }
 }
 
@@ -912,7 +913,7 @@ static int powerCabinetStatusProcess(uint8_t dataLen, uint8_t *data)
     //uint8_t statusCodeError = 0;
 
     if (dataLen > 0) {
-        Hexdump((uint8_t *)data, dataLen);
+        //Hexdump((uint8_t *)data, dataLen);
 
         remaindLen = dataLen % WARNING_CODE_SIZE;
 
@@ -923,7 +924,7 @@ static int powerCabinetStatusProcess(uint8_t dataLen, uint8_t *data)
 
         if (dataLen < WARNING_CODE_SIZE) {
             log_error("fail status code length = %d", dataLen);
-            Hexdump(data, dataLen);
+            //Hexdump(data, dataLen);
             if (pSysWarning->WarningCount > 0) {
                 for (i = 0; i < pSysWarning->WarningCount; i++) {
                     usleep(128);
@@ -993,7 +994,7 @@ static int powerCabinetStatusProcess(uint8_t dataLen, uint8_t *data)
     } else {
         if (CompareArrayIsZero(data, WARNING_CODE_SIZE) == false) {
             log_error("power cabinet status code data length is zero, but have data");
-            Hexdump((uint8_t *)data, WARNING_CODE_SIZE);
+            //Hexdump((uint8_t *)data, WARNING_CODE_SIZE);
         }
     }
 
@@ -1446,9 +1447,11 @@ static int writeConnectorState(int fd, uint8_t plugNum, uint8_t id)
                     (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode,
                     WARNING_CODE_SIZE);
             vendorErrorCodeTmp[plugNum][6] = '\0';
+            /*
             log_info("1 ID = %d, VendorErrorCode = %s",
                      plugNum,
                      (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode);
+                     */
         } else {
             if (strncmp(&vendorErrorCodeTmp[plugNum][0],
                         (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode,
@@ -1458,9 +1461,11 @@ static int writeConnectorState(int fd, uint8_t plugNum, uint8_t id)
                         (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode,
                         WARNING_CODE_SIZE);
                 vendorErrorCodeTmp[plugNum][6] = '\0';
+                /*
                 log_info("2 ID = %d, VendorErrorCode = %s",
                          plugNum,
                          (char *)ShmOCPP16Data->StatusNotification[plugNum].VendorErrorCode);
+                         */
             }
         }
     }
@@ -2054,7 +2059,9 @@ static void systemStatusProcess(int fd, uint8_t totalGun, uint8_t plugNum, uint8
     case S_PREPARING_FOR_EVSE: //insaulation test
     case S_CCS_PRECHARGE_ST0:
     case S_CCS_PRECHARGE_ST1:
+
         writeChargingTarget(fd, plugNum, gunID);
+
 		if (pDcChargingInfo->PantographFlag)
 			writeGroundFaultDetection(fd, 1, gunID);
 

EVSE/Projects/DD360ComBox/Apps/ModuleLcmCtrl/Module_LcmControl.c

@@ -31,7 +31,7 @@ static struct ChargingInfoData *pDcChargingInfo = NULL;
 static struct ChargingInfoData *pAcChargingInfo = NULL;
 
 bool needReloadQr = true;
-
+bool _saftydetect = false;
 bool _isShow = false; //DS60-120 add
 uint8_t _showInformIndex = 0; //DS60-120 add
 
@@ -241,9 +241,9 @@ short __show_waitgunplug_value    = 0x0468;
 uint8_t _showwaitgunplug_left     = 80;
 uint8_t _showwaitgunplug_right    = 81;
 #else
-short __show_handshark_value    = 0x1464;
-short __show_GFD_value          = 0x1466;
-short __show_precharge_value    = 0x1468;
+short __show_handshark_value    = 0x0464;
+short __show_GFD_value          = 0x0466;
+short __show_precharge_value    = 0x0468;
 
 uint8_t _show_handshark_dark    = 67;
 uint8_t _show_handshark_light   = 68;
@@ -573,6 +573,7 @@ void ChangeWarningFunc()
     //log_info("WarningCount = %d ", pSysWarning->WarningCount);
 //#if !defined DD360 && !defined DD360Audi && !defined DD360ComBox
     for (i = 0; (i + pSysWarning->PageIndex * 5) < pSysWarning->WarningCount; i++) {
+        log_info("Warming Code[%d]:%s",i,&pSysWarning->WarningCode[i][0]);
         memset(cmd, 0x00, sizeof(cmd));
         if ((i) >= 5) {
             break;
@@ -1817,6 +1818,7 @@ void ProcessPageInfo()
 #endif //defined DD360Audi
 
     case _LCM_IDLE: {
+
         if (pSysConfig->isRFID) {
             ChangeDisplay2Value(__main_rfid, _main_rfid);
         } else {
@@ -2085,25 +2087,49 @@ void ProcessPageInfo()
             if (_currentPage == _LCM_PRE_CHARGE && !isShowAc) {
                 if (pSysInfo->CurGunSelected == i) {
                     ChangeBattMapAndValue(_currentPage, pDcChargingInfo->EvBatterySoc);
-                    uint8_t precharg_time = (GetPreChargeTimeoutValue(pDcChargingInfo->PreChargeTimer)/1.5) / uSEC_VAL;
+                    uint8_t precharg_time = (GetPreChargeTimeoutValue(pDcChargingInfo->PreChargeTimer)/1) / uSEC_VAL;
                     if (precharg_time > PRECHARGING_TTIMEOUT)
                         precharg_time = PRECHARGING_TTIMEOUT;
                     ChangeTimeValue(PRECHARGING_TTIMEOUT- precharg_time);
 
                     if (pDcChargingInfo->SystemStatus >= S_REASSIGN_CHECK &&
                             pDcChargingInfo->SystemStatus <= S_PREPARING_FOR_EV) {
+                        pDcChargingInfo->_SaftyDetect = false;
                         ChangeDisplay2Value(__show_handshark_value, _show_handshark_light);
                         ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
                         ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+
                     } else if (pDcChargingInfo->SystemStatus == S_PREPARING_FOR_EVSE) {
-                        ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
-                        ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
-                        ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                        if (pDcChargingInfo->Type == _Type_Chademo || pDcChargingInfo->Type == _Type_GB) {
+                            if (pDcChargingInfo->_SaftyDetect == false ) {
+                                ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                                ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
+                                ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                                if (pDcChargingInfo->EvBatterytargetVoltage == 0)
+                                    pDcChargingInfo->_SaftyDetect = true;
+                            } else {
+                                ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                                ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
+                                ChangeDisplay2Value(__show_precharge_value, _show_precharge_light);
+                            }
+                        } else {
+                            ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                            ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
+                            ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                        }
                     } else if (pDcChargingInfo->SystemStatus == S_CCS_PRECHARGE_ST0 ||
                             pDcChargingInfo->SystemStatus == S_CCS_PRECHARGE_ST1) {
-                        ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
-                        ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
-                        ChangeDisplay2Value(__show_precharge_value, _show_precharge_light);
+                        if (pDcChargingInfo->_SaftyDetect == false ) {
+                            ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                            ChangeDisplay2Value(__show_GFD_value, _show_GFD_light);
+                            ChangeDisplay2Value(__show_precharge_value, _show_precharge_dark);
+                            if (pDcChargingInfo->EvBatterytargetVoltage == 0)
+                                pDcChargingInfo->_SaftyDetect = true;
+                        } else {
+                            ChangeDisplay2Value(__show_handshark_value, _show_handshark_dark);
+                            ChangeDisplay2Value(__show_GFD_value, _show_GFD_dark);
+                            ChangeDisplay2Value(__show_precharge_value, _show_precharge_light);
+                        }
                     } else {
                         ChangeDisplay2Value(__show_handshark_value, _disappear);
                         ChangeDisplay2Value(__show_GFD_value, _disappear);