Forráskód Böngészése

2020-09-24 / Eason Yang
Action
1) Rename : Version
2) Improve : DHCP client script add google and baidu dns server
3) Implement : Schedule start/stop function
4) Improve : pkill Module_InternalComm when internal communcation is fail 100 times
5) Improve : all debug log output formar and timming
6) Improve : deleted db record when records is over 2000

File
1) main.c
Action 1
Action 2
Action 3
Action 5
Action 6

2)Module_Speaker.c
Action 5

3)Module_AlarmDetect.c
Action 5

4)Module_InternalComm.c
Action 4
Action 5

Version :V0.58.XX.XXXX.XX

8009 4 éve
szülő
commit
f4ae1d3663

+ 54 - 54
EVSE/Projects/AW-Regular/Apps/Module_AlarmDetect.c

@@ -176,14 +176,14 @@ int InitShareMemory()
    	if ((MeterSMId = shmget(ShmChargerKey, sizeof(struct Charger), 0777)) < 0)
 	{
 
-		DEBUG_ERROR("shmget ShmCharger NG\r\n");
+		DEBUG_ERROR("shmget ShmCharger NG\n");
 
 		result = FAIL;
 	}
 	else if ((ShmCharger = shmat(MeterSMId, NULL, 0)) == (void *) -1)
 	{
 
-		DEBUG_ERROR("shmat ShmCharger NG\r\n");
+		DEBUG_ERROR("shmat ShmCharger NG\n");
 
 		result = FAIL;
 	}
@@ -194,14 +194,14 @@ int InitShareMemory()
 	if ((MeterSMId = shmget(ShmOcppModuleKey, sizeof(struct OCPP16Data), 0777)) < 0)
 	{
 
-		DEBUG_ERROR("shmget ShmOCPP16Data NG\r\n");
+		DEBUG_ERROR("shmget ShmOCPP16Data NG\n");
 
 		result = FAIL;
 	}
 	else if ((ShmOCPP16Data = shmat(MeterSMId, NULL, 0)) == (void *) -1)
 	{
 
-		DEBUG_ERROR("shmat ShmOCPP16Data NG\r\n");
+		DEBUG_ERROR("shmat ShmOCPP16Data NG\n");
 
 		result = FAIL;
 	}
@@ -272,7 +272,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL1InputOVP = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_OVER_VOLTAGE;
-						DEBUG_INFO("ALARM_OVER_VOLTAGE : alarm \r\n");
+						DEBUG_INFO("ALARM_OVER_VOLTAGE : alarm \n");
 					}
 				}
 				else
@@ -287,7 +287,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL1InputOVP = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_OVER_VOLTAGE;
-					DEBUG_INFO("ALARM_OVER_VOLTAGE : recover \r\n");
+					DEBUG_INFO("ALARM_OVER_VOLTAGE : recover \n");
 				}
 			}
 
@@ -301,7 +301,7 @@ int main(void)
 						{
 							ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL2InputOVP = ON;
 							ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_OVER_VOLTAGE;
-							DEBUG_INFO("ALARM_OVER_VOLTAGE : alarm \r\n");
+							DEBUG_INFO("ALARM_OVER_VOLTAGE : alarm \n");
 						}
 					}
 					else
@@ -316,7 +316,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL2InputOVP = OFF;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_OVER_VOLTAGE;
-						DEBUG_INFO("ALARM_OVER_VOLTAGE : recover \r\n");
+						DEBUG_INFO("ALARM_OVER_VOLTAGE : recover \n");
 					}
 				}
 
@@ -328,7 +328,7 @@ int main(void)
 						{
 							ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL3InputOVP = ON;
 							ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_OVER_VOLTAGE;
-							DEBUG_INFO("ALARM_OVER_VOLTAGE : alarm \r\n");
+							DEBUG_INFO("ALARM_OVER_VOLTAGE : alarm \n");
 						}
 					}
 					else
@@ -343,7 +343,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL3InputOVP = OFF;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_OVER_VOLTAGE;
-						DEBUG_INFO("ALARM_OVER_VOLTAGE : recover \r\n");
+						DEBUG_INFO("ALARM_OVER_VOLTAGE : recover \n");
 					}
 				}
 			}
@@ -359,7 +359,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL1InputUVP = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_UNDER_VOLTAGE;
-						DEBUG_INFO("ALARM_UNDER_VOLTAGE : alarm \r\n");
+						DEBUG_INFO("ALARM_UNDER_VOLTAGE : alarm \n");
 					}
 				}
 				else
@@ -374,7 +374,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL1InputUVP = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_UNDER_VOLTAGE;
-					DEBUG_INFO("ALARM_UNDER_VOLTAGE : recover \r\n");
+					DEBUG_INFO("ALARM_UNDER_VOLTAGE : recover \n");
 				}
 			}
 
@@ -388,7 +388,7 @@ int main(void)
 						{
 							ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL2InputUVP = ON;
 							ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_UNDER_VOLTAGE;
-							DEBUG_INFO("ALARM_UNDER_VOLTAGE : alarm \r\n");
+							DEBUG_INFO("ALARM_UNDER_VOLTAGE : alarm \n");
 						}
 					}
 					else
@@ -403,7 +403,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL2InputUVP = OFF;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_UNDER_VOLTAGE;
-						DEBUG_INFO("ALARM_UNDER_VOLTAGE : recover \r\n");
+						DEBUG_INFO("ALARM_UNDER_VOLTAGE : recover \n");
 					}
 				}
 
@@ -415,7 +415,7 @@ int main(void)
 						{
 							ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL3InputUVP = ON;
 							ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_UNDER_VOLTAGE;
-							DEBUG_INFO("ALARM_UNDER_VOLTAGE : alarm \r\n");
+							DEBUG_INFO("ALARM_UNDER_VOLTAGE : alarm \n");
 						}
 					}
 					else
@@ -430,7 +430,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL3InputUVP = OFF;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_UNDER_VOLTAGE;
-						DEBUG_INFO("ALARM_UNDER_VOLTAGE : recover \r\n");
+						DEBUG_INFO("ALARM_UNDER_VOLTAGE : recover \n");
 					}
 				}
 			}
@@ -444,7 +444,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCP = ON;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_OVER_CURRENT;
-					DEBUG_INFO("ALARM_OVER_CURRENT : alarm \r\n");
+					DEBUG_INFO("ALARM_OVER_CURRENT : alarm \n");
 				}
 			}
 			else if ((!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_OVER_CURRENT)))
@@ -453,7 +453,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCP = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_OVER_CURRENT;
-					DEBUG_INFO("ALARM_OVER_CURRENT : recover \r\n");
+					DEBUG_INFO("ALARM_OVER_CURRENT : recover \n");
 				}
 			}
 
@@ -465,7 +465,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCP = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_OVER_CURRENT;
-						DEBUG_INFO("ALARM_OVER_CURRENT : alarm \r\n");
+						DEBUG_INFO("ALARM_OVER_CURRENT : alarm \n");
 					}
 				}
 				else if ((!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_OVER_CURRENT)))
@@ -474,7 +474,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCP = OFF;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_OVER_CURRENT;
-						DEBUG_INFO("ALARM_OVER_CURRENT : recover \r\n");
+						DEBUG_INFO("ALARM_OVER_CURRENT : recover \n");
 					}
 				}
 
@@ -484,7 +484,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCP = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_OVER_CURRENT;
-						DEBUG_INFO("ALARM_OVER_CURRENT : alarm \r\n");
+						DEBUG_INFO("ALARM_OVER_CURRENT : alarm \n");
 					}
 				}
 				else if ((!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_OVER_CURRENT)))
