Merge remote-tracking branch 'origin/AW-CCS'

EVSE/Projects/AW-CCS/Apps/LCM/Module_LcmControl.c

@@ -65,7 +65,7 @@ void setPriceFromWebsite(float monry_rate);
 void setAuthorizationPage(uint8_t gun_index);
 float getPresentFinalCost(uint8_t gun_index);
 void setGunPluginAnimation(uint8_t gun_index);
-void setPresentChargedgPower(uint8_t gun_index);
+void setPresentChargedPower(uint8_t gun_index);
 void setPlugAndChargeAnimation(uint8_t gun_index);
 void setPresentChargedDuration(uint8_t gun_index);
 void setPresentPowerConsumption(uint8_t gun_index);
@@ -582,7 +582,7 @@ void page_charging(uint8_t gun_index, uint8_t system_mode)
 	{
 		setConnectionAnimation(gun_index, system_mode);
 		setPresentChargedDuration(gun_index);
-		setPresentChargedgPower(gun_index);
+		setPresentChargedPower(gun_index);
 		setTimeTitle(ON);
 		setEnergyTitle(ON);
 
@@ -816,7 +816,7 @@ void page_terminating(uint8_t gun_index, uint8_t system_mode)
 	{
 		setPresentChargedDuration(gun_index);
 		setPresentChargedEnergy(gun_index, system_mode);
-		setPresentChargedgPower(gun_index);
+		setPresentChargedPower(gun_index);
 		setTimeTitle(ON);
 		setEnergyTitle(ON);
 
@@ -2406,7 +2406,7 @@ void setPresentConnectionTimeout(uint8_t gun_index)
 //=======================================
 // Setting Present Charging [ Power ]
 //=======================================
-void setPresentChargedgPower(uint8_t gun_index)
+void setPresentChargedPower(uint8_t gun_index)
 {
 	uint8_t data[16];
 	uint8_t power[16];
@@ -2701,32 +2701,32 @@ int isAmericaType()
 }
 
 //=======================================
-// Setting time title
+// SETTING TITLE [TIME]
 //=======================================
 void setTimeTitle(uint8_t isOn)
 {
-	uint8_t data[32];
-	uint8_t text[32];
+	uint8_t DISPLAY_DATA[32];
+	uint8_t TEXT_DATA[32];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
 	if(isAmericaType() == YES)
 	{
 		if(isOn == ON)
 		{
-			strcpy((char*)text, "(hrs: mins: secs)");
-			string2ByteArray(text, data);
+			strcpy((char*)TEXT_DATA, "(hrs: mins: secs)");
+			string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 		}
 		else
 		{
-			strcpy((char*)text, "                               ");
-			string2ByteArray(text, data);
+			strcpy((char*)TEXT_DATA, "                               ");
+			string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 		}
 
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_TIME, data, ARRAY_SIZE(data));
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_TITLE_TIME, data, ARRAY_SIZE(data));
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TITLE_TIME, data, ARRAY_SIZE(data));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_TIME, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_TITLE_TIME, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TITLE_TIME, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 	}
 	else
 	{
@@ -2737,32 +2737,32 @@ void setTimeTitle(uint8_t isOn)
 }
 
 //=======================================
-// Setting Energy title
+// SETTING TITLE [ENERGY]
 //=======================================
 void setEnergyTitle(uint8_t isOn)
 {
-	uint8_t data[32];
-	uint8_t text[32];
+	uint8_t DISPLAY_DATA[32];
+	uint8_t TEXT_DATA[32];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
 	if(isAmericaType() == YES)
 	{
 		if(isOn == ON)
 		{
-			strcpy((char*)text, "(Energy)");
-			string2ByteArray(text, data);
+			strcpy((char*)TEXT_DATA, "(Energy)");
+			string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 		}
 		else
 		{
-			strcpy((char*)text, "                               ");
-			string2ByteArray(text, data);
+			strcpy((char*)TEXT_DATA, "                               ");
+			string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 		}
 
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_ENERGY, data, ARRAY_SIZE(data));
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_TITLE_ENERGY, data, ARRAY_SIZE(data));
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TITLE_ENERGY, data, ARRAY_SIZE(data));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_ENERGY, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_TITLE_ENERGY, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TITLE_ENERGY, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 	}
 	else
 	{
@@ -2773,32 +2773,32 @@ void setEnergyTitle(uint8_t isOn)
 }
 
 //=======================================
