2022-01-20 / Eason Yang

Action
1. Added : p.m. and a.m.
2. Added : $ symbols for setFinalCost() and setRunningCost() function.

File
1. Module_LcmControl.c
Action 1
Action 2

LCM FIRMWARE: V0.27

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

@@ -2,7 +2,7 @@
  * Module_LcmControl.c
  *
  * Created on : 2020-10-20
- * Update on : 2022-01-17
+ * Update on : 2022-01-20
  * Author : Folus Wen, Eason Yang
  * Version : V0.27
  *
@@ -118,7 +118,7 @@ int Uart1Fd;
 //=======================================
 // Record version and date
 //=======================================
-char *FIRMWARE_UPDATE_IMAGE[3] = {"V0.27", "2022-01-17", "REV.03.00"};
+char *FIRMWARE_UPDATE_IMAGE[3] = {"V0.27", "2022-01-20", "REV.03.00"};
 
 //=======================================
 // Common routine
@@ -277,7 +277,7 @@ void getDateTimeString(char* result)
 	tm=localtime(&CurrentTime);
 
 	//sprintf(result, "%04d/%02d/%02d %02d:%02d", tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min);
-	sprintf(result, "%04d/%02d/%02d %02d:%02d %s", tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,(tm->tm_hour%12),tm->tm_min,((tm->tm_hour/12)>0?"p.m":"a.m"));
+	sprintf(result, "%04d/%02d/%02d %02d:%02d %s", tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,(tm->tm_hour%12),tm->tm_min,((tm->tm_hour/12)>0?"p.m.":"a.m."));
 }
 
 //======================================================
@@ -1420,7 +1420,7 @@ void setFinalCost(uint8_t gun_index, uint8_t type)
 			{
 				setDisplayValue(ICON_CHARGING_SESSION_FEE, APPEAR);
 
-				strcpy((char*)session_empty, "-----");
+				strcpy((char*)session_empty, "$ -----");
 				string2ByteArray(session_empty, output_data);
 				lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_SESSION_FEE, output_data, ARRAY_SIZE(output_data));
 			}
@@ -1437,9 +1437,9 @@ void setFinalCost(uint8_t gun_index, uint8_t type)
 					}
 
 					if(chargingCost> 0)
-						sprintf((char*)output_data, "%.2f", chargingCost);
+						sprintf((char*)output_data, "$ %.2f", chargingCost);
 					else
-						sprintf((char*)output_data, "-----");
+						sprintf((char*)output_data, "$ -----");
 
 					// APPEAR COST ICON
 					setDisplayValue(ICON_CHARGING_SESSION_FEE, APPEAR);
@@ -1454,7 +1454,7 @@ void setFinalCost(uint8_t gun_index, uint8_t type)
 			{
 				setDisplayValue(ICON_CHARGING_PARKING_FEE, APPEAR);
 
-				strcpy((char*)occupancy_empty, "-----");
+				strcpy((char*)occupancy_empty, "$ -----");
 				string2ByteArray(occupancy_empty, output_data);
 				lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_PARKING_FEE, output_data, ARRAY_SIZE(output_data));
 			}
@@ -1471,9 +1471,9 @@ void setFinalCost(uint8_t gun_index, uint8_t type)
 					}
 
 					if(parkingCost > 0)
-						sprintf((char*)output_data, "%.2f", parkingCost);
+						sprintf((char*)output_data, "$ %.2f", parkingCost);
 					else
-						sprintf((char*)output_data, "-----");
+						sprintf((char*)output_data, "$ -----");
 
 					setDisplayValue(ICON_CHARGING_PARKING_FEE, APPEAR);
 					lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_PARKING_FEE, output_data, ARRAY_SIZE(output_data));
@@ -1486,7 +1486,7 @@ void setFinalCost(uint8_t gun_index, uint8_t type)
 			{
 				setDisplayValue(ICON_CHARGING_TOTAL_COST, APPEAR);
 
-				strcpy((char*)cost_empty, "-----");
+				strcpy((char*)cost_empty, "$ -----");
 				string2ByteArray(cost_empty, output_data);
 				lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TOTAL_COST, output_data, ARRAY_SIZE(output_data));
 			}
@@ -1509,9 +1509,9 @@ void setFinalCost(uint8_t gun_index, uint8_t type)
 					}
 
 					if((chargingCost + parkingCost) > 0)
-						sprintf((char*)output_data, "%.2f", (chargingCost + parkingCost));
+						sprintf((char*)output_data, "$ %.2f", (chargingCost + parkingCost));
 					else
-						sprintf((char*)output_data, "-----");
+						sprintf((char*)output_data, "$ -----");
 
 					// APPEAR COST ICON
 					setDisplayValue(ICON_CHARGING_TOTAL_COST, APPEAR);
@@ -1525,7 +1525,7 @@ void setFinalCost(uint8_t gun_index, uint8_t type)
 			{
 				setDisplayValue(ICON_COMPLETE_WALLET, APPEAR);
 
-				strcpy((char*)balance_empty, "-----");
+				strcpy((char*)balance_empty, "$ -----");
 				string2ByteArray(balance_empty, output_data);
 
 				lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_REMAINING_ACCOUNT_BALANCE, output_data, ARRAY_SIZE(output_data));
@@ -1543,9 +1543,9 @@ void setFinalCost(uint8_t gun_index, uint8_t type)
 					}
 
 					if(accountBalance > 0)
-						sprintf((char*)output_data, "%.2f", accountBalance);
+						sprintf((char*)output_data, "$ %.2f", accountBalance);
 					else
-						sprintf((char*)output_data, "-----");
+						sprintf((char*)output_data, "$ -----");
 
 
 					// APPEAR COST ICON
@@ -1585,7 +1585,7 @@ void setRunningCost(uint8_t gun_index, uint8_t type)
 			{
 				setDisplayValue(ICON_CHARGING_SESSION_FEE, APPEAR);
 
-				strcpy((char*)session_empty, "-----");
+				strcpy((char*)session_empty, "$ -----");
 				string2ByteArray(session_empty, output_data);
 				lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_SESSION_FEE, output_data, ARRAY_SIZE(output_data));
 			}
@@ -1602,9 +1602,9 @@ void setRunningCost(uint8_t gun_index, uint8_t type)
 					}
 
 					if(chargingCost> 0)
-						sprintf((char*)output_data, "%.2f", chargingCost);
+						sprintf((char*)output_data, "$ %.2f", chargingCost);
 					else
-						sprintf((char*)output_data, "-----");
+						sprintf((char*)output_data, "$ -----");
 
 					// APPEAR COST ICON
 					setDisplayValue(ICON_CHARGING_SESSION_FEE, APPEAR);
@@ -1619,7 +1619,7 @@ void setRunningCost(uint8_t gun_index, uint8_t type)
 			{
 				setDisplayValue(ICON_CHARGING_PARKING_FEE, APPEAR);
 
-				strcpy((char*)occupancy_empty, "-----");
+				strcpy((char*)occupancy_empty, "$ -----");
 				string2ByteArray(occupancy_empty, output_data);
 				lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_PARKING_FEE, output_data, ARRAY_SIZE(output_data));
 			}
@@ -1636,9 +1636,9 @@ void setRunningCost(uint8_t gun_index, uint8_t type)
 					}
 
 					if(parkingCost > 0)
-						sprintf((char*)output_data, "%.2f", parkingCost);
+						sprintf((char*)output_data, "$ %.2f", parkingCost);
 					else
-						sprintf((char*)output_data, "-----");
+						sprintf((char*)output_data, "$ -----");
 
 					setDisplayValue(ICON_CHARGING_PARKING_FEE, APPEAR);
 					lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_PARKING_FEE, output_data, ARRAY_SIZE(output_data));
@@ -1652,7 +1652,7 @@ void setRunningCost(uint8_t gun_index, uint8_t type)
 			{
 				setDisplayValue(ICON_CHARGING_TOTAL_COST, APPEAR);
 
-				strcpy((char*)cost_empty, "-----");
+				strcpy((char*)cost_empty, "$ -----");
 				string2ByteArray(cost_empty, output_data);
 				lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_CHARGING_TOTAL_COST, output_data, ARRAY_SIZE(output_data));
 			}
@@ -1675,9 +1675,9 @@ void setRunningCost(uint8_t gun_index, uint8_t type)
 					}
 
 					if((chargingCost + parkingCost) > 0)
-						sprintf((char*)output_data, "%.2f", (chargingCost + parkingCost));
+						sprintf((char*)output_data, "$ %.2f", (chargingCost + parkingCost));
 					else
-						sprintf((char*)output_data, "-----");
+						sprintf((char*)output_data, "$ -----");
 
 					// APPEAR COST ICON
 					setDisplayValue(ICON_CHARGING_TOTAL_COST, APPEAR);