@@ -493,7 +493,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCP = OFF;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_OVER_CURRENT;
-						DEBUG_INFO("ALARM_OVER_CURRENT : recover \r\n");
+						DEBUG_INFO("ALARM_OVER_CURRENT : recover \n");
 					}
 				}
 			}
@@ -509,7 +509,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAmbientOTP = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_OVER_TEMPERATURE;
-						DEBUG_INFO("ALARM_OVER_TEMPERATURE : alarm \r\n");
+						DEBUG_INFO("ALARM_OVER_TEMPERATURE : alarm \n");
 					}
 				}
 				else
@@ -524,7 +524,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAmbientOTP = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_OVER_TEMPERATURE;
-					DEBUG_INFO("ALARM_OVER_TEMPERATURE : recover \r\n");
+					DEBUG_INFO("ALARM_OVER_TEMPERATURE : recover \n");
 				}
 			}
 
@@ -539,7 +539,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.AcGroundfaultFail = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_GROUND_FAIL;
-						DEBUG_INFO("ALARM_GROUND_FAIL : alarm \r\n");
+						DEBUG_INFO("ALARM_GROUND_FAIL : alarm \n");
 					}
 				}
 				else
@@ -554,7 +554,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.AcGroundfaultFail = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_GROUND_FAIL;
-					DEBUG_INFO("ALARM_GROUND_FAIL : recover \r\n");
+					DEBUG_INFO("ALARM_GROUND_FAIL : recover \n");
 				}
 			}
 
@@ -569,7 +569,7 @@ int main(void)
 					{
 						ShmStatusCodeData->InfoCode.InfoEvents.bits.PilotFault = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_CP_ERROR;
-						DEBUG_INFO("ALARM_CP_ERROR : alarm \r\n");
+						DEBUG_INFO("ALARM_CP_ERROR : alarm \n");
 					}
 				}
 				else
@@ -584,7 +584,7 @@ int main(void)
 				{
 					ShmStatusCodeData->InfoCode.InfoEvents.bits.PilotFault = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_CP_ERROR;
-					DEBUG_INFO("ALARM_CP_ERROR : recover \r\n");
+					DEBUG_INFO("ALARM_CP_ERROR : recover \n");
 				}
 			}
 
@@ -603,13 +603,13 @@ int main(void)
 						{
 							ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_CURRENT_LEAK_AC;
 							ShmCharger->gun_info[gun_index].otherAlarmCode.isACLeakage = ON;
-							DEBUG_INFO("ALARM_CURRENT_LEAK_AC : alarm \r\n");
+							DEBUG_INFO("ALARM_CURRENT_LEAK_AC : alarm \n");
 						}
 						else if(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_CURRENT_LEAK_DC)
 						{
 							ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_CURRENT_LEAK_DC;
 							ShmCharger->gun_info[gun_index].otherAlarmCode.isDcLeakage = ON;
-							DEBUG_INFO("ALARM_CURRENT_LEAK_DC : alarm \r\n");
+							DEBUG_INFO("ALARM_CURRENT_LEAK_DC : alarm \n");
 						}
 					}
 				}
@@ -629,13 +629,13 @@ int main(void)
 					{
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_CURRENT_LEAK_AC;
 						ShmCharger->gun_info[gun_index].otherAlarmCode.isACLeakage = OFF;
-						DEBUG_INFO("ALARM_CURRENT_LEAK_AC : recover \r\n");
+						DEBUG_INFO("ALARM_CURRENT_LEAK_AC : recover \n");
 					}
 					else if(ShmCharger->gun_info[gun_index].otherAlarmCode.isDcLeakage == ON)
 					{
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_CURRENT_LEAK_DC;
 						ShmCharger->gun_info[gun_index].otherAlarmCode.isDcLeakage = OFF;
-						DEBUG_INFO("ALARM_CURRENT_LEAK_DC : recover \r\n");
+						DEBUG_INFO("ALARM_CURRENT_LEAK_DC : recover \n");
 					}
 				}
 			}
@@ -651,7 +651,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.McuSelftestFail = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_MCU_TESTFAIL;
-						DEBUG_INFO("ALARM_MCU_TESTFAIL : alarm \r\n");
+						DEBUG_INFO("ALARM_MCU_TESTFAIL : alarm \n");
 					}
 				}
 				else
@@ -666,7 +666,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.McuSelftestFail = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_MCU_TESTFAIL;
-					DEBUG_INFO("ALARM_MCU_TESTFAIL : recover \r\n");
+					DEBUG_INFO("ALARM_MCU_TESTFAIL : recover \n");
 				}
 			}
 
@@ -679,7 +679,7 @@ int main(void)
 				{
 					ShmCharger->gun_info[gun_index].otherAlarmCode.isHandshakingTimeOut  = ON;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_HANDSHAKE_TIMEOUT;
-					DEBUG_INFO("ALARM_HANDSHAKE_TIMEOUT : alarm \r\n");
+					DEBUG_INFO("ALARM_HANDSHAKE_TIMEOUT : alarm \n");
 				}
 
 			}
@@ -689,7 +689,7 @@ int main(void)
 				{
 					ShmCharger->gun_info[gun_index].otherAlarmCode.isHandshakingTimeOut  = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_HANDSHAKE_TIMEOUT;
-					DEBUG_INFO("ALARM_HANDSHAKE_TIMEOUT : recover \r\n");
+					DEBUG_INFO("ALARM_HANDSHAKE_TIMEOUT : recover \n");
 				}
 			}
 
@@ -704,7 +704,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.EmergencyStopTrip = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_EMERGENCY_STOP;
-						DEBUG_INFO("ALARM_EMERGENCY_STOP : alarm \r\n");
+						DEBUG_INFO("ALARM_EMERGENCY_STOP : alarm \n");
 					}
 				}
 				else
@@ -719,7 +719,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.EmergencyStopTrip = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_EMERGENCY_STOP;
-					DEBUG_INFO("ALARM_EMERGENCY_STOP : recover \r\n");
+					DEBUG_INFO("ALARM_EMERGENCY_STOP : recover \n");
 				}
 			}
 
@@ -734,7 +734,7 @@ int main(void)
 					{
 						ShmStatusCodeData->FaultCode.FaultEvents.bits.AcOutputRelayWelding = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_RELAY_WELDING;
-						DEBUG_INFO("ALARM_RELAY_STATUS : alarm \r\n");
+						DEBUG_INFO("ALARM_RELAY_STATUS : alarm \n");
 					}
 				}
 				else
@@ -749,7 +749,7 @@ int main(void)
 				{
 					ShmStatusCodeData->FaultCode.FaultEvents.bits.AcOutputRelayWelding = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_RELAY_WELDING;
-					DEBUG_INFO("ALARM_RELAY_STATUS : recover \r\n");
+					DEBUG_INFO("ALARM_RELAY_STATUS : recover \n");
 				}
 			}
 
@@ -764,7 +764,7 @@ int main(void)
 					{
 						ShmStatusCodeData->FaultCode.FaultEvents.bits.AcOutputRelayDrivingFault = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_RELAY_DRIVE_FAULT;
-						DEBUG_INFO("ALARM_RELAY_DRIVE_FAULT : alarm \r\n");
+						DEBUG_INFO("ALARM_RELAY_DRIVE_FAULT : alarm \n");
 					}
 				}
 				else
@@ -779,7 +779,7 @@ int main(void)
 				{
 					ShmStatusCodeData->FaultCode.FaultEvents.bits.AcOutputRelayDrivingFault = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_RELAY_DRIVE_FAULT;
-					DEBUG_INFO("ALARM_RELAY_DRIVE_FAULT : recover \r\n");
+					DEBUG_INFO("ALARM_RELAY_DRIVE_FAULT : recover \n");
 				}
 			}
 