-// Setting session fee title
+// SETTING TITLE [SESSION FEE]
 //=======================================
 void setSessionFeeTitle(uint8_t isOn)
 {
-	uint8_t data[32];
-	uint8_t text[32];
+	uint8_t DISPLAY_DATA[32];
+	uint8_t TEXT_DATA[32];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
 	if(isAmericaType() == YES)
 	{
 		if(isOn == ON)
 		{
-			strcpy((char*)text, "(Energy Cost)");
-			string2ByteArray(text, data);
+			strcpy((char*)TEXT_DATA, "(Energy Cost)");
+			string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 		}
 		else
 		{
-			strcpy((char*)text, "                               ");
-			string2ByteArray(text, data);
+			strcpy((char*)TEXT_DATA, "                               ");
+			string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 		}
 
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_SESSION_FEE, data, ARRAY_SIZE(data));
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_TITLE_SESSION_FEE, data, ARRAY_SIZE(data));
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TITLE_SESSION_FEE, data, ARRAY_SIZE(data));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_SESSION_FEE, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_TITLE_SESSION_FEE, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TITLE_SESSION_FEE, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 	}
 	else
 	{
@@ -2809,32 +2809,32 @@ void setSessionFeeTitle(uint8_t isOn)
 }
 
 //=======================================
-// Setting parking fee title
+// SETTING TITLE [PARKING FEE]
 //=======================================
 void setParkingFeeTitle(uint8_t isOn)
 {
-	uint8_t data[32];
-	uint8_t text[32];
+	uint8_t DISPLAY_DATA[32];
+	uint8_t TEXT_DATA[32];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
 	if(isAmericaType() == YES)
 	{
 		if(isOn == ON)
 		{
-			strcpy((char*)text, "(Parking Fee)");
-			string2ByteArray(text, data);
+			strcpy((char*)TEXT_DATA, "(Parking Fee)");
+			string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 		}
 		else
 		{
-			strcpy((char*)text, "                               ");
-			string2ByteArray(text, data);
+			strcpy((char*)TEXT_DATA, "                               ");
+			string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 		}
 
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_PARKING_FEE, data, ARRAY_SIZE(data));
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_TITLE_PARKING_FEE, data, ARRAY_SIZE(data));
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TITLE_PARKING_FEE, data, ARRAY_SIZE(data));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_PARKING_FEE, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_TITLE_PARKING_FEE, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TITLE_PARKING_FEE, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 	}
 	else
 	{
@@ -2845,32 +2845,32 @@ void setParkingFeeTitle(uint8_t isOn)
 }
 
 //=======================================
-// Setting final cost title
+// SETTING TITLE [FINAL COST]
 //=======================================
 void setFinalCostTitle(uint8_t isOn)
 {
-	uint8_t data[32];
-	uint8_t text[32];
+	uint8_t DISPLAY_DATA[32];
+	uint8_t TEXT_DATA[32];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
 	if(isAmericaType() == YES)
 	{
 		if(isOn == ON)
 		{
-			strcpy((char*)text, "(Total Cost)");
-			string2ByteArray(text, data);
+			strcpy((char*)TEXT_DATA, "(Total Cost)");
+			string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 		}
 		else
 		{
-			strcpy((char*)text, "                               ");
-			string2ByteArray(text, data);
+			strcpy((char*)TEXT_DATA, "                               ");
+			string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 		}
 
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_FINAL_COST, data, ARRAY_SIZE(data));
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_TITLE_FINAL_COST, data, ARRAY_SIZE(data));
-		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TITLE_FINAL_COST, data, ARRAY_SIZE(data));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_FINAL_COST, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_TITLE_FINAL_COST, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+		lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TITLE_FINAL_COST, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 	}
 	else
 	{
@@ -2881,137 +2881,137 @@ void setFinalCostTitle(uint8_t isOn)
 }
 
 //=======================================
-// Setting CSU FIRMWARE VERSION
+// SETTING CSU FIRMWARE VERSION
 //=======================================
 void setCsuRootFsFwRev()
 {
-	uint8_t data[64];
-	uint8_t text[64];
+	uint8_t DISPLAY_DATA[64];
+	uint8_t TEXT_DATA[64];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
-	sprintf((char *)text, "%s%s", " CSU Software Version: ",(char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev);
-	string2ByteArray(text, data);
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CSU_ROOT_FS_FW_REV, data, ARRAY_SIZE(data));
+	sprintf((char *)TEXT_DATA, "%s%s", " CSU Software Version: ",(char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev);
+	string2ByteArray(TEXT_DATA, DISPLAY_DATA);
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CSU_ROOT_FS_FW_REV, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 }
 
 //=======================================
-// Setting Precharging initial to empty
+// SETTING PRECHARGING VALUE EMPTY
 //=======================================
 void setClearPrechargingValueToEmpty()
 {
-	uint8_t data[16];
-	uint8_t text[16];
+	uint8_t DISPLAY_DATA[16];
+	uint8_t TEXT_DATA[16];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
-	strcpy((char*)text, "               ");
-	string2ByteArray(text, data);
+	strcpy((char*)TEXT_DATA, "               ");
+	string2ByteArray(TEXT_DATA, DISPLAY_DATA);
 
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TIMER, data, ARRAY_SIZE(data));
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_ENERGY, data, ARRAY_SIZE(data));
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_SESSION_FEE, data, ARRAY_SIZE(data));
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_PARKING_FEE, data, ARRAY_SIZE(data));
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_COST, data, ARRAY_SIZE(data));
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_POWER, data, ARRAY_SIZE(data));
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TIMER, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_ENERGY, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_SESSION_FEE, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_PARKING_FEE, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_COST, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_POWER, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 }
 
 //=======================================
-// Setting Precharging initial to empty
+// SETTING PRECHARGING TIMER DEFAULT
 //=======================================
 void setPrechargingTimerToDefault()
 {
-	uint8_t data[16];
-	uint8_t text[16];
+	uint8_t DISPLAY_DATA[16];
+	uint8_t TEXT_DATA[16];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
-	sprintf((char *)text, "%s", "00:00:00");
-	string2ByteArray(text, data);
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TIMER, data, ARRAY_SIZE(data));
+	sprintf((char *)TEXT_DATA, "%s", "00:00:00");
+	string2ByteArray(TEXT_DATA, DISPLAY_DATA);
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_TIMER, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 }
 
 //=======================================
-// Setting Precharging energy to default
+// SETTING PRECHARGING ENERGY DEFAULT
 //=======================================
 void setPrechargingEnergyToDefault()
 {
-	uint8_t data[16];
-	uint8_t text[16];
+	uint8_t DISPLAY_DATA[16];
+	uint8_t TEXT_DATA[16];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
-	sprintf((char *)text, "%s kWh", "0000.0000");
-	string2ByteArray(text, data);
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_ENERGY, data, ARRAY_SIZE(data));
+	sprintf((char *)TEXT_DATA, "%s kWh", "0000.0000");
+	string2ByteArray(TEXT_DATA, DISPLAY_DATA);
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_ENERGY, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 }
 
 //=======================================
-// Setting Precharging session fee to default
+// SETTING PRECHARGING SESSION FEE DEFAULT
 //=======================================
 void setPrechargingSessionFeeToDefault()
 {
-	uint8_t data[16];
-	uint8_t text[16];
+	uint8_t DISPLAY_DATA[16];
+	uint8_t TEXT_DATA[16];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
-	sprintf((char *)text, "%s", "000.00");
-	string2ByteArray(text, data);
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_SESSION_FEE, data, ARRAY_SIZE(data));
+	sprintf((char *)TEXT_DATA, "%s", "000.00");
+	string2ByteArray(TEXT_DATA, DISPLAY_DATA);
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_SESSION_FEE, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 }
 
 //=======================================
-// Setting Precharging parking fee to default
+// SETTING PRECHARGING PARKING FEE DEFAULT
 //=======================================
 void setPrechargingParkingFeeToDefault()
 {
-	uint8_t data[16];
-	uint8_t text[16];
+	uint8_t DISPLAY_DATA[16];
+	uint8_t TEXT_DATA[16];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
-	sprintf((char *)text, "%s", "000.00");
-	string2ByteArray(text, data);
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_PARKING_FEE, data, ARRAY_SIZE(data));
+	sprintf((char *)TEXT_DATA, "%s", "000.00");
+	string2ByteArray(TEXT_DATA, DISPLAY_DATA);
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_PARKING_FEE, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 }
 
 //=======================================
