2022-01-28 / Eason Yang

Action
1. Improve: Disable or ebable title depends on the model name.

File
1. Module_LcmControl.c
Action 1

FIRMWARE VERSION: B0.61.XX.XXXX.PX

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

@@ -49,6 +49,8 @@ void setPresentParkingFee();
 void setBillingFromWebsite();
 int isEthConnected(char *eth);
 void setUserPrice(uint8_t type);
+void setTimeTitle(uint8_t isOn);
+void setEnergyTitle(uint8_t isOn);
 void setCurrentPage(uint8_t page);
 void setDefaultPrice(uint8_t type);
 void setPresentFinalCost(float cost);
@@ -2355,7 +2357,14 @@ void setDefaultValue(uint8_t gun_index, uint8_t system_mode)
 		case SYS_MODE_BOOTING:
 			break;
 		case SYS_MODE_IDLE:
+
 			setTextToEmpty(gun_index);
+			setTimeTitle(ON);
+			setEnergyTitle(ON);
+			setSessionFeeTitle(ON);
+			setParkingFeeTitle(ON);
+			setFinalCostTitle(ON);
+
 			if(ShmCharger->gun_info[gun_index].chargingMode == CHARGING_MODE_HLC)
 			{
 				setDisplayValue(ICON_PRECHARGING_ANIMATION, CONNECTION_FLASHING_1);
@@ -2368,10 +2377,24 @@ void setDefaultValue(uint8_t gun_index, uint8_t system_mode)
 				GUN_PLUGING_LEVEL_STATUS = GUN_PLUGING_LEVEL_0;
 				refreshStartTimer(&startTime[gun_index][TMR_IDX_PLUGIN]);
 			}
+
 			break;
 		case SYS_MODE_AUTHORIZING:
+
+			setTimeTitle(ON);
+			setEnergyTitle(ON);
+			setSessionFeeTitle(ON);
+			setParkingFeeTitle(ON);
+			setFinalCostTitle(ON);
+
 			break;
 		case SYS_MODE_PREPARING:
+
+			setTimeTitle(ON);
+			setEnergyTitle(ON);
+			setSessionFeeTitle(ON);
+			setParkingFeeTitle(ON);
+			setFinalCostTitle(ON);
 			if(ShmCharger->gun_info[gun_index].chargingMode == CHARGING_MODE_HLC)
 			{
 				setDisplayValue(ICON_PRECHARGING_ANIMATION, CONNECTION_FLASHING_1);
@@ -2386,6 +2409,7 @@ void setDefaultValue(uint8_t gun_index, uint8_t system_mode)
 				refreshStartTimer(&startTime[gun_index][TMR_IDX_PLUGIN]);
 				refreshStartTimer(&startTime[gun_index][TMR_IDX_REFRESH_INFO]);
 			}
+
 			break;
 		case SYS_MODE_CHARGING:
 			setDisplayValue(ICON_CHARGING_ANIMATION, CONNECTION_FLASHING_1);
@@ -2469,6 +2493,93 @@ void setMarqueeControl(uint16_t address, uint8_t gun_index, uint8_t type)
 	}
 }
 
+//=======================================
+// Checking model name for setting title
+//=======================================
+int isAmericaType()
+{
+	int result = NO;
+	
+	if(ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'U')
+		result = YES;
+	else
+		result = NO;
+
+	return result;
+}
+
+//=======================================
+// Setting time title
+//=======================================
+void setTimeTitle(uint8_t isOn)
+{
+	uint8_t data[32];
+	uint8_t text[32];
+
+	memset(data, 0x00, ARRAY_SIZE(data));
+	memset(text, 0x00, ARRAY_SIZE(text));
+	
+	if(isAmericaType() == YES)
+	{
+		if(isOn == ON)
+		{
+			strcpy((char*)text, "(hrs: mins: secs)");
+			string2ByteArray(text, data);
+		}
+		else
+		{
+			strcpy((char*)text, "                ");
+			string2ByteArray(text, 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));
+	}
+	else
+	{
+		setDisplayValue(TEXT_CHARGING_TITLE_TIME, DISAPPEAR);
+		setDisplayValue(TEXT_PREPARING_TITLE_TIME, DISAPPEAR);
+		setDisplayValue(TEXT_PRECHARGING_TITLE_TIME, DISAPPEAR);
+	}
+}
+
+//=======================================
+// Setting Energy title
+//=======================================
+void setEnergyTitle(uint8_t isOn)
+{
+	uint8_t data[32];
+	uint8_t text[32];
+
+	memset(data, 0x00, ARRAY_SIZE(data));
+	memset(text, 0x00, ARRAY_SIZE(text));
+	
+	if(isAmericaType() == YES)
+	{
+		if(isOn == ON)
+		{
+			strcpy((char*)text, "(Energy)");
+			string2ByteArray(text, data);
+		}
+		else
+		{
+			strcpy((char*)text, "                ");
+			string2ByteArray(text, 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));
+	}
+	else
+	{
+		setDisplayValue(TEXT_CHARGING_TITLE_ENERGY, DISAPPEAR);
+		setDisplayValue(TEXT_PREPARING_TITLE_ENERGY, DISAPPEAR);
+		setDisplayValue(TEXT_PRECHARGING_TITLE_ENERGY, DISAPPEAR);
+	}
+}
+
 //=======================================
 // Setting session fee title
 //=======================================
@@ -2480,18 +2591,29 @@ void setSessionFeeTitle(uint8_t isOn)
 	memset(data, 0x00, ARRAY_SIZE(data));
 	memset(text, 0x00, ARRAY_SIZE(text));
 	
-	if(isOn == ON)
+	if(isAmericaType() == YES)
 	{
-		strcpy((char*)text, "(Energy Cost)");
-		string2ByteArray(text, data);
+		if(isOn == ON)
+		{
+			strcpy((char*)text, "(Energy Cost)");
+			string2ByteArray(text, data);
+		}
+		else
+		{
+			strcpy((char*)text, "                ");
+			string2ByteArray(text, 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));
 	}
 	else
 	{
-		strcpy((char*)text, "                ");
-		string2ByteArray(text, data);
+		setDisplayValue(TEXT_CHARGING_TITLE_SESSION_FEE, DISAPPEAR);
+		setDisplayValue(TEXT_PREPARING_TITLE_SESSION_FEE, DISAPPEAR);
+		setDisplayValue(TEXT_PRECHARGING_TITLE_SESSION_FEE, DISAPPEAR);
 	}
-	
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_SESSION_FEE, data, ARRAY_SIZE(data));
 }
 
 //=======================================
@@ -2505,18 +2627,29 @@ void setParkingFeeTitle(uint8_t isOn)
 	memset(data, 0x00, ARRAY_SIZE(data));
 	memset(text, 0x00, ARRAY_SIZE(text));
 	
-	if(isOn == ON)
+	if(isAmericaType() == YES)
 	{
-		strcpy((char*)text, "(Parking Fee)");
-		string2ByteArray(text, data);
+		if(isOn == ON)
+		{
+			strcpy((char*)text, "(Parking Fee)");
+			string2ByteArray(text, data);
+		}
+		else
+		{
+			strcpy((char*)text, "                ");
+			string2ByteArray(text, 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));
 	}
 	else
 	{
-		strcpy((char*)text, "                ");
-		string2ByteArray(text, data);
+		setDisplayValue(TEXT_CHARGING_TITLE_PARKING_FEE, DISAPPEAR);
+		setDisplayValue(TEXT_PREPARING_TITLE_PARKING_FEE, DISAPPEAR);
+		setDisplayValue(TEXT_PRECHARGING_TITLE_PARKING_FEE, DISAPPEAR);
 	}
-	
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_PARKING_FEE, data, ARRAY_SIZE(data));
 }
 
 //=======================================
@@ -2530,18 +2663,29 @@ void setFinalCostTitle(uint8_t isOn)
 	memset(data, 0x00, ARRAY_SIZE(data));
 	memset(text, 0x00, ARRAY_SIZE(text));
 	
-	if(isOn == ON)
+	if(isAmericaType() == YES)
 	{
-		strcpy((char*)text, "(Total Cost)");
-		string2ByteArray(text, data);
+		if(isOn == ON)
+		{
+			strcpy((char*)text, "(Total Cost)");
+			string2ByteArray(text, data);
+		}
+		else
+		{
+			strcpy((char*)text, "                ");
+			string2ByteArray(text, 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));
 	}
 	else
 	{
-		strcpy((char*)text, "                ");
-		string2ByteArray(text, data);
+		setDisplayValue(TEXT_CHARGING_TITLE_FINAL_COST, DISAPPEAR);
+		setDisplayValue(TEXT_PREPARING_TITLE_FINAL_COST, DISAPPEAR);
+		setDisplayValue(TEXT_PRECHARGING_TITLE_FINAL_COST, DISAPPEAR);
 	}
-	
-	lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TITLE_FINAL_COST, data, ARRAY_SIZE(data));
 }
 
 //=======================================