Преглед изворни кода

[Improve][AW-CCS][Log]

2020.09.08 / Folus Wen

Actions:
1. Improve all debug log output format and timming.
2. EVSE/Projects/AW-CCS/Apps/Module_InternalComm.c query data from MCU depend on AC input model.
3. EVSE/Projects/AW-CCS/Apps/main.c fix gpio_get_value() wrong folder issue.
4. EVSE/Projects/AW-CCS/Apps/main.c cancel RFID ICC pin detection.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen пре 4 година
родитељ
комит
ecb79f030b

+ 58 - 58
EVSE/Projects/AW-CCS/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_L1_OVER_VOLTAGE;
-						DEBUG_INFO("ALARM_L1_OVER_VOLTAGE : alarm \r\n");
+						DEBUG_INFO("ALARM_L1_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_L1_OVER_VOLTAGE;
-					DEBUG_INFO("ALARM_L1_OVER_VOLTAGE : recover \r\n");
+					DEBUG_INFO("ALARM_L1_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_L2_OVER_VOLTAGE;
-							DEBUG_INFO("ALARM_L2_OVER_VOLTAGE : alarm \r\n");
+							DEBUG_INFO("ALARM_L2_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_L2_OVER_VOLTAGE;
-						DEBUG_INFO("ALARM_L2_OVER_VOLTAGE : recover \r\n");
+						DEBUG_INFO("ALARM_L2_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_L3_OVER_VOLTAGE;
-							DEBUG_INFO("ALARM_L3_OVER_VOLTAGE : alarm \r\n");
+							DEBUG_INFO("ALARM_L3_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_L3_OVER_VOLTAGE;
-						DEBUG_INFO("ALARM_L3_OVER_VOLTAGE : recover \r\n");
+						DEBUG_INFO("ALARM_L3_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_L1_UNDER_VOLTAGE;
-						DEBUG_INFO("ALARM_L1_UNDER_VOLTAGE : alarm \r\n");
+						DEBUG_INFO("ALARM_L1_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_L1_UNDER_VOLTAGE;
-					DEBUG_INFO("ALARM_L1_UNDER_VOLTAGE : recover \r\n");
+					DEBUG_INFO("ALARM_L1_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_L2_UNDER_VOLTAGE;
-							DEBUG_INFO("ALARM_L2_UNDER_VOLTAGE : alarm \r\n");
+							DEBUG_INFO("ALARM_L2_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_L2_UNDER_VOLTAGE;
-						DEBUG_INFO("ALARM_L2_UNDER_VOLTAGE : recover \r\n");
+						DEBUG_INFO("ALARM_L2_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_L3_UNDER_VOLTAGE;
-							DEBUG_INFO("ALARM_L3_UNDER_VOLTAGE : alarm \r\n");
+							DEBUG_INFO("ALARM_L3_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_L3_UNDER_VOLTAGE;
-						DEBUG_INFO("ALARM_L3_UNDER_VOLTAGE : recover \r\n");
+						DEBUG_INFO("ALARM_L3_UNDER_VOLTAGE : recover \n");
 					}
 				}
 							
@@ -445,7 +445,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCP = ON;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_L1_OVER_CURRENT;
-					DEBUG_INFO("ALARM_L1_OVER_CURRENT : alarm \r\n");
+					DEBUG_INFO("ALARM_L1_OVER_CURRENT : alarm \n");
 				}
 			}
 			else if ((!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_L1_OVER_CURRENT)))
@@ -454,7 +454,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCP = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_L1_OVER_CURRENT;
-					DEBUG_INFO("ALARM_L1_OVER_CURRENT : recover \r\n");
+					DEBUG_INFO("ALARM_L1_OVER_CURRENT : recover \n");
 				}
 			}
 
@@ -466,7 +466,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCPL2 = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_L2_OVER_CURRENT;
-						DEBUG_INFO("ALARM_L2_OVER_CURRENT : alarm \r\n");
+						DEBUG_INFO("ALARM_L2_OVER_CURRENT : alarm \n");
 					}
 				}
 				else if ((!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_L2_OVER_CURRENT)))
@@ -475,7 +475,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCPL2 = OFF;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_L2_OVER_CURRENT;
-						DEBUG_INFO("ALARM_L2_OVER_CURRENT : recover \r\n");
+						DEBUG_INFO("ALARM_L2_OVER_CURRENT : recover \n");
 					}
 				}
 
@@ -485,7 +485,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCPL3 = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_L3_OVER_CURRENT;
-						DEBUG_INFO("ALARM_L3_OVER_CURRENT : alarm \r\n");
+						DEBUG_INFO("ALARM_L3_OVER_CURRENT : alarm \n");
 					}
 				}
 				else if ((!(ShmCharger->gun_info[gun_index].primaryMcuAlarm.InputAlarmCode & ALARM_L3_OVER_CURRENT)))
@@ -494,7 +494,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemAcOutputOCPL3 = OFF;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_L3_OVER_CURRENT;
-						DEBUG_INFO("ALARM_L3_OVER_CURRENT : recover \r\n");
+						DEBUG_INFO("ALARM_L3_OVER_CURRENT : recover \n");
 					}
 				}
 			}
@@ -510,7 +510,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
@@ -525,7 +525,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");
 				}
 			}
 
@@ -540,7 +540,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
@@ -555,7 +555,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");
 				}
 			}
 
@@ -570,7 +570,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
@@ -585,7 +585,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");
 				}
 			}
 
@@ -604,13 +604,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");
 						}
 					}
 				}
@@ -630,13 +630,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");
 					}
 				}
 			}
@@ -652,7 +652,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
@@ -667,7 +667,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");
 				}
 			}
 
@@ -680,7 +680,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");
 				}
 
 			}
@@ -690,7 +690,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");
 				}
 			}
 
@@ -705,7 +705,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
@@ -720,7 +720,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");
 				}
 			}
 
@@ -735,7 +735,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
@@ -750,7 +750,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");
 				}
 			}
 
@@ -765,7 +765,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
@@ -780,7 +780,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");
 				}
 			}
 
@@ -795,7 +795,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CircuitShort = ON;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_L1_CIRCUIT_SHORT;
-						DEBUG_INFO("ALARM_L1_CIRCUIT_SHORT : alarm \r\n");
+						DEBUG_INFO("ALARM_L1_CIRCUIT_SHORT : alarm \n");
 					}
 				}
 				else
@@ -810,7 +810,7 @@ int main(void)
 				{
 					ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CircuitShort = OFF;
 					ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_L1_CIRCUIT_SHORT;
-					DEBUG_INFO("ALARM_L1_CIRCUIT_SHORT : recover \r\n");
+					DEBUG_INFO("ALARM_L1_CIRCUIT_SHORT : recover \n");
 				}
 			}
 			
@@ -824,7 +824,7 @@ int main(void)
 						{
 							ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CircuitShortL2 = ON;
 							ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_L2_CIRCUIT_SHORT;
-							DEBUG_INFO("ALARM_L2_CIRCUIT_SHORT : alarm \r\n");
+							DEBUG_INFO("ALARM_L2_CIRCUIT_SHORT : alarm \n");
 						}
 					}
 					else
@@ -839,7 +839,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CircuitShortL2 = OFF;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_L2_CIRCUIT_SHORT;
-						DEBUG_INFO("ALARM_L2_CIRCUIT_SHORT : recover \r\n");
+						DEBUG_INFO("ALARM_L2_CIRCUIT_SHORT : recover \n");
 					}
 				}
 
@@ -851,7 +851,7 @@ int main(void)
 						{
 							ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CircuitShortL3 = ON;
 							ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode |= ALARM_L3_CIRCUIT_SHORT;
-							DEBUG_INFO("ALARM_L3_CIRCUIT_SHORT : alarm \r\n");
+							DEBUG_INFO("ALARM_L3_CIRCUIT_SHORT : alarm \n");
 						}
 					}
 					else
@@ -866,7 +866,7 @@ int main(void)
 					{
 						ShmStatusCodeData->AlarmCode.AlarmEvents.bits.CircuitShortL3 = OFF;
 						ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode &= ~ALARM_L3_CIRCUIT_SHORT;
-						DEBUG_INFO("ALARM_L3_CIRCUIT_SHORT : recover \r\n");
+						DEBUG_INFO("ALARM_L3_CIRCUIT_SHORT : recover \n");
 					}
 				}
 			}
@@ -880,7 +880,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))
@@ -889,7 +889,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");
 				}
 			}
 
@@ -902,7 +902,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))
@@ -911,7 +911,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");
 				}
 			}
 
@@ -924,7 +924,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))
@@ -933,7 +933,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");
 				}
 			}
 
@@ -946,7 +946,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))
@@ -955,7 +955,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");
 				}
 			}
 
@@ -968,7 +968,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))
@@ -977,7 +977,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");
 				}
 			}
 

Разлика између датотеке није приказан због своје велике величине
+ 375 - 367
EVSE/Projects/AW-CCS/Apps/Module_InternalComm.c


+ 5 - 5
EVSE/Projects/AW-CCS/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;
 			}
 		}

Разлика између датотеке није приказан због своје велике величине
+ 179 - 141
EVSE/Projects/AW-CCS/Apps/main.c


Неке датотеке нису приказане због велике количине промена