@@ -794,7 +794,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CircuitShort = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_CURRENT_SHORT;
-						DEBUG_INFO("ALARM_CIRCUIT_SHORT : alarm \r\n");
+						DEBUG_INFO("ALARM_CIRCUIT_SHORT : alarm \n");
 					}
 				}
 				else
@@ -809,7 +809,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CircuitShort = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_CURRENT_SHORT;
-					DEBUG_INFO("ALARM_CIRCUIT_SHORT : recover \r\n");
+					DEBUG_INFO("ALARM_CIRCUIT_SHORT : recover \n");
 				}
 			}
 
@@ -822,7 +822,7 @@ int main(void)
 				{
 					ShmStatusCodeData->FaultCode.FaultEvents.bits.RotarySwitchFault = ON;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_ROTATORY_SWITCH_FAULT;
-					DEBUG_INFO("ALARM_ROTATORY_SWITCH_FAULT : alarm \r\n");
+					DEBUG_INFO("ALARM_ROTATORY_SWITCH_FAULT : alarm \n");
 				}
 			}
 			else if(!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_ROTATORY_SWITCH_FAULT))
@@ -831,7 +831,7 @@ int main(void)
 				{
 					ShmStatusCodeData->FaultCode.FaultEvents.bits.RotarySwitchFault = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_ROTATORY_SWITCH_FAULT;
-					DEBUG_INFO("ALARM_ROTATORY_SWITCH_FAULT : recover \r\n");
+					DEBUG_INFO("ALARM_ROTATORY_SWITCH_FAULT : recover \n");
 				}
 			}
 
@@ -844,7 +844,7 @@ int main(void)
 				{
 					ShmStatusCodeData->FaultCode.FaultEvents.bits.RcdSelfTestFail = ON;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_LEAK_MODULE_FAIL;
-					DEBUG_INFO("ALARM_LEAK_MODULE_FAIL : alarm \r\n");
+					DEBUG_INFO("ALARM_LEAK_MODULE_FAIL : alarm \n");
 				}
 			}
 			else if(!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_LEAK_MODULE_FAIL))
@@ -853,7 +853,7 @@ int main(void)
 				{
 					ShmStatusCodeData->FaultCode.FaultEvents.bits.RcdSelfTestFail = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_LEAK_MODULE_FAIL;
-					DEBUG_INFO("ALARM_LEAK_MODULE_FAIL : recover \r\n");
+					DEBUG_INFO("ALARM_LEAK_MODULE_FAIL : recover \n");
 				}
 			}
 
@@ -866,7 +866,7 @@ int main(void)
 				{
 					ShmStatusCodeData->FaultCode.FaultEvents.bits.ShutterFault = ON;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_SHUTTER_FAULT;
-					DEBUG_INFO("ALARM_SHUTTER_FAULT : alarm \r\n");
+					DEBUG_INFO("ALARM_SHUTTER_FAULT : alarm \n");
 				}
 			}
 			else if(!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_SHUTTER_FAULT))
@@ -875,7 +875,7 @@ int main(void)
 				{
 					ShmStatusCodeData->FaultCode.FaultEvents.bits.ShutterFault = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_SHUTTER_FAULT;
-					DEBUG_INFO("ALARM_SHUTTER_FAULT : recover \r\n");
+					DEBUG_INFO("ALARM_SHUTTER_FAULT : recover \n");
 				}
 			}
 
@@ -888,7 +888,7 @@ int main(void)
 				{
 					ShmStatusCodeData->FaultCode.FaultEvents.bits.AcConnectorLockFail = ON;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_LOCKER_FAULT;
-					DEBUG_INFO("ALARM_LOCKER_FAULT : alarm \r\n");
+					DEBUG_INFO("ALARM_LOCKER_FAULT : alarm \n");
 				}
 			}
 			else if(!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_LOCKER_FAULT))
@@ -897,7 +897,7 @@ int main(void)
 				{
 					ShmStatusCodeData->FaultCode.FaultEvents.bits.AcConnectorLockFail = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_LOCKER_FAULT;
-					DEBUG_INFO("ALARM_LOCKER_FAULT : recover \r\n");
+					DEBUG_INFO("ALARM_LOCKER_FAULT : recover \n");
 				}
 			}
 
@@ -910,7 +910,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL1InputDrop = ON;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_POWER_DROP;
-					DEBUG_INFO("ALARM_POWER_DROP : alarm \r\n");
+					DEBUG_INFO("ALARM_POWER_DROP : alarm \n");
 				}
 			}
 			else if(!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_POWER_DROP))
@@ -919,7 +919,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemL1InputDrop = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_POWER_DROP;
-					DEBUG_INFO("ALARM_POWER_DROP : recover \r\n");
+					DEBUG_INFO("ALARM_POWER_DROP : recover \n");
 				}
 			}
 

+ 160 - 158
EVSE/Projects/AW-Regular/Apps/Module_InternalComm.c

@@ -221,14 +221,14 @@ int InitShareMemory()
 	if ((MeterSMId = shmget(ShmPrimaryMcuKey, sizeof(struct PrimaryMcuData), 0777)) < 0)
 	{
 		#ifdef SystemLogMessage
-		DEBUG_ERROR("shmget ShmPrimaryMcuData NG\r\n");
+		DEBUG_ERROR("shmget ShmPrimaryMcuData NG\n");
 		#endif
 		result = FAIL;
 	}
 	else if ((ShmPrimaryMcuData = shmat(MeterSMId, NULL, 0)) == (void *) -1)
 	{
 		#ifdef SystemLogMessage
-		DEBUG_ERROR("shmat ShmPrimaryMcuData NG\r\n");
+		DEBUG_ERROR("shmat ShmPrimaryMcuData NG\n");
 		#endif
 		result = FAIL;
 	}
@@ -255,14 +255,14 @@ int InitShareMemory()
 	if ((MeterSMId = shmget(ShmChargerKey, sizeof(struct Charger), 0777)) < 0)
 	{
 		#ifdef SystemLogMessage
-		DEBUG_ERROR("shmget ShmChargerKey NG\r\n");
+		DEBUG_ERROR("shmget ShmChargerKey NG\n");
 		#endif
 		result = FAIL;
 	}
 	else if ((ShmCharger = shmat(MeterSMId, NULL, 0)) == (void *) -1)
 	{
 		#ifdef SystemLogMessage
-		DEBUG_ERROR("shmat ShmChargerKey NG\r\n");
+		DEBUG_ERROR("shmat ShmChargerKey NG\n");
 		#endif
 		result = FAIL;
 	}
@@ -1758,7 +1758,7 @@ int main(void)
 	}
 	else
 	{
-		DEBUG_INFO("InitShareMemory OK.\r\n");
+		DEBUG_INFO("InitShareMemory OK.\n");
 	}
 
 	Uart1Fd=InitComPort();
@@ -1774,7 +1774,7 @@ int main(void)
 	}
 	else
 	{
-		DEBUG_INFO("ttyS1 port open success.\r\n");
+		DEBUG_INFO("ttyS1 port open success.\n");
 	}
 
 	for(;;)
@@ -1800,7 +1800,7 @@ int main(void)
 				}
 				else
 				{
-					DEBUG_WARN("MCU-%d set led fail...%d\r\n", gun_index, failCount[gun_index]);
+					DEBUG_WARN("MCU-%d set led fail...%d\n", gun_index, failCount[gun_index]);
 					if(failCount[gun_index]<1000)
 					{
 						failCount[gun_index]++;
@@ -1816,7 +1816,7 @@ int main(void)
 				}
 				else
 				{
-					DEBUG_WARN("MCU-%d set relay request fail...%d\r\n", gun_index, failCount[gun_index]);
+					DEBUG_WARN("MCU-%d set relay request fail...%d\n", gun_index, failCount[gun_index]);
 					if(failCount[gun_index]<1000)
 					{
 						failCount[gun_index]++;
@@ -1838,7 +1838,7 @@ int main(void)
 				}
 				else
 				{
-					DEBUG_WARN("MCU-%d get status fail...%d\r\n", gun_index, failCount[gun_index]);
+					DEBUG_WARN("MCU-%d get status fail...%d\n", gun_index, failCount[gun_index]);
 					if(failCount[gun_index]<1000)
 					{
 						failCount[gun_index]++;
@@ -1850,7 +1850,7 @@ int main(void)
 				//===============================
 				if(Query_AC_MCU_Alarm(Uart1Fd, (gun_index>0?ADDR_AC_PRIMARY_2:ADDR_AC_PRIMARY_1), &ShmCharger->gun_info[gun_index].primaryMcuAlarm))
 				{
-					//DEBUG_INFO("MCU-%d get alarm code success.\r\n",gun_index);
+					//DEBUG_INFO("MCU-%d get alarm code success.\n",gun_index);
 
 					//================================================
 					// Byte[6]
@@ -1971,7 +1971,7 @@ int main(void)
 				}
 				else
 				{
-					DEBUG_WARN("MCU-%d get alarm fail...%d\r\n", gun_index, failCount[gun_index]);
+					DEBUG_WARN("MCU-%d get alarm fail...%d\n", gun_index, failCount[gun_index]);
 					if(failCount[gun_index]<1000)
 					{
 						failCount[gun_index]++;
@@ -1991,7 +1991,7 @@ int main(void)
 				}
 				else
 				{
-					DEBUG_WARN("MCU-%d get ble config fail...%d\r\n", gun_index, failCount[gun_index]);
+					DEBUG_WARN("MCU-%d get ble config fail...%d\n", gun_index, failCount[gun_index]);
 					if(failCount[gun_index]<1000)
 					{
 						failCount[gun_index]++;
@@ -2009,7 +2009,7 @@ int main(void)
 				}
 				else
 				{
-					DEBUG_WARN("MCU-%d get ble login central id fail...%d\r\n", gun_index, failCount[gun_index]);
+					DEBUG_WARN("MCU-%d get ble login central id fail...%d\n", gun_index, failCount[gun_index]);
 					if(failCount[gun_index]<1000)
 					{
 						failCount[gun_index]++;
@@ -2025,10 +2025,10 @@ int main(void)
 					{
 						if(Config_AC_MCU_RESET_REQUEST(Uart1Fd, (gun_index>0?ADDR_AC_PRIMARY_2:ADDR_AC_PRIMARY_1), &ShmCharger->gun_info[gun_index].mcuResetRequest) == PASS)
 						{
-							DEBUG_INFO("**************************************************\r\n");
-							DEBUG_INFO("********* High priority polling : Case 7 *********\r\n");
-							DEBUG_INFO("**************************************************\r\n");
-							DEBUG_INFO("MCU-%d set MCU reset Request : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].mcuResetRequest.isMcuResetRequest);
+							DEBUG_INFO("**************************************************\n");
+							DEBUG_INFO("********* High priority polling : Case 7 *********\n");
+							DEBUG_INFO("**************************************************\n");
+							DEBUG_INFO("MCU-%d set MCU reset Request : %d\n", gun_index, ShmCharger->gun_info[gun_index].mcuResetRequest.isMcuResetRequest);
 
 							ShmCharger->gun_info[gun_index].mcuResetRequest.isMcuResetRequest = OFF;
 
@@ -2036,7 +2036,7 @@ int main(void)
 						}
 						else
 						{
-							DEBUG_WARN("MCU-%d get MCU reset fail...%d\r\n", gun_index, failCount[gun_index]);
+							DEBUG_WARN("MCU-%d get MCU reset fail...%d\n", gun_index, failCount[gun_index]);
 							if(failCount[gun_index]<1000)
 							{
 								failCount[gun_index]++;
@@ -2066,39 +2066,39 @@ int main(void)
 					//===============================
 					// Config primary MCU LED
 					//===============================
-					DEBUG_INFO("**************************************************\r\n");
-					DEBUG_INFO("********* High priority polling : Case 1 *********\r\n");
-					DEBUG_INFO("**************************************************\r\n");
-					DEBUG_INFO("MCU-%d set Led mode : %d\r\n",gun_index, ShmCharger->gun_info[gun_index].primaryMcuLed.mode);
-					DEBUG_INFO("MCU-%d set Alarm code : %x\r\n",gun_index, ShmCharger->gun_info[gun_index].primaryMcuLed.alarm_code);
+					DEBUG_INFO("**************************************************\n");
+					DEBUG_INFO("********* High priority polling : Case 1 *********\n");
+					DEBUG_INFO("**************************************************\n");
+					DEBUG_INFO("MCU-%d set Led mode : %d\n",gun_index, ShmCharger->gun_info[gun_index].primaryMcuLed.mode);
+					DEBUG_INFO("MCU-%d set Alarm code : %x\n",gun_index, ShmCharger->gun_info[gun_index].primaryMcuLed.alarm_code);
 
 					//===============================
 					// Config primary Legacy request
 					//===============================
-					DEBUG_INFO("**************************************************\r\n");
-					DEBUG_INFO("********* High priority polling : Case 2 *********\r\n");
-					DEBUG_INFO("**************************************************\r\n");
-					DEBUG_INFO("MCU-%d set relay request : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].legacyRequest.isLegacyRequest);
+					DEBUG_INFO("**************************************************\n");
+					DEBUG_INFO("********* High priority polling : Case 2 *********\n");
+					DEBUG_INFO("**************************************************\n");
+					DEBUG_INFO("MCU-%d set relay request : %d\n", gun_index, ShmCharger->gun_info[gun_index].legacyRequest.isLegacyRequest);
 
 					//===============================
 					// Query primary MCU status
 					//===============================
-					DEBUG_INFO("**************************************************\r\n");
-					DEBUG_INFO("********* High priority polling : Case 3 *********\r\n");
-					DEBUG_INFO("**************************************************\r\n");
-					DEBUG_INFO("MCU-%d get Pilot State : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.cp_state);
-					DEBUG_INFO("MCU-%d get Pilot Duty : %.2f\r\n", gun_index, (float)ShmCharger->gun_info[gun_index].primaryMcuState.current_limit);
-					DEBUG_INFO("MCU-%d get Pilot Voltage Positive : %.2f\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.cp_voltage_positive);
-					DEBUG_INFO("MCU-%d get Pilot Voltage Negative : %.2f\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.cp_voltage_negtive);
-					DEBUG_INFO("MCU-%d get Relay State : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.relay_state);
-					DEBUG_INFO("MCU-%d get Rating Current : %.2f\r\n", gun_index, (float)ShmCharger->gun_info[gun_index].primaryMcuState.rating_current);
-					DEBUG_INFO("MCU-%d get Rotary switch : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.rotatory_switch);
+					DEBUG_INFO("**************************************************\n");
+					DEBUG_INFO("********* High priority polling : Case 3 *********\n");
+					DEBUG_INFO("**************************************************\n");
+					DEBUG_INFO("MCU-%d get Pilot State : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.cp_state);
+					DEBUG_INFO("MCU-%d get Pilot Duty : %.2f\n", gun_index, (float)ShmCharger->gun_info[gun_index].primaryMcuState.current_limit);
+					DEBUG_INFO("MCU-%d get Pilot Voltage Positive : %.2f\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.cp_voltage_positive);
+					DEBUG_INFO("MCU-%d get Pilot Voltage Negative : %.2f\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.cp_voltage_negtive);
+					DEBUG_INFO("MCU-%d get Relay State : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.relay_state);
+					DEBUG_INFO("MCU-%d get Rating Current : %.2f\n", gun_index, (float)ShmCharger->gun_info[gun_index].primaryMcuState.rating_current);
+					DEBUG_INFO("MCU-%d get Rotary switch : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.rotatory_switch);
 
 					/*
-					DEBUG_INFO("MCU-%d get Locker State : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.locker_state);
-					DEBUG_INFO("MCU-%d get Shutter State : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.shutter_state);
-					DEBUG_INFO("MCU-%d get Meter State : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.meter_state);
-					DEBUG_INFO("MCU-%d get PP State : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.pp_state);
+					DEBUG_INFO("MCU-%d get Locker State : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.locker_state);
+					DEBUG_INFO("MCU-%d get Shutter State : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.shutter_state);
+					DEBUG_INFO("MCU-%d get Meter State : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.meter_state);
+					DEBUG_INFO("MCU-%d get PP State : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.pp_state);
 										*/
 
 					//===============================
@@ -2106,29 +2106,29 @@ int main(void)
 					//===============================
 					if((ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode>0))
 					{
-						DEBUG_INFO("**************************************************\r\n");
-						DEBUG_INFO("********* High priority polling : Case 4 *********\r\n");
-						DEBUG_INFO("**************************************************\r\n");
-						DEBUG_INFO("MCU-%d get OVP : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.OVP);
-						DEBUG_INFO("MCU-%d get UVP : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.UVP);
-						DEBUG_INFO("MCU-%d get OCP : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.OCP);
-						DEBUG_INFO("MCU-%d get OTP : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.OTP);
-						DEBUG_INFO("MCU-%d get gmi_fault : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.gmi_fault);
-						DEBUG_INFO("MCU-%d get cp_fault : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.cp_fault);
-						DEBUG_INFO("MCU-%d get ac_leak : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.ac_leak);
-						DEBUG_INFO("MCU-%d get dc_leak : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.dc_leak);
-						DEBUG_INFO("MCU-%d get mcu_selftest_fail : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.mcu_selftest_fail);
-						DEBUG_INFO("MCU-%d get handshaking_timeout : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.handshaking_timeout);
-						DEBUG_INFO("MCU-%d get emergency_stop : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.emergency_stop);
-						DEBUG_INFO("MCU-%d get relay_welding : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.relay_welding);
-						DEBUG_INFO("MCU-%d get leak_module_fail : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.leak_module_fail);
-						DEBUG_INFO("MCU-%d get shutter_fault : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.shutter_fault);
-						DEBUG_INFO("MCU-%d get locker_fault : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.locker_fault);
-						DEBUG_INFO("MCU-%d get power_drop : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.power_drop);
-						DEBUG_INFO("MCU-%d get circuit_short : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.circuit_short);
-						DEBUG_INFO("MCU-%d get set_circuit : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.set_circuit);
-						DEBUG_INFO("MCU-%d get relay_drive_fault : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.relay_drive_fault);
-						DEBUG_INFO("MCU-%d get InputAlarmCode : %x\r\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode);
+						DEBUG_INFO("**************************************************\n");
+						DEBUG_INFO("********* High priority polling : Case 4 *********\n");
+						DEBUG_INFO("**************************************************\n");
+						DEBUG_INFO("MCU-%d get OVP : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.OVP);
+						DEBUG_INFO("MCU-%d get UVP : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.UVP);
+						DEBUG_INFO("MCU-%d get OCP : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.OCP);
+						DEBUG_INFO("MCU-%d get OTP : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.OTP);
+						DEBUG_INFO("MCU-%d get gmi_fault : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.gmi_fault);
+						DEBUG_INFO("MCU-%d get cp_fault : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.cp_fault);
+						DEBUG_INFO("MCU-%d get ac_leak : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.ac_leak);
+						DEBUG_INFO("MCU-%d get dc_leak : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.dc_leak);
+						DEBUG_INFO("MCU-%d get mcu_selftest_fail : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.mcu_selftest_fail);
+						DEBUG_INFO("MCU-%d get handshaking_timeout : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.handshaking_timeout);
+						DEBUG_INFO("MCU-%d get emergency_stop : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.emergency_stop);
+						DEBUG_INFO("MCU-%d get relay_welding : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.relay_welding);
+						DEBUG_INFO("MCU-%d get leak_module_fail : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.leak_module_fail);
+						DEBUG_INFO("MCU-%d get shutter_fault : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.shutter_fault);
+						DEBUG_INFO("MCU-%d get locker_fault : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.locker_fault);
+						DEBUG_INFO("MCU-%d get power_drop : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.power_drop);
+						DEBUG_INFO("MCU-%d get circuit_short : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.circuit_short);
+						DEBUG_INFO("MCU-%d get set_circuit : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.set_circuit);
+						DEBUG_INFO("MCU-%d get relay_drive_fault : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.relay_drive_fault);
+						DEBUG_INFO("MCU-%d get InputAlarmCode : %x\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode);
 					}
 
 					//===============================
@@ -2136,12 +2136,12 @@ int main(void)
 					//===============================
 					if(ShmCharger->gun_info[gun_index].bleConfigData.isLogin == ON)
 					{
-						DEBUG_INFO("**************************************************\r\n");
-						DEBUG_INFO("********* High priority polling : Case 5 *********\r\n");
-						DEBUG_INFO("**************************************************\r\n");
-						DEBUG_INFO("MCU-%d get isUserLogin : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].bleConfigData.isLogin);
-						DEBUG_INFO("MCU-%d get isRequestStartCharger : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].bleConfigData.isRequestStart);
-						DEBUG_INFO("MCU-%d get isRequestStopCharger : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop);
+						DEBUG_INFO("**************************************************\n");
+						DEBUG_INFO("********* High priority polling : Case 5 *********\n");
+						DEBUG_INFO("**************************************************\n");
+						DEBUG_INFO("MCU-%d get isUserLogin : %d\n", gun_index, ShmCharger->gun_info[gun_index].bleConfigData.isLogin);
+						DEBUG_INFO("MCU-%d get isRequestStartCharger : %d\n", gun_index, ShmCharger->gun_info[gun_index].bleConfigData.isRequestStart);
+						DEBUG_INFO("MCU-%d get isRequestStopCharger : %d\n", gun_index, ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop);
 					}
 
 					//===============================
@@ -2149,10 +2149,10 @@ int main(void)
 					//===============================
 					if(strcmp((char *)&ShmCharger->gun_info[gun_index].bleLoginCentralId.id,"") != 0)
 					{
-						DEBUG_INFO("**************************************************\r\n");
-						DEBUG_INFO("********* High priority polling : Case 6 *********\r\n");
-						DEBUG_INFO("**************************************************\r\n");
-						DEBUG_INFO("MCU-%d get ble central id : %s\r\n", gun_index, ShmCharger->gun_info[gun_index].bleLoginCentralId.id);
+						DEBUG_INFO("**************************************************\n");
+						DEBUG_INFO("********* High priority polling : Case 6 *********\n");
+						DEBUG_INFO("**************************************************\n");
+						DEBUG_INFO("MCU-%d get ble central id : %s\n", gun_index, ShmCharger->gun_info[gun_index].bleLoginCentralId.id);
 					}
 
 					usleep(100000);
@@ -2184,7 +2184,7 @@ int main(void)
 						}
 						else
 						{
-							DEBUG_WARN("MCU-%d get input voltage fail...%d\r\n", gun_index, failCount[gun_index]);
+							DEBUG_WARN("MCU-%d get input voltage fail...%d\n", gun_index, failCount[gun_index]);
 							if(failCount[gun_index]<1000)
 							{
 								failCount[gun_index]++;
@@ -2206,7 +2206,7 @@ int main(void)
 						}
 						else
 						{
-							DEBUG_WARN("MCU-%d get output current fail...%d\r\n", gun_index, failCount[gun_index]);
+							DEBUG_WARN("MCU-%d get output current fail...%d\n", gun_index, failCount[gun_index]);
 							if(failCount[gun_index]<1000)
 							{
 								failCount[gun_index]++;
@@ -2225,7 +2225,7 @@ int main(void)
 						}
 						else
 						{
-							DEBUG_WARN("MCU-%d get gun plugin times fail...%d\r\n", gun_index, failCount[gun_index]);
+							DEBUG_WARN("MCU-%d get gun plugin times fail...%d\n", gun_index, failCount[gun_index]);
 							if(failCount[gun_index]<1000)
 							{
 								failCount[gun_index]++;
@@ -2245,7 +2245,7 @@ int main(void)
 						}
 						else
 						{
-							DEBUG_WARN("MCU-%d get temperature fail...%d\r\n", gun_index, failCount[gun_index]);
+							DEBUG_WARN("MCU-%d get temperature fail...%d\n", gun_index, failCount[gun_index]);
 							if(failCount[gun_index]<1000)
 							{
 								failCount[gun_index]++;
@@ -2265,7 +2265,7 @@ int main(void)
 							}
 							else
 							{
-								DEBUG_WARN("MCU-%d set cp pwn duty fail...%d\r\n", gun_index, failCount[gun_index]);
+								DEBUG_WARN("MCU-%d set cp pwn duty fail...%d\n", gun_index, failCount[gun_index]);
 								if(failCount[gun_index]<1000)
 								{
 									failCount[gun_index]++;
@@ -2326,7 +2326,7 @@ int main(void)
 						}
 						else
 						{
-							DEBUG_WARN("MCU-%d get rtc fail...%d\r\n", gun_index, failCount[gun_index]);
+							DEBUG_WARN("MCU-%d get rtc fail...%d\n", gun_index, failCount[gun_index]);
 							if(failCount[gun_index]<1000)
 							{
 								failCount[gun_index]++;
@@ -2343,7 +2343,7 @@ int main(void)
 						}
 						else
 						{
-							DEBUG_WARN("MCU-%d get power consumption fail...%d\r\n", gun_index, failCount[gun_index]);
+							DEBUG_WARN("MCU-%d get power consumption fail...%d\n", gun_index, failCount[gun_index]);
 							if(failCount[gun_index]<1000)
 							{
 								failCount[gun_index]++;
@@ -2356,21 +2356,21 @@ int main(void)
 						//===============================
 						if(ShmCharger->gun_info[gun_index].mcuFlag.isMcuUpgradeReq)
 						{
-							DEBUG_INFO("==================================================\r\n");
-							DEBUG_INFO("======== Normal priority polling : Case 15 =======\r\n");
-							DEBUG_INFO("==================================================\r\n");
+							DEBUG_INFO("==================================================\n");
+							DEBUG_INFO("======== Normal priority polling : Case 15 =======\n");
+							DEBUG_INFO("==================================================\n");
 
 							unsigned char cmd[512];
 							if(Upgrade_UART(Uart1Fd, AC_WALLMOUNT_CONTROLLER, (gun_index>0?ADDR_AC_PRIMARY_2:ADDR_AC_PRIMARY_1), ShmCharger->fwUpgradeInfo.location, ShmCharger->fwUpgradeInfo.modelName))
 							{
-								DEBUG_INFO("MCU-%d upgrade firmware OK...%s\r\n", gun_index, ShmCharger->gun_info[gun_index].ver.Version_FW);
+								DEBUG_INFO("MCU-%d upgrade firmware OK...%s\n", gun_index, ShmCharger->gun_info[gun_index].ver.Version_FW);
 								sleep(20);
 								ShmCharger->gun_info[gun_index].mcuFlag.isMcuUpgradeReq = OFF;
 								failCount[gun_index] = 0;
 							}
 							else
 							{
-								DEBUG_WARN("MCU-%d upgrade firmware fail...%d\r\n", gun_index, failCount[gun_index]);
+								DEBUG_WARN("MCU-%d upgrade firmware fail...%d\n", gun_index, failCount[gun_index]);
 								if(failCount[gun_index]<1000)
 								{
 									failCount[gun_index]++;
@@ -2393,7 +2393,7 @@ int main(void)
 							}
 							else
 							{
-								DEBUG_WARN("MCU-%d set breathe led timing fail...%d\r\n", gun_index, failCount[gun_index]);
+								DEBUG_WARN("MCU-%d set breathe led timing fail...%d\n", gun_index, failCount[gun_index]);
 								if(failCount[gun_index]<1000)
 								{
 									failCount[gun_index]++;
@@ -2413,7 +2413,7 @@ int main(void)
 							}
 							else
 							{
-								DEBUG_WARN("MCU-%d set led brightness fail...%d\r\n", gun_index, failCount[gun_index]);
+								DEBUG_WARN("MCU-%d set led brightness fail...%d\n", gun_index, failCount[gun_index]);
 								if(failCount[gun_index]<1000)
 								{
 									failCount[gun_index]++;
@@ -2427,12 +2427,12 @@ int main(void)
 						//===============================
 						if(ShmCharger->gun_info[gun_index].mcuFlag.isReadFwVerPass != PASS)
 						{
-							DEBUG_INFO("==================================================\r\n");
-							DEBUG_INFO("======== Normal priority polling : Case 21-1======\r\n");
-							DEBUG_INFO("==================================================\r\n");
+							DEBUG_INFO("==================================================\n");
+							DEBUG_INFO("======== Normal priority polling : Case 21-1======\n");
+							DEBUG_INFO("==================================================\n");
 							if(Query_FW_Ver(Uart1Fd, (gun_index>0?ADDR_AC_PRIMARY_2:ADDR_AC_PRIMARY_1), &ShmCharger->gun_info[gun_index].ver) == PASS)
 							{
-								DEBUG_INFO("MCU-%d get firmware version : %s\r\n", gun_index, ShmCharger->gun_info[gun_index].ver.Version_FW);
+								DEBUG_INFO("MCU-%d get firmware version : %s\n", gun_index, ShmCharger->gun_info[gun_index].ver.Version_FW);
 								memcpy(ShmPrimaryMcuData->version, ShmCharger->gun_info[gun_index].ver.Version_FW, sizeof(ShmPrimaryMcuData->version));
 								ShmCharger->gun_info[gun_index].mcuFlag.isReadFwVerPass = PASS;
 
@@ -2440,7 +2440,7 @@ int main(void)
 							}
 							else
 							{
-								DEBUG_WARN("MCU-%d get firmware version fail...%d\r\n", gun_index, failCount[gun_index]);
+								DEBUG_WARN("MCU-%d get firmware version fail...%d\n", gun_index, failCount[gun_index]);
 								if(failCount[gun_index]<1000)
 								{
 									failCount[gun_index]++;
@@ -2453,20 +2453,20 @@ int main(void)
 						//===============================
 						if(ShmCharger->gun_info[gun_index].mcuFlag.isSetSerialNumberPass != PASS)
 						{
-							DEBUG_INFO("==================================================\r\n");
-							DEBUG_INFO("======== Normal priority polling : Case 21-2======\r\n");
-							DEBUG_INFO("==================================================\r\n");
+							DEBUG_INFO("==================================================\n");
+							DEBUG_INFO("======== Normal priority polling : Case 21-2======\n");
+							DEBUG_INFO("==================================================\n");
 							memcpy(ShmCharger->evseId.serial_number, ShmSysConfigAndInfo->SysConfig.SerialNumber, ARRAY_SIZE(ShmCharger->evseId.serial_number));
 							if(Config_Serial_Number(Uart1Fd, (gun_index>0?ADDR_AC_PRIMARY_2:ADDR_AC_PRIMARY_1), &ShmCharger->evseId))
 							{
-								DEBUG_INFO("MCU-%d set serial number : %.12s\r\n",gun_index,ShmCharger->evseId.serial_number);
+								DEBUG_INFO("MCU-%d set serial number : %.12s\n",gun_index,ShmCharger->evseId.serial_number);
 								ShmCharger->gun_info[gun_index].mcuFlag.isSetSerialNumberPass = PASS;
 
 								failCount[gun_index] = 0;
 							}
 							else
 							{
-								DEBUG_WARN("MCU-%d set serial number fail...%d\r\n", gun_index, failCount[gun_index]);
+								DEBUG_WARN("MCU-%d set serial number fail...%d\n", gun_index, failCount[gun_index]);
 								if(failCount[gun_index]<1000)
 								{
 									failCount[gun_index]++;
@@ -2479,20 +2479,20 @@ int main(void)
 						//===============================
 						if(ShmCharger->gun_info[gun_index].mcuFlag.isSetModelNamePass != PASS)
 						{
-							DEBUG_INFO("==================================================\r\n");
-							DEBUG_INFO("======== Normal priority polling : Case 21-3======\r\n");
-							DEBUG_INFO("==================================================\r\n");
+							DEBUG_INFO("==================================================\n");
+							DEBUG_INFO("======== Normal priority polling : Case 21-3======\n");
+							DEBUG_INFO("==================================================\n");
 							memcpy(ShmCharger->evseId.model_name, ShmSysConfigAndInfo->SysConfig.ModelName, ARRAY_SIZE(ShmCharger->evseId.model_name));
 							if(Config_Model_Name(Uart1Fd, (gun_index>0?ADDR_AC_PRIMARY_2:ADDR_AC_PRIMARY_1), &ShmCharger->evseId))
 							{
-								DEBUG_INFO("MCU-%d set model name : %.14s\r\n",gun_index,ShmCharger->evseId.model_name);
+								DEBUG_INFO("MCU-%d set model name : %.14s\n",gun_index,ShmCharger->evseId.model_name);
 								ShmCharger->gun_info[gun_index].mcuFlag.isSetModelNamePass = PASS;
 
 								failCount[gun_index] = 0;
 							}
 							else
 							{
-								DEBUG_WARN("MCU-%d set model name fail...%d\r\n", gun_index, failCount[gun_index]);
+								DEBUG_WARN("MCU-%d set model name fail...%d\n", gun_index, failCount[gun_index]);
 								if(failCount[gun_index]<1000)
 								{
 									failCount[gun_index]++;
@@ -2512,48 +2512,48 @@ int main(void)
 				{
 					if(stepIndex == 1)
 					{
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("======== Normal priority polling : Case 1 ========\r\n");
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("MCU-%d get input voltage : %f\r\n", gun_index, (float)ShmCharger->gun_info[gun_index].inputVoltage.L1N_L12);
-						DEBUG_INFO("MCU-%d get PresentChargingVoltage : %.2f\r\n", gun_index, (float)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargingVoltage);
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("======== Normal priority polling : Case 1 ========\n");
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("MCU-%d get input voltage : %f\n", gun_index, (float)ShmCharger->gun_info[gun_index].inputVoltage.L1N_L12);
+						DEBUG_INFO("MCU-%d get PresentChargingVoltage : %.2f\n", gun_index, (float)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargingVoltage);
 					}
 					else if(stepIndex == 3)
 					{
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("======== Normal priority polling : Case 3 ========\r\n");
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("MCU-%d get output current : %f\r\n", gun_index, (float)ShmCharger->gun_info[gun_index].outputCurrent.L1N_L12[0]);
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("======== Normal priority polling : Case 3 ========\n");
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("MCU-%d get output current : %f\n", gun_index, (float)ShmCharger->gun_info[gun_index].outputCurrent.L1N_L12[0]);
 					}
 					else if(stepIndex == 5)
 					{
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("======== Normal priority polling : Case 5 ========\r\n");
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("MCU-%d get gun plugin times : %ld\r\n", gun_index, (long)ShmCharger->gun_info[gun_index].gunPluginTimes.GunPluginTimes);
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("======== Normal priority polling : Case 5 ========\n");
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("MCU-%d get gun plugin times : %ld\n", gun_index, (long)ShmCharger->gun_info[gun_index].gunPluginTimes.GunPluginTimes);
 					}
 					else if(stepIndex == 7)
 					{
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("======== Normal priority polling : Case 7 ========\r\n");
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("MCU-%d get temperature : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].temperature.point[0]);
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("======== Normal priority polling : Case 7 ========\n");
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("MCU-%d get temperature : %d\n", gun_index, ShmCharger->gun_info[gun_index].temperature.point[0]);
 					}
 					else if(stepIndex == 9)
 					{
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("======== Normal priority polling : Case 9 ========\r\n");
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("MCU-%d set cp pwn duty : %d\r\n",gun_index, ShmCharger->gun_info[gun_index].primaryMcuCp_Pwn_Duty.max_current);
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("======== Normal priority polling : Case 9 ========\n");
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("MCU-%d set cp pwn duty : %d\n",gun_index, ShmCharger->gun_info[gun_index].primaryMcuCp_Pwn_Duty.max_current);
 					}
 					else if(stepIndex == 11)
 					{
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("======== Normal priority polling : Case 11 =======\r\n");
-						DEBUG_INFO("==================================================\r\n");
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("======== Normal priority polling : Case 11 =======\n");
+						DEBUG_INFO("==================================================\n");
 						if(ShmCharger->gun_info[gun_index].bleConfigData.isLogin && !ShmOCPP16Data->OcppConnStatus)
 						{
-							DEBUG_INFO("Sync from MCU-%d rtc OK...%04d-%02d-%02d %02d:%02d:%02d\r\n", gun_index,
+							DEBUG_INFO("Sync from MCU-%d rtc OK...%04d-%02d-%02d %02d:%02d:%02d\n", gun_index,
 																											  ShmCharger->gun_info[gun_index].rtc.year,
 																											  ShmCharger->gun_info[gun_index].rtc.month,
 																											  ShmCharger->gun_info[gun_index].rtc.day,
@@ -2565,7 +2565,7 @@ int main(void)
 						}
 						else
 						{
-							DEBUG_INFO("MCU-%d set rtc OK...%04d-%02d-%02d %02d:%02d:%02d\r\n", gun_index,
+							DEBUG_INFO("MCU-%d set rtc OK...%04d-%02d-%02d %02d:%02d:%02d\n", gun_index,
 																										ShmCharger->gun_info[gun_index].rtc.year,
 																										ShmCharger->gun_info[gun_index].rtc.month,
 																										ShmCharger->gun_info[gun_index].rtc.day,
@@ -2576,45 +2576,45 @@ int main(void)
 					}
 					else if(stepIndex == 13)
 					{
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("======== Normal priority polling : Case 13 =======\r\n");
-						DEBUG_INFO("==================================================\r\n");
-						DEBUG_INFO("MCU-%d get power consumption : %f kWh\r\n",gun_index, ((float)ShmCharger->gun_info[gun_index].powerConsumption.power_consumption/100));
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("======== Normal priority polling : Case 13 =======\n");
+						DEBUG_INFO("==================================================\n");
+						DEBUG_INFO("MCU-%d get power consumption : %f kWh\n",gun_index, ((float)ShmCharger->gun_info[gun_index].powerConsumption.power_consumption/100));
 					}
 					else if(stepIndex == 17)
 					{
 						if(ShmCharger->gun_info[gun_index].isSetBreatheLedTiming == ON)
 						{
-							DEBUG_INFO("==================================================\r\n");
-							DEBUG_INFO("======== Normal priority polling : Case 17 =======\r\n");
-							DEBUG_INFO("==================================================\r\n");
-							DEBUG_INFO("MCU-%d set breathe led timing : Authed Fade in [%ld].\r\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.set_Led_Action_Authed_Fade_In);
-							DEBUG_INFO("MCU-%d set breathe led timing : Authed Fade out [%ld].\r\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.set_Led_Action_Authed_Fade_Out);
-							DEBUG_INFO("MCU-%d set breathe led timing : Charging Fade in [%ld].\r\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.Set_Led_Action_Chaging_Fade_In);
-							DEBUG_INFO("MCU-%d set breathe led timing : Charging Fade out [%ld].\r\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.set_Led_Action_Chaging_Fade_Out);
-							DEBUG_INFO("MCU-%d set breathe led timing : Connected Fade in [%ld].\r\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.set_Led_Action_Connected_Fade_In);
-							DEBUG_INFO("MCU-%d set breathe led timing : Connected Fade out [%ld].\r\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.set_Led_Action_Connected_Fade_Out);
+							DEBUG_INFO("==================================================\n");
+							DEBUG_INFO("======== Normal priority polling : Case 17 =======\n");
+							DEBUG_INFO("==================================================\n");
+							DEBUG_INFO("MCU-%d set breathe led timing : Authed Fade in [%ld].\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.set_Led_Action_Authed_Fade_In);
+							DEBUG_INFO("MCU-%d set breathe led timing : Authed Fade out [%ld].\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.set_Led_Action_Authed_Fade_Out);
+							DEBUG_INFO("MCU-%d set breathe led timing : Charging Fade in [%ld].\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.Set_Led_Action_Chaging_Fade_In);
+							DEBUG_INFO("MCU-%d set breathe led timing : Charging Fade out [%ld].\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.set_Led_Action_Chaging_Fade_Out);
+							DEBUG_INFO("MCU-%d set breathe led timing : Connected Fade in [%ld].\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.set_Led_Action_Connected_Fade_In);
+							DEBUG_INFO("MCU-%d set breathe led timing : Connected Fade out [%ld].\n", gun_index, (long)ShmCharger->gun_info[gun_index].setBreatheLedTiming.set_Led_Action_Connected_Fade_Out);
 						}
 					}
 					else if(stepIndex == 19)
 					{
 						if(ShmCharger->gun_info[gun_index].isSetLedBrightness == ON)
 						{
-							DEBUG_INFO("==================================================\r\n");
-							DEBUG_INFO("======== Normal priority polling : Case 19 =======\r\n");
-							DEBUG_INFO("==================================================\r\n");
-							DEBUG_INFO("MCU-%d set led brightness Sector 01 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_1);
-							DEBUG_INFO("MCU-%d set led brightness Sector 02 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_2);
-							DEBUG_INFO("MCU-%d set led brightness Sector 03 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_3);
-							DEBUG_INFO("MCU-%d set led brightness Sector 04 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_4);
-							DEBUG_INFO("MCU-%d set led brightness Sector 05 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_5);
-							DEBUG_INFO("MCU-%d set led brightness Sector 06 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_6);
-							DEBUG_INFO("MCU-%d set led brightness Sector 07 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_7);
-							DEBUG_INFO("MCU-%d set led brightness Sector 08 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_8);
-							DEBUG_INFO("MCU-%d set led brightness Sector 09 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_9);
-							DEBUG_INFO("MCU-%d set led brightness Sector 10 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_10);
-							DEBUG_INFO("MCU-%d set led brightness Sector 11 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_11);
-							DEBUG_INFO("MCU-%d set led brightness Sector 12 : [%x].\r\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_12);
+							DEBUG_INFO("==================================================\n");
+							DEBUG_INFO("======== Normal priority polling : Case 19 =======\n");
+							DEBUG_INFO("==================================================\n");
+							DEBUG_INFO("MCU-%d set led brightness Sector 01 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_1);
+							DEBUG_INFO("MCU-%d set led brightness Sector 02 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_2);
+							DEBUG_INFO("MCU-%d set led brightness Sector 03 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_3);
+							DEBUG_INFO("MCU-%d set led brightness Sector 04 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_4);
+							DEBUG_INFO("MCU-%d set led brightness Sector 05 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_5);
+							DEBUG_INFO("MCU-%d set led brightness Sector 06 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_6);
+							DEBUG_INFO("MCU-%d set led brightness Sector 07 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_7);
+							DEBUG_INFO("MCU-%d set led brightness Sector 08 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_8);
+							DEBUG_INFO("MCU-%d set led brightness Sector 09 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_9);
+							DEBUG_INFO("MCU-%d set led brightness Sector 10 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_10);
+							DEBUG_INFO("MCU-%d set led brightness Sector 11 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_11);
+							DEBUG_INFO("MCU-%d set led brightness Sector 12 : [%x].\n", gun_index, ShmCharger->gun_info[gun_index].setLedBrightness.sector_12);
 						}
 					}
 					else
@@ -2631,7 +2631,9 @@ int main(void)
 			if(failCount[gun_index] >= FAIL_SPEC_COMM)
 			{
 				if((0 <= failCount[gun_index]%FAIL_SPEC_COMM) && (failCount[gun_index]%FAIL_SPEC_COMM < 10))
-					sleep(10);
+				{
+					system ("pkill Module_InternalComm");
+				}
 				
 				if(ShmCharger->gun_info[gun_index].primaryMcuAlarm.bits.comm_timeout == OFF)
 				{

+ 5 - 5
EVSE/Projects/AW-Regular/Apps/Module_Speaker.c

@@ -216,14 +216,14 @@ int InitShareMemory()
 	if ((MeterSMId = shmget(ShmChargerKey, sizeof(struct Charger), 0777)) < 0)
 	{
 		#ifdef SystemLogMessage
-		DEBUG_ERROR("shmget ShmChargerKey NG\r\n");
+		DEBUG_ERROR("shmget ShmChargerKey NG\n");
 		#endif
 		result = FAIL;
 	}
 	else if ((ShmCharger = shmat(MeterSMId, NULL, 0)) == (void *) -1)
 	{
 		#ifdef SystemLogMessage
-		DEBUG_ERROR("shmat ShmChargerKey NG\r\n");
+		DEBUG_ERROR("shmat ShmChargerKey NG\n");
 		#endif
 		result = FAIL;
 	}
@@ -255,7 +255,7 @@ int main(void)
 			switch(ShmCharger->speaker_type)
 			{
 				case SPEAKER_STOP:
-					DEBUG_INFO("SPEAKER_STOP...\r\n");
+					DEBUG_INFO("SPEAKER_STOP...\n");
 					ShmCharger->isSpeakerOn = OFF;
 					break;
 				case SPEAKER_ALWAYS_ON:
@@ -266,7 +266,7 @@ int main(void)
 					system("echo 0 > /sys/class/gpio/gpio65/value");
 
 					ShmCharger->isSpeakerOn = OFF;
-					DEBUG_INFO("SPEAKER_SHORT...\r\n");
+					DEBUG_INFO("SPEAKER_SHORT...\n");
 					break;
 				case SPEAKER_LONG:
 					break;
@@ -288,7 +288,7 @@ int main(void)
 					system("echo 0 > /sys/class/gpio/gpio65/value");
 
 					ShmCharger->isSpeakerOn = OFF;
-					DEBUG_INFO("SPEAKER_INTERVAL_3COUNT...\r\n");
+					DEBUG_INFO("SPEAKER_INTERVAL_3COUNT...\n");
 					break;
 			}
 		}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 170 - 156
EVSE/Projects/AW-Regular/Apps/main.c


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott