[Improve][AX80][Module_LcmControl]

2021.12.14 / Folus Wen

Actions:
1. Synchronize LCM module from AW-CCS project.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Projects/AX80/Apps/LCM/lcmComm_dgus.c

@@ -2,9 +2,9 @@
  * lcmComm_dgus.c
  *
  * Created on : 2020-10-20
- * Update on : 2021-06-23
+ * Update on : 2021-12-14
  * Author : Folus Wen, Eason Yang
- * Version : D0.01
+ * Version : V0.24
  *
  */
 

EVSE/Projects/AX80/Apps/LCM/lcmComm_dgus.h

@@ -2,9 +2,9 @@
  * lcmComm_dwin.h
  *
  * Created on : 2020-10-20
- * Update on : 2021-06-23
+ * Update on : 2021-12-14
  * Author : Folus Wen, Eason Yang
- * Version : D0.01
+ * Version : V0.24
  *
  */
 
@@ -55,104 +55,79 @@
 //=======================================
 // Register Control type
 //=======================================
-#define REG_TYPE_CONTROL					0x00
-#define REG_TYPE_RAM						0x01
-#define REG_TYPE_SPECIAL_CONTROL			0x02
+#define REG_TYPE_CONTROL						0x00
+#define REG_TYPE_RAM							0x01
+#define REG_TYPE_SPECIAL_CONTROL				0x02
 
 //=======================================
 // Register content (Variable storage)
 //=======================================
-#define REG_ADDRESS_READ_VERSION			0x0F
-#define REG_ADDRESS_READ_RTC				0x10
-#define REG_ADDRESS_READ_PAGE_ID			0x14
-#define REG_ADDRESS_READ_BRIGHTNESS       	0x31
-#define REG_ADDRESS_WRITE_BRIGHTNESS		0X82
-#define REG_ADDRESS_SET_PAGE_ID				0x84
-#define REG_ADDRESS_SET_RTC					0x9C
+#define REG_ADDRESS_READ_VERSION				0x0F
+#define REG_ADDRESS_READ_RTC					0x10
+#define REG_ADDRESS_READ_PAGE_ID				0x14
+#define REG_ADDRESS_READ_BRIGHTNESS       		0x31
+#define REG_ADDRESS_WRITE_BRIGHTNESS			0X82
+#define REG_ADDRESS_SET_PAGE_ID					0x84
+#define REG_ADDRESS_SET_RTC						0x9C
 
 //=======================================
 // LCD command constant
 //=======================================
-#define CMD_HEADER_1						0x5A
-#define CMD_HEADER_2						0xA5
-#define CMD_REG_WRITE						0x80
-#define CMD_REG_READ						0x81
-#define CMD_REG_WRITE_DATA					0x82
-#define CMD_REG_READ_DATA					0x83
-#define CMD_ACK_VALUE_1						0x4F
-#define CMD_ACK_VALUE_2						0x4B
+#define CMD_HEADER_1							0x5A
+#define CMD_HEADER_2							0xA5
+#define CMD_REG_WRITE							0x80
+#define CMD_REG_READ							0x81
+#define CMD_REG_WRITE_DATA						0x82
+#define CMD_REG_READ_DATA						0x83
+#define CMD_ACK_VALUE_1							0x4F
+#define CMD_ACK_VALUE_2							0x4B
 
 //=======================================
 // LCD system screen
 //=======================================
-#define SYSTEM_SCREEN_BOOTING				0x00
-#define SYSTEM_SCREEN_IDLE    	  			0x01
-#define SYSTEM_SCREEN_PREPARING				0x02
-#define SYSTEM_SCREEN_PREPARE_FOR_EVSE		0x03
-#define SYSTEM_SCREEN_CHARGING				0x04
-#define SYSTEM_SCREEN_COMPLETE				0x05
-#define SYSTEM_SCREEN_MAINTAIN				0x06
-#define SYSTEM_SCREEN_AUTH_PASS				0x07
-#define SYSTEM_SCREEN_AUTH_FAIL				0x08
-#define SYSTEM_SCREEN_AUTH_UNKNOW			0x09
-#define SYSTEM_SCREEN_TERMINATING			0X0A
-#define SYSTEM_SCREEN_EMERGENCY				0x0B
-#define SYSTEM_SCREEN_SLEEP					0x0C
-#define SYSTEM_SCREEN_SLEEP2				0x0D
-#define SYSTEM_SCREEN_POWER_CONSUMPTION		0x0E
+#define SYSTEM_SCREEN_BOOTING					0x00
+#define SYSTEM_SCREEN_IDLE    	  				0x01
+#define SYSTEM_SCREEN_PREPARING					0x02
+#define SYSTEM_SCREEN_PREPARE_FOR_EVSE			0x03
+#define SYSTEM_SCREEN_CHARGING					0x04
+#define SYSTEM_SCREEN_COMPLETE					0x05
+#define SYSTEM_SCREEN_MAINTENANCE				0x06
+#define SYSTEM_SCREEN_AUTH_PASS					0x07
+#define SYSTEM_SCREEN_AUTH_FAIL					0x08
+#define SYSTEM_SCREEN_AUTH_UNKNOWN				0x09
+#define SYSTEM_SCREEN_TERMINATING				0X0A
+#define SYSTEM_SCREEN_EMERGENCY					0x0B
+#define SYSTEM_SCREEN_SLEEP						0x0C
+#define SYSTEM_SCREEN_SLEEP2					0x0D
+#define SYSTEM_SCREEN_ALARM						0x0E
+#define SYSTEM_SCREEN_PLUG_AND_CHARGE			0x0F
+#define SYSTEM_SCREEN_COMPLETE_WITH_QRCODE		0x10
+#define SYSTEM_SCREEN_POWER_CONSUMPTION			0x11
 
 //=======================================
 // Parameter to change icon status
 //=======================================
-#define DISAPPEAR							0x00
-#define APPEAR 								0x01
-#define BACKEND_OFFLINE						0x01
-#define BACKEND_ONLINE 						0x02
-#define ETHERENT_OFFLINE					0x03
-#define EHTERNET_ONLINE						0x04
-#define WIFI_OFFLINE						0x05
-#define WIFI_ONLINE							0x06
-#define TELECOM_OFFLINE						0x07
-#define TELECOM_ONLINE						0x08
-#define RFID_DISABLE						0x01
-#define RFID_ENABLE							0x02
-#define VISA_DISABLE						0x03
-#define VISA_ENABLE							0x04
-#define PLUGIN_ARROW_1						0x01
-#define PLUGIN_ARROW_2						0x02
-#define BATTERY_MAP							0x01
-#define BATTERY_CAPACITY_EMPTY				0x02
-#define BATTERY_CAPACITY_20					0x03
-#define BATTERY_CAPACITY_40					0x04
-#define BATTERY_CAPACITY_60					0x05
-#define BATTERY_CAPACITY_80					0x06
-#define BATTERY_CAPACITY_100				0x07
-#define CONNECTION_QUESTION_MARK_1			0x01
-#define CONNECTION_QUESTION_MARK_2			0x02
-#define CONNECTION_ELECTRIC_MARK_1			0x03
-#define CONNECTION_ELECTRIC_MARK_2			0x04
-#define TIMER_DARK							0x01
-#define TIMER_LIGHT							0x02
-#define POWER_DARK							0x01
-#define POWER_LIGHT							0x02
-#define ENERGY_DARK							0x01
-#define ENERGY_LIGHT						0x02
-#define ELECTRICITY_DIRECTION_RIGHT 		0x01
-#define ELECTRICITY_DIRECTION_LEFT 			0x02
-#define BATTERY_SOC_EMPTY					0x01
-#define BATTERY_SOC_20						0x02
-#define BATTERY_SOC_40						0x03
-#define BATTERY_SOC_60						0x04
-#define BATTERY_SOC_80						0x05
-#define BATTERY_SOC_100						0x06
-#define CONNECTION_COMPLETE_MARK			0x01
-#define QRCODE_BANDED						0x01
-#define QRCODE_ENABLE 						0x02
-#define QRCODE_DISABLE						0x03
-#define NEW_QRCODE_DISABLE					0x01
-#define NEW_QRCODE_ENABLE					0x02
-#define NEW_RFID_DISABLE					0x01
-#define NEW_RFID_ENABLE						0x02
+#define DISAPPEAR								0x00
+#define APPEAR 									0x01
+#define BACKEND_OFFLINE							0x01
+#define BACKEND_ONLINE 							0x02
+#define ETHERNET_DISCONNECTED_INTERNET			0x03
+#define ETHERNET_CONNECTED_WITHOUT_INTERNET		0x04
+#define ETHERNET_CONNECTED_INTERNET				0x05
+#define WIFI_DISCONNECTED_INTERNET				0x06
+#define WIFI_CONNECTED_WITHOUT_INTERNET			0x07
+#define WIFI_CONNECTED_INTERNET					0x08
+#define TELECOM_DISCONNECTED_INTERNET			0x09
+#define TELECOM_CONNECTED_WITHOUT_INTERNET		0x0A
+#define TELECOM_CONNECTED_INTERNET				0x0B
+#define QRCODE_DISABLE							0x01
+#define QRCODE_ENABLE							0x02
+#define RFID_DISABLE							0x01
+#define RFID_ENABLE								0x02
+#define PLUGIN_ARROW_1							0x01
+#define PLUGIN_ARROW_2							0x02
+#define CONNECTION_FLASHING_1					0x01
+#define CONNECTION_FLASHING_2					0x02
 
 //=======================================
 // Icon variable address start from 1000
@@ -166,34 +141,58 @@
 #define ICON_ETHERENT_CONNECTION 			0x1006
 #define ICON_BACKEND_CONNECTION				0x1007
 #define ICON_PRICE							0x1008
-#define ICON_RFID							0x1009
-#define ICON_QRCODE							0x100A
-#define ICON_PLUGIN_ARROW					0x100B
-#define ICON_BATTERY_PRECHARGING			0x100C
-#define ICON_CONNECTION_PRECHARGING 		0x100D
-#define ICON_TIMER_PRECHARGING				0x100E
-#define ICON_POWER_PRECHARGING				0x100F
-#define ICON_ENERGY_PRECHARGING				0x1010
-#define ICON_BATTERY_CHARGING				0x1011
-#define ICON_CONNECTION_CHARGING			0x1012
-#define ICON_ELECTRICITY_DIRECTION			0x1013
-#define ICON_TIMER_CHARGING					0x1014
-#define ICON_POWER_CHARGING					0x1015
-#define ICON_ENERGY_CHARGING				0x1016
-#define ICON_WALLER_COMPLETE				0x1017
-#define ICON_BATTERY_COMPLETE				0x1018
-#define ICON_CONNECTION_COMPLETE			0x1019
-#define ICON_TIMER_COMPLETE					0x101A
-#define ICON_COST_COMPLETE					0X101B
-#define ICON_ENERGY_COMPLETE				0X101C
-#define ICON_BALANCE_WALLET					0x101D
-#define ICON_DEFAULT_START_PRICE			0x101E
-#define ICON_DEFAULT_ENERGY					0x101F
-#define ICON_START_BUTTON					0x1020
-#define ICON_POWER_CONSUMPTION				0x1021
-#define ICON_THE_CHARGE_COMPLETE			0x1022
-#define ICON_NEW_RFID						0x1023
-#define ICON_NEW_QR_CODE					0x1024
+#define Reserve_1							0x1009
+#define Reserve_2							0x100A
+#define ICON_PREPARING_PLUG_ARROW			0x100B
+#define ICON_PREPARING_TIMER				0x100C
+#define ICON_PREPARING_ENERGY				0x100D
+#define ICON_PREPARING_COST					0x100E
+#define ICON_PREPARING_POWER				0x100F
+#define ICON_PREPARING_ANIMATION			0x1010
+#define Reserve_3							0x1011
+#define Reserve_4							0x1012
+#define ICON_PRECHARGING_TIMER				0x1013
+#define ICON_PRECHARGING_ENERGY				0x1014
+#define ICON_PRECHARGING_COST				0x1015
+#define ICON_PRECHARGING_POWER				0x1016
+#define ICON_PRECHARGING_ANIMATION			0x1017
+#define ICON_PRECHARGING_FUNNEL				0x1018
+#define Reserve_5							0x1019
+#define Reserve_6							0x101A
+#define ICON_CHARGING_TIMER					0x101B
+#define ICON_CHARGING_ENERGY				0x101C
+#define ICON_CHARGING_COST					0x101D
+#define ICON_CHARGING_POWER					0x101E
+#define ICON_CHARGING_ANIMATION				0x101F
+#define ICON_CHARGING_LIGHTNING				0x1020
+#define Reserve_7							0x1021
+#define Reserve_8							0x1022
+#define ICON_COMPLETE_TIMER					0x1023
+#define ICON_COMPLETE_ENERGY				0x1024
+#define ICON_COMPLETE_WALLET				0x1025
+#define Reserve_9							0x1026
+#define Reserve_10							0x1027
+#define ICON_USER_ACCOUNT_BALANCE			0x1028
+#define Reserve_11							0x1029
+#define Reserve_12							0x102A
+#define ICON_TERMINATE_TIMER				0x102B
+#define ICON_TERMINATE_ENERGY				0x102C
+#define ICON_TERMINATE_POWER				0x102D
+#define ICON_TERMINATE_ANIMATION			0x102E
+#define Reserve_13							0x102F
+#define Reserve_14							0x1030
+#define ICON_COMPLETE_WITH_QRCODE_TIMER		0x1031
+#define ICON_COMPLETE_WITH_QRCODE_ENERGY	0x1032
+#define Reserve_15							0x1033
+#define Reserve_16							0x1034
+#define ICON_POWER_CONSUMPTION				0x1035
+#define Reserve_17							0x1036
+#define Reserve_18							0x1037
+#define ICON_RFID							0x1038
+#define ICON_QR_CODE						0x1039
+#define Reserve_19							0x103A
+#define Reserve_20							0x103B
+#define ICON_PLUG_AND_CHARGE_ARROW			0x103C
 
 #define ICON_LOGO							0x1500
 #define ICON_LOGO_CHARGING					0x1501
@@ -201,40 +200,58 @@
 //=======================================
 // Text content address start from 2000
 //=======================================
-#define TEXT_ALARM_CODE_1					0x2000 // size 6
-#define TEXT_ALARM_CODE_2					0x2006 // size 6
-#define TEXT_ALARM_CODE_3					0x200C // size 6
-#define TEXT_ALARM_CODE_4					0x2012 // size 6
-#define TEXT_PRICE							0x2018 // size 16
-#define TEXT_CURRENCY_UNIT					0x2028 // size 16
-#define TEXT_TIMER_PRECHARGING 				0x2038 // size 16
-#define TEXT_POWER_PRECHARGING 				0x2048 // size 16
-#define TEXT_ENERGY_PRECHARGING 			0x2058 // size 16
-#define TEXT_TIMER_CHARGING					0x2068 // size 16
-#define TEXT_POWER_CHARGING					0x2078 // size 16
-#define TEXT_ENERGY_CHARGING				0x2088 // size 16
-#define TEXT_COST_COMPLETE					0x2098 // size 16
-#define TEXT_ACCOUNT_COMPLETE				0x20A8 // size 16
-#define TEXT_BALANCE						0x20B8 // size 16
-#define TEXT_PERCENTAGE						0x20C8 // size 6
-#define TEXT_CURRENCY_COMPLETE				0x20CE // size 16
-#define TEXT_DEFUALT_START_PRICE			0x20DE // size 16
-#define TEXT_DEFAULT_ENERGY					0x20EE // size 16
-#define TEXT_POWER_CONSUMPTION				0x20FE // size 32
+#define TEXT_ALARM_CODE_1					0x2000	// size 6
+#define TEXT_ALARM_CODE_2					0x2006	// size 6
+#define TEXT_ALARM_CODE_3					0x200C	// size 6
+#define TEXT_ALARM_CODE_4					0x2012	// size 6
+#define TEXT_PRICE							0x2018	// size 16
+#define TEXT_CURRENCY_UNIT					0x2028	// size 16
+#define Reserve1							0x2038	// size 16
+#define TEXT_PREPARING_TIMER				0x2048	// size 16
+#define TEXT_PREPARING_ENERGY				0x2058	// size 16
+#define TEXT_PREPARING_COST					0x2068	// size 16
+#define TEXT_PREPARING_POWER				0x2078	// size 16
+#define TEXT_PREPARING_CONNECTION_TIMER		0x2088	// size 16
+#define Reserve3							0x2098	// size 16
+#define TEXT_PRECHARGING_TIMER				0x20A8	// size 16
+#define TEXT_PRECHARGING_ENERGY				0x20B8	// size 16
+#define TEXT_PRECHARGING_COST				0x20C8	// size 16
+#define TEXT_PRECHARGING_POWER				0x20D8	// size 16
+#define Reserve4							0x20E8	// size 16
+#define Reserve5							0x20F8	// size 16
+#define TEXT_CHARGING_TIMER					0x2108	// size 16
+#define TEXT_CHARGING_ENERGY				0x2118	// size 16
+#define TEXT_CHARGING_COST					0x2128	// size 16
+#define TEXT_CHARGING_POWER					0x2138	// size 16
+#define Reserve6							0x2148	// size 16
+#define Reserve7							0x2158	// size 16
+#define TEXT_REMAINING_ACCOUNT_BALANCE		0x2168	// size 16
+#define TEXT_USER_ACCOUNT_BALANCE			0x2178	// size 16
+#define TEXT_USER_CURRENCY					0x2188	// size 16
+#define Reserve8							0x2198	// size 16
+#define Reserve9							0x21A8	// siez 16
+#define TEXT_POWER_CONSUMPTION				0x21B8	// size 32
 