-// Setting Precharging cost to default
+// SETTING PRECHARGING COST DEFAULT
 //=======================================
 void setPrechargingCostToDefault()
 {
-	uint8_t data[16];
-	uint8_t text[16];
+	uint8_t DISPLAY_DATA[16];
+	uint8_t TEXT_DATA[16];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
-	sprintf((char *)text, "%s", "000.00");
-	string2ByteArray(text, data);
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_COST, data, ARRAY_SIZE(data));
+	sprintf((char *)TEXT_DATA, "%s", "000.00");
+	string2ByteArray(TEXT_DATA, DISPLAY_DATA);
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_COST, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 }
 
 //=======================================
-// Setting Precharging power to default
+// SETTING PRECHARGING POWER DEFUALT
 //=======================================
 void setPrechargingPowerToDefault()
 {
-	uint8_t data[16];
-	uint8_t text[16];
+	uint8_t DISPLAY_DATA[16];
+	uint8_t TEXT_DATA[16];
 
-	memset(data, 0x00, ARRAY_SIZE(data));
-	memset(text, 0x00, ARRAY_SIZE(text));
+	memset(DISPLAY_DATA, 0x00, ARRAY_SIZE(DISPLAY_DATA));
+	memset(TEXT_DATA, 0x00, ARRAY_SIZE(TEXT_DATA));
 
-	sprintf((char *)text, "%s kW", "0.00");
-	string2ByteArray(text, data);
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_POWER, data, ARRAY_SIZE(data));
+	sprintf((char *)TEXT_DATA, "%s kW", "0.00");
+	string2ByteArray(TEXT_DATA, DISPLAY_DATA);
+	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PRECHARGING_POWER, DISPLAY_DATA, ARRAY_SIZE(DISPLAY_DATA));
 }
 
 //=======================================

EVSE/Projects/AW-CCS/Apps/Module_InternalComm.c

@@ -36,6 +36,7 @@
 
 #define FAIL_SPEC_COMM		100
 #define ARRAY_SIZE(A)		(sizeof(A) / sizeof(A[0]))
+#define GET_BIT(x, pos)     ((x & ( 1 << pos)) >> pos)
 #define PASS				1
 #define FAIL				0
 #define ON					1
@@ -777,6 +778,7 @@ unsigned char Query_AC_MCU_Status(unsigned char fd, unsigned char targetAddr, Ac
 			Ret_Buf->pp_state = rx[17];
 			Ret_Buf->rating_current = rx[18];
 			Ret_Buf->rotatory_switch = (rx[19] & 0x0F);
+			Ret_Buf->dip_switch = GET_BIT(rx[19], 4);
 			Ret_Buf->socket_e.isSocketEMode = (rx[20] & 0x01);
 			Ret_Buf->socket_e.isSocketEPinOn = ((rx[20]>>1) & 0x01);
 
@@ -2185,6 +2187,8 @@ int main(void)
 					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 Locker State : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.locker_state);
+					DEBUG_INFO("MCU-%d get Relay State : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.relay_state);
 
 					if(ShmCharger->gun_info[gun_index].primaryMcuState.relay_state == ON)
 					{
@@ -2194,15 +2198,14 @@ int main(void)
 							DEBUG_INFO("Relay mode : CHARGING_MODE_BS / CHARGING_MODE_HLC. \n");
 					}
 
-					DEBUG_INFO("MCU-%d get Relay State : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.relay_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);
 					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 Dip Switch : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.dip_switch);
 					DEBUG_INFO("MCU-%d get is on Socket-E mode : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.socket_e.isSocketEMode);
 					DEBUG_INFO("MCU-%d get Socket-E detect pin : %d\n", gun_index, ShmCharger->gun_info[gun_index].primaryMcuState.socket_e.isSocketEPinOn);
-					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);
 
 					previousCharger.gun_info[gun_index].primaryMcuState.cp_state = ShmCharger->gun_info[gun_index].primaryMcuState.cp_state;
 					previousCharger.gun_info[gun_index].primaryMcuState.current_limit = ShmCharger->gun_info[gun_index].primaryMcuState.current_limit;

EVSE/Projects/AW-CCS/Apps/main.h

@@ -421,6 +421,7 @@ typedef struct AC_PRIMARY_MCU
 	unsigned char pp_state;
 	unsigned char rating_current;
 	unsigned char rotatory_switch;
+	unsigned char dip_switch;
 	Relay	relayState;
 	Socket_E socket_e;
 }Ac_Primary_Mcu;