-#define TEXT_RTC							0X2500 // size 32
+#define TEXT_RTC							0X2500	// size 32
 
 //=======================================
 // QR Code content address start from 3000
 //=======================================
 #define TEXT_QRCODE_CONTENT					0x3000 // size 256
 #define TEXT_QRCODE_RECEIPT					0x3100 // size 256
+#define TEXT_QRCODE_ALARM					0x3200 // siez 256
+
+//=======================================
+// Marquees test content address 6000
+//=======================================
+#define MARQUEES_DEFAULT_PRICE				0x6010
 
 //=======================================
 // QR Code mode define
 //=======================================
 #define QRCODE_FOR_IDLE						1
 #define QRCODE_FOR_COMPLETE					2
+#define QRCODE_FOR_ALARM					3
 
 //=======================================
 // 4G + WIFI connection flags (Header)
@@ -245,16 +262,6 @@
 #define WIFI_STATION						0x01
 #define WIFI_ACCESS_POINT					0x02
 
-//=======================================
-// Battery level status (Charging)
-//=======================================
-#define BATTERY_LEVEL_0						0x00
-#define BATTERY_LEVEL_1						0x01
-#define BATTERY_LEVEL_2						0x02
-#define BATTERY_LEVEL_3						0x03
-#define BATTERY_LEVEL_4						0x04
-#define BATTERY_LEVEL_5						0x05
-
 //=======================================
 // Connection level status (Charging)
 //=======================================
@@ -275,12 +282,6 @@
 #define UNVALIDATED_RFID					2
 #define UNKNOW_RFID							3
 
-//=======================================
-// Normal mode or CCS mode constant
-//=======================================
-#define BASIC_MODE							0x00
-#define CCS_MODE							0x01
-
 //=======================================
 // Price type
 //=======================================
@@ -298,6 +299,7 @@
 #define DEFAULE_PRICE						1
 #define SET_USER_PRICE						2
 #define FINAL_COST							3
+#define RUNNING_COST						4
 
 //=======================================
 // LCM brightness percentage

EVSE/Projects/AX80/Apps/main.h

@@ -542,6 +542,7 @@ typedef struct TIMEOUT_SPEC
 {
 	int Setting_Timeout_Spec;
 	int Present_Timeout_Spec;
+	int Handshake_Timeout;
 }Timeout_Spec;
 
 typedef struct SET_BREATHE_LED_TIMING
@@ -789,6 +790,7 @@ typedef struct GUN_INFO
 	uint32_t										isMeterOn:1;
 	uint32_t										isSleepOn:1;
 	uint32_t										isCheckPowerConsumption:1;
+	uint32_t										isHandshakeTimerRefresh:1;
 	uint32_t										isResetSoftReq:1;
 	uint32_t										isResetHardReq:1;
 	uint32_t										isUpgradeReq:1;