🎉 init:重新拉取新的dev，此版屏可亮

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx

@@ -623,6 +623,16 @@
               <FileType>5</FileType>
               <FilePath>..\..\..\..\Source\Device\Cmsemicon\BAT32A279\RTE\RTE.h</FilePath>
             </File>
+            <File>
+              <FileName>RTE_RTC.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\Source\Device\Cmsemicon\BAT32A279\RTE\RTC\RTE_RTC.c</FilePath>
+            </File>
+            <File>
+              <FileName>RTE_RTC.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\..\..\..\Source\Device\Cmsemicon\BAT32A279\RTE\RTC\RTE_RTC.h</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>

Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c

@@ -6,7 +6,7 @@ st_CanMsgTxOp CAN_CH0_CanMsgTxOp;
 
 const st_CAN_SendAttribute    CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL] =
 {
-{0}
+    {0}
 };
 
 const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =

Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.h

@@ -3,9 +3,7 @@
 #include "Components.h"
 #include "CAN_Signal\CAN_Lib.h"
 
-
 extern st_CanMsgOp CAN_CH0_CanMsgOp;
-
 extern st_CanMsgTxOp CAN_CH0_CanMsgTxOp;
 
 typedef enum
@@ -23,7 +21,7 @@ typedef enum
 
 typedef enum
 {
-TEST,
+    TEST,
     CAN_CH0_ID_SEND_TOTAL,
 } CAN_CH0_CAN_MSG_SEND_ID_t;
 

Firmware/Source/Application/Can_User.h

-// #ifndef _CAN_USER_H_
-// #define _CAN_USER_H_
-// #include "RTE.h"
-// #include "Components.h"
+#ifndef _CAN_USER_H_
+#define _CAN_USER_H_
+#include "RTE.h"
+#include "Components.h"
 
 
 
 
 
-// /******************************************************************************
-// Bus-off
-// ******************************************************************************/
-// #define   RSCAN0_BUS_STABLE                 0x00U
-// #define   RSCAN0_BUS_OFF_LV1                0x01U
-// #define   RSCAN0_BUS_OFF_LV2                0x02U
-// #define   RSCAN00_BUS_LIMP                   0x03U
-// /******************************************************************************
-// Bus-off
-// ******************************************************************************/
+/******************************************************************************
+Bus-off
+******************************************************************************/
+#define   RSCAN0_BUS_STABLE                 0x00U
+#define   RSCAN0_BUS_OFF_LV1                0x01U
+#define   RSCAN0_BUS_OFF_LV2                0x02U
+#define   RSCAN00_BUS_LIMP                   0x03U
+/******************************************************************************
+Bus-off
+******************************************************************************/
 
-// #define   RSCAN0_BUS_OFF_LV1_RECOVERY_TIME  90U             
-// #define   RSCAN0_BUS_OFF_LV2_RECOVERY_TIME  1000U      
+#define   RSCAN0_BUS_OFF_LV1_RECOVERY_TIME  90U             
+#define   RSCAN0_BUS_OFF_LV2_RECOVERY_TIME  1000U      
 
-// typedef struct
-// {
-//     uint8_t  Status;
-//     uint8_t  Timer;
-//     uint8_t  Cnt;
-//     uint8_t  ReportDTCCnt;
-// } RSCAN0BusoffMonitorStruct;
+typedef struct
+{
+    uint8_t  Status;
+    uint8_t  Timer;
+    uint8_t  Cnt;
+    uint8_t  ReportDTCCnt;
+} RSCAN0BusoffMonitorStruct;
 
 
 
-// extern void Can_Tx_Apply_Buff(void);
-// extern void Can_RX_Apply_Buff(void);
-// extern void Can_BusOff_Recover(uint8_t deltaTime);
-// extern void COM_CAN_Init(void);
-// extern void Can_Init(void);
-// extern void Can_Rx_Cak(CanTxRxMsg *Msg);
-// extern void Busoff(void);
-// extern uint8_t COM_APP_Process(st_CAN_Msg *Msg);
-// extern void Can_Write(st_CAN_Msg *Msg);
+extern void Can_Tx_Apply_Buff(void);
+extern void Can_RX_Apply_Buff(void);
+extern void Can_BusOff_Recover(uint8_t deltaTime);
+extern void COM_CAN_Init(void);
+extern void Can_Init(void);
+extern void Can_Rx_Cak(CanTxRxMsg *Msg);
+extern void Busoff(void);
+extern uint8_t COM_APP_Process(st_CAN_Msg *Msg);
+extern void Can_Write(st_CAN_Msg *Msg);
 
-// #endif
+#endif

Firmware/Source/Application/CommonInterface.c

@@ -4,7 +4,7 @@
 
 
 uint32_t PowerIgnOnTimeLine;
- uint32_t PowerIgnOffTimeLine;
+uint32_t PowerIgnOffTimeLine;
 
 static uint32_t PowerSocTimeLine;
 

Firmware/Source/Application/GpioUser.h

@@ -35,7 +35,7 @@
 
 #define SWDIO_JTMS                 RTE_GPIO_PORT04_PIN00   
 #define Start_stop_MCU             RTE_GPIO_PORT04_PIN01   
-#define Select_button_MCU          RTE_GPIO_PORT04_PIN02   
+#define KEY_SELECT_MCU             RTE_GPIO_PORT04_PIN02   
 #define VCC1V2_AMT_EN              RTE_GPIO_PORT04_PIN03      //ljs
 
 #define CAN_MCU_RXD                RTE_GPIO_PORT05_PIN00   
@@ -43,7 +43,7 @@
 #define CAN_STB_MCU                RTE_GPIO_PORT05_PIN02   
 #define HighBeam_MCU               RTE_GPIO_PORT05_PIN03   
 #define L_FuelSender_OUT           RTE_GPIO_PORT05_PIN04   
-#define SWITCH_MCU                 RTE_GPIO_PORT05_PIN05   
+#define KEY_OK_MCU                 RTE_GPIO_PORT05_PIN05   
 
 #define IIC_SCL_24G16              RTE_GPIO_PORT06_PIN00   
 #define IIC_SDA_24G16              RTE_GPIO_PORT06_PIN01   

Firmware/Source/Component/Components.h

@@ -27,5 +27,8 @@
 #include "Data_ESpeed.h"
 #include "Data_VSpeed.h"
 #include "BackLight.h"
+#include "RTC\RTE_RTC.h"
+#include "CAN_Signal\CAN_Lib.h"
+#include "CAN_CH0_CAN_Communication_Matrix.h"
 #endif
 

Firmware/Source/Component/Key/Key_user.h

@@ -32,36 +32,23 @@ typedef enum
 
 typedef struct 
 {
-   uint8_t   Set_Hour;
-   uint8_t   Set_Minute;
-   uint8_t   Dis_Hour;
-   uint8_t   Dis_Minute;
+   uint16_t  Back_Time_Left;
+   uint16_t  Back_Time_Right;
+   uint8_t   Back_Time_Right_Flag;
+   uint8_t   Back_Time_Left_Flag;
+   uint8_t   Dis_Hour_Tenb;
+   uint8_t   Dis_Hour_Bit;
+   uint8_t   Dis_Minute_Tenb;
+   uint8_t   Dis_Minute_Bit;
    uint8_t   Unit;
+   uint8_t   Language;
+   uint8_t   OdoAndTrip;
+   uint8_t   Bluetooth_Open_Close;
+   uint8_t   Clock_Flash;
 }_Menu_Data;
 
-typedef enum
-{
-   Page_Time = 0,
-   Page_Time_Set_Hour,
-   Page_Time_Set_Minute,
-
-	Page_Max,
-}_Page_Type;
-
-
-extern uint8_t PageType;
-extern uint8_t Key_Right_Long_Press_Flag;
-extern uint8_t Key_Left_Long_Press_Flag;
 extern uint8_t ClearODO_Flag;
-// extern uint8_t g_u8Menu_Grade;
 extern uint8_t g_u8Cursor_Posittion;
-extern uint8_t g_u8Language;
-extern uint8_t g_u8Theme;
-extern uint8_t g_u8Blue;
-extern uint8_t g_u8DVR_Set;
-extern uint8_t g_u8Formatting;
-extern uint8_t g_u8Factory;
-extern _Menu_Infor MenuInfor;
 extern RTC_CounterTypeDef counter_val;
 extern void Key_KL30_Init_EXample(void);
 extern void Key_Wakeup_Init_EXample(void);
@@ -70,13 +57,22 @@ void Key_Operation_Right(Key_Event_en_t enKeyEvent);
 void Key_Operation_Left(Key_Event_en_t enKeyEvent);
 Key_Status_en_t Key_Status_Read_Left(void);
 Key_Status_en_t Key_Status_Read_Right(void);
-
+void Key_Event_Short_Press_Left(void);
+void Key_Event_Short_Press_Right(void);
+void KEY_RIGHT_EVENT_NONE_Service(void);
+void KEY_LEFT_EVENT_NONE_Service(void);
 void Key_Auto_Save(void);
 uint8_t Get_Dis_Hour_Time(void);
 uint8_t Get_Dis_Minute_Time(void);
-uint8_t Get_Current_PageType(void);
 void TYW_RESET_ODO(void);
 uint8_t Get_Dis_Unit(void);
-void Key_Check_Service(void);
+void Key_TimeOut_Service(void);
+void Key_Clear_Time(void);
+uint8_t Get_Dis_OdoAndTrip(void);
+uint8_t Get_Dis_Bluetooth_Open_Close(void);
+uint8_t Get_Dis_Language(void);
+
+
+
 
 #endif

Firmware/Source/Component/Line_In/Line_In_user.c

@@ -5,63 +5,156 @@
 
 const Line_In_Attribute_st g_stLineInAttribute[LINE_IN_MAX] =
 {
-    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_TurnLeft,        },
-    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_TurnRight,       },
-    {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     60U,  20U,  Get_LINE_IN_HighBeam,        },
-    {LEVEL_HIGH,   LEVEL_LOW,    LINE_IN_IG_ON,     100U, 20U,  Get_LINE_IN_Auto_Start_Stop, },
+    {LEVEL_HIGH,   LEVEL_LOW,    LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Turn_Left,        },
+    {LEVEL_HIGH,   LEVEL_LOW,    LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Turn_Right,       },
+    {LEVEL_HIGH,   LEVEL_LOW,    LINE_IN_IG_ON,     60U,  20U,  Get_LINE_IN_High_Beam,        },
+    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     100U, 20U,  Get_LINE_IN_Efi_Fault,        },
+    {LEVEL_HIGH,   LEVEL_LOW,    LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_ABS,              },
+    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Auto_Start_Stop,  },
+    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Oil_Pressure_Alert,        },
+    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Voltage,          },
+    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Fuel_Level_Low,   },
+    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_E,                },
+    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_S,                },
 };
-
-
-Linelib_uint8_t Get_LINE_IN_TurnLeft(void)
+Linelib_uint8_t Get_LINE_IN_Turn_Left(void)
 {
     Linelib_uint8_t ret = 0U;
-    //if (RTE_GPIO_Get_Level(LeftTurn_P_In))
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
     {
         ret = 1u;
     }
-    //else
+    else
     {
         ret = 0UL;
     }
     return ret;
 }
-
-Linelib_uint8_t Get_LINE_IN_TurnRight(void)
+Linelib_uint8_t Get_LINE_IN_Turn_Right(void)
 {
     Linelib_uint8_t ret = 0U;
-    //if (RTE_GPIO_Get_Level(RightTurn_P_In))
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
     {
         ret = 1u;
     }
-    //else
+    else
     {
         ret = 0UL;
     }
     return ret;
 }
-
-Linelib_uint8_t Get_LINE_IN_HighBeam(void)
+Linelib_uint8_t Get_LINE_IN_High_Beam(void)
 {
     Linelib_uint8_t ret = 0U;
-    //if (RTE_GPIO_Get_Level(HighBeam_P_In))
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
     {
         ret = 1u;
     }
-    //else
+    else
+    {
+        ret = 0UL;
+    }
+    return ret;
+}
+Linelib_uint8_t Get_LINE_IN_Efi_Fault(void)
+{
+    Linelib_uint8_t ret = 0U;
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    {
+        ret = 1u;
+    }
+    else
+    {
+        ret = 0UL;
+    }
+    return ret;
+}
+Linelib_uint8_t Get_LINE_IN_ABS(void)
+{
+    Linelib_uint8_t ret = 0U;
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    {
+        ret = 1u;
+    }
+    else
     {
         ret = 0UL;
     }
     return ret;
 }
-
 Linelib_uint8_t Get_LINE_IN_Auto_Start_Stop(void)
 {
     Linelib_uint8_t ret = 0U;
-    //if (RTE_GPIO_Get_Level(START_STOP_P_IN))
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    {
+        ret = 1u;
+    }
+    else
+    {
+        ret = 0UL;
+    }
+    return ret;
+}
+Linelib_uint8_t Get_LINE_IN_Oil_Pressure_Alert(void)
+{
+    Linelib_uint8_t ret = 0U;
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    {
+        ret = 1u;
+    }
+    else
+    {
+        ret = 0UL;
+    }
+    return ret;
+}
+Linelib_uint8_t Get_LINE_IN_Voltage(void)
+{
+    Linelib_uint8_t ret = 0U;
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    {
+        ret = 1u;
+    }
+    else
+    {
+        ret = 0UL;
+    }
+    return ret;
+}
+Linelib_uint8_t Get_LINE_IN_Fuel_Level_Low(void)
+{
+    Linelib_uint8_t ret = 0U;
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    {
+        ret = 1u;
+    }
+    else
+    {
+        ret = 0UL;
+    }
+    return ret;
+}
+Linelib_uint8_t Get_LINE_IN_E(void)
+{
+    Linelib_uint8_t ret = 0U;
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    {
+        ret = 1u;
+    }
+    else
+    {
+        ret = 0UL;
+    }
+    return ret;
+}
+Linelib_uint8_t Get_LINE_IN_S(void)
+{
+    Linelib_uint8_t ret = 0U;
+    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
     {
         ret = 1u;
     }
-    //else
+    else
     {
         ret = 0UL;
     }
@@ -74,7 +167,7 @@ Linelib_uint8_t LINE_IN_Men[LINE_IN_MAX * LINE_IN_BLOCK_SIZE];
 static Linelib_uint16_t LINE_GET_PWR(void)
 {
     Linelib_uint16_t Res;
-    //Res = Common_Get_IG_Sts() & 0x00FFu;
+    Res = Common_Get_IG_Sts() & 0x00FFu;
     return Res;
 }
 

Firmware/Source/Component/Line_In/Line_In_user.h

@@ -5,19 +5,31 @@
 
 typedef enum
 {
-    LINE_IN_TurnLeft = 0,                          
-    LINE_IN_TurnRight,              
-    LINE_IN_HighBeam,         
-    LINE_IN_Auto_Start_Stop,                                        
+    LINE_IN_Turn_Left,                          
+    LINE_IN_Turn_Right, 
+    LINE_IN_High_Beam,
+    LINE_IN_Efi_Fault,  
+    LINE_IN_ABS,
+    LINE_IN_Auto_Start_Stop,
+    LINE_IN_Oil_Pressure_Alert,
+    LINE_IN_Voltage,
+    LINE_IN_Fuel_Level_Low,
+    LINE_IN_E,
+    LINE_IN_S,
     LINE_IN_MAX,
 } LINE_IN_Enum_t;
 
 extern void LINE_IN_Init(void);
 
-Linelib_uint8_t Get_LINE_IN_TurnLeft(void);
-Linelib_uint8_t Get_LINE_IN_TurnRight(void);
-Linelib_uint8_t Get_LINE_IN_HighBeam(void);
+Linelib_uint8_t Get_LINE_IN_Turn_Left(void);
+Linelib_uint8_t Get_LINE_IN_Turn_Right(void);
+Linelib_uint8_t Get_LINE_IN_High_Beam(void);
+Linelib_uint8_t Get_LINE_IN_Efi_Fault(void);
+Linelib_uint8_t Get_LINE_IN_ABS(void);
 Linelib_uint8_t Get_LINE_IN_Auto_Start_Stop(void);
-
-
+Linelib_uint8_t Get_LINE_IN_Oil_Pressure_Alert(void);
+Linelib_uint8_t Get_LINE_IN_Voltage(void);
+Linelib_uint8_t Get_LINE_IN_Fuel_Level_Low(void);
+Linelib_uint8_t Get_LINE_IN_E(void);
+Linelib_uint8_t Get_LINE_IN_S(void);
 #endif

Firmware/Source/Component/Menu/Menu.h

@@ -34,64 +34,87 @@ typedef unsigned int Menu_uint32_t;
 */
 typedef enum
 {
-	MENU_ITEM_BACKLIGHT_SETTING,   	/*04 背光设置*/
-	MENU_ITEM_BACKLIGHT_AUTO,	 	/*05 背光自动*/
-	MENU_ITEM_BACKLIGHT_1,	      	/*06 背光_1*/
-	MENU_ITEM_BACKLIGHT_2,        	/*07 背光_2*/
-	MENU_ITEM_BACKLIGHT_3,	   	   	/*08 背光_3*/
-	MENU_ITEM_BACKLIGHT_4,		   	/*09 背光_4*/
-	MENU_ITEM_BACKLIGHT_5,	       	/*10 背光_5*/
+	MENU_ITEM_MAIN_ITEM = 0,				/*主界面*/
+	MENU_ITEM_DISPLAY_MODE,  			    /*00 显示模式*/
+	MENU_ITEM_BACKLIGHT_SETTING,   			/*04 背光设置*/
+	MENU_ITEM_BLUETOOTH_CONNECT,   			/*11 蓝牙连接*/
+	MENU_ITEM_CLOCK_SETTING,  	  			/*15 时钟设置*/
+	MENU_ITEM_UNIT_SETTING,	   				/*21 单位设置*/
+	MENU_ITEM_LANGUAGE_SETTING,				/*24 语言设置*/
+	MENU_ITEM_FAULT_INFORMATION,			/*27 故障信息*/
+	MENU_ITEM_PHONE_CONNECT,  				/*28 手机互联*/
+	MENU_ITEM_QUIT,  						/*29 退出*/
 
-	MENU_ITEM_BLUETOOTH_CONNECT,   	/*11 蓝牙连接*/
-	MENU_ITEM_BLUETOOTH_OPEN,      	/*12 蓝牙_开*/
-	MENU_ITEM_BLUETOOTH_CLOSE,	   	/*13 蓝牙_关*/
-	MENU_ITEM_BLUETOOTH_BACK,	   	/*14 蓝牙返回*/
+	MENU_ITEM_SELECT_DAYTIME,	   			/*01 选中日间*/
+	MENU_ITEM_SELECT_NIGHTTIME,    			/*02 选中夜间*/
+	MENU_ITEM_SELECT_AUTO,	       			/*03 选中自动*/
 
+	MENU_ITEM_BACKLIGHT_5,	       			/*10 背光_5*/
+	MENU_ITEM_BACKLIGHT_4,		   			/*09 背光_4*/
+	MENU_ITEM_BACKLIGHT_3,	   	   			/*08 背光_3*/
+	MENU_ITEM_BACKLIGHT_2,        			/*07 背光_2*/
+	MENU_ITEM_BACKLIGHT_1,	      			/*06 背光_1*/
+	MENU_ITEM_BACKLIGHT_AUTO,	 			/*05 背光自动*/
 
-	MENU_ITEM_CLOCK_SETTING,  	  	/*15 时钟设置*/
-	MENU_ITEM_CLOCK_BACK, 	      	/*16 时钟返回*/
-	MENU_ITEM_CLOCK_MIN_BIT,	  	/*17 时钟分钟个位*/
-	MENU_ITEM_CLOCK_MIN_TENB,	  	/*18 时钟分钟十位*/
-	MENU_ITEM_CLOCK_HOUR_BIT,		/*19 时钟小时个位*/
-	MENU_ITEM_CLOCK_HOUR_TENB,	    /*20 时钟小时十位*/
+	MENU_ITEM_BLUETOOTH_OPEN_CLOSE,         /*12 蓝牙_开*/
+	MENU_ITEM_BLUETOOTH_SYNC,	   	        /*13 蓝牙同步联系人*/
+	MENU_ITEM_BLUETOOTH_BACK,	   			/*14 蓝牙返回*/
 
-	MENU_ITEM_UNIT_SETTING,	   		/*21 单位设置*/
-	MENU_ITEM_UNIT_KM,	   			/*22 选中公制*/
-	MENU_ITEM_UNIT_MILE,	   		/*23 选中英制*/
+	MENU_ITEM_CLOCK_HOUR_TENB,	    		/*20 时钟小时十位*/
+	MENU_ITEM_CLOCK_HOUR_BIT,				/*19 时钟小时个位*/
+	MENU_ITEM_CLOCK_MIN_TENB,	  			/*18 时钟分钟十位*/
+	MENU_ITEM_CLOCK_MIN_BIT,	  			/*17 时钟分钟个位*/
+	MENU_ITEM_CLOCK_BACK, 	      			/*16 时钟返回*/
 
-	MENU_ITEM_LANGUAGE_SETTING,		/*24 语言设置*/
-	MENU_ITEM_LANGUAGE_CHINESE,   	/*25 选中中文*/
-	MENU_ITEM_LANGUAGE_ENGLISH,	   	/*26 选中英文*/
+	MENU_ITEM_CLOCK_HOUR_TENB_SET,	    		/*20 时钟小时十位*/
+	MENU_ITEM_CLOCK_HOUR_BIT_SET,				/*19 时钟小时个位*/
+	MENU_ITEM_CLOCK_MIN_TENB_SET,	  			/*18 时钟分钟十位*/
+	MENU_ITEM_CLOCK_MIN_BIT_SET,	  			/*17 时钟分钟个位*/
 
-	MENU_ITEM_FAULT_INFORMATION,	/*27 故障信息*/
+	MENU_ITEM_UNIT_KM,	   					/*22 选中公制*/
+	MENU_ITEM_UNIT_MILE,	   				/*23 选中英制*/
+		
+	MENU_ITEM_LANGUAGE_CHINESE,   			/*25 选中中文*/
+	MENU_ITEM_LANGUAGE_ENGLISH,	   			/*26 选中英文*/
 
-	MENU_ITEM_PHONE_CONNECT,  		/*28 手机互联*/
-	MENU_ITEM_PHONE_CONNECT_WIN,  	/*28 手机互联成功*/
-
-	MENU_ITEM_QUIT,  				/*29 退出*/
-
-	 MENU_ITEM_MAX,
+	MENU_ITEM_PHONE_CONNECT_SET,
+		
+	MENU_ITEM_PHONE_CONNECT_APP,  			/*28 手机互联成功*/
+		
+	MENU_ITEM_MAX,
 } Menu_Item_en_t;
 /*所有菜单界面的枚举*/
 typedef enum
 {
-	MENU_INTF_DISPLAY_MODE = 0U,		/*显示模式*/
-
-	MENU_INTF_BACKLIGHT_SETTING,		/*背光设置*/
-
-	MENU_INTF_BLUETOOTH_CONNECT,		/*蓝牙连接*/
-
-	MENU_INTF_CLOCK_SETTING,			/*时钟设置*/
-
-	MENU_INTF_UNIT_SETTING,		 		/*单位设置*/
-
-	MENU_INTF_LANGUAGE_SETTING,		 	/*语言设置*/
+	MENU_INTF_MAIN_INTF = 0,
 
-	MENU_INTF_FAULT_INFORMATION,	 	/*故障信息*/
+	MENU_INTF_MODE,
 
-	MENU_INTF_PHONE_CONNECT,			/*手机互联*/
+	MENU_INTF_DISPLAY_MODE,			        /*显示模式*/
+	
+	MENU_INTF_BACKLIGHT_SETTING,			/*背光设置*/
+	
+	MENU_INTF_BLUETOOTH_CONNECT,			/*蓝牙连接*/
+	
+	MENU_INTF_CLOCK_SETTING,				/*时钟设置*/
 
-	MENU_INTF_QUIT,			 			/*退出*/
+	MENU_INTF_CLOCK_HOUR_TENB_SET,
+	MENU_INTF_CLOCK_HOUR_BIT_SET,	
+	MENU_INTF_CLOCK_MIN_TENB_SET,	
+	MENU_INTF_CLOCK_MIN_BIT_SET,	
+	
+	MENU_INTF_UNIT_SETTING,		 			/*单位设置*/
+	
+	MENU_INTF_LANGUAGE_SETTING,		 		/*语言设置*/
+	
+	MENU_INTF_FAULT_INFORMATION,	 		/*故障信息*/
+	
+	MENU_INTF_PHONE_CONNECT,				/*手机互联*/
+	
+	MENU_INTF_PHONE_CONNECT_SET,
+	
+	MENU_INTF_QUIT,			 				/*退出*/
+	
 	MENU_INTERFACE_MAX,
 } Menu_Interface_en_t;
 /*所有菜单分支*/
@@ -398,6 +421,8 @@ extern Menu_uint8_t Menu_Item_Select_Get(Menu_Item_en_t enMenuItem);
 /*-----------------------------------------------------------------------------------*/
 extern Menu_uint8_t u8MenuRamData[MENU_RAM_DATA_LEN];
 extern void Menu_Service(Menu_Key_en_t enMenuKey);
+void Menu_User_Init(void);
+void Menu_User_WAKEUP(void);
 /*-----------------------------------------------------------------------------------*/
 /*-----------------------------------------------------------------------------------*/
 /*-----------------------------------------------------------------------------------*/

Firmware/Source/Component/PowerManagement/PowerManag_user.c

 #include "PowerManagement.h"
 #include "Components.h"
 
-//RTC_Information_st_t g_stRTCInformation;
+RTC_Information_st_t g_stRTCInformation;
 
 static void Power_KL30_Init(void);
 static void Power_Wakeup_Init(void);
@@ -10,14 +10,11 @@ static void Power_OVP_Init(void);
 static void Power_IG_OFF_Init(void);
 static void Power_IG_ON_Init(void);
 static void Power_Sleep_Init(void);
-
 static Power_Status_em Power_Stay_ON(void);
 static Power_Status_em Power_Stay_OFF(void);
 static Power_Status_em Power_Stay_Protect(void);
 static Power_Status_em Power_Stay_Sleep(void);
 
-
-
 static const st_PowerGroup g_stPwrTasks = {
     Power_KL30_Init,
     Power_IG_OFF_Init,
@@ -56,45 +53,44 @@ static void Power_KL30_Init(void)
     Data_User_Mileage_KL30Init();
     Fuel_KL30_Init();
     Amt630hInit();
+    Telltales_Init();
     TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
     TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
-
-
-//    g_stRTCInformation.u8RTCSecond = 0;
-//	g_stRTCInformation.u8RTCMinute = 0;
-//	g_stRTCInformation.u8RTCHour = 0;          
-//	g_stRTCInformation.u8RTCDayOfMonth = 1;
-//	g_stRTCInformation.u8RTCMonth = 1;   
-//	g_stRTCInformation.u8RTCYear = 20; 
-//    RTE_RTC_Init(g_stRTCInformation);
-//    RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
+    g_stRTCInformation.u8RTCSecond = 0;
+	g_stRTCInformation.u8RTCMinute = 0;
+	g_stRTCInformation.u8RTCHour = 0;          
+	g_stRTCInformation.u8RTCDayOfMonth = 1;
+	g_stRTCInformation.u8RTCMonth = 1;   
+	g_stRTCInformation.u8RTCYear = 20; 
+    RTE_RTC_Init(g_stRTCInformation);
+    Menu_User_Init();
+    Can_Init();
     Protocol_KL30_Wakeup_Init();
-
+    //RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN, Trigger_Rising);
 }
-//extern uint32_t PowerIgnOffTimeLine;
+
 static void Power_Wakeup_Init(void)
 {
-//    PowerIgnOffTimeLine = 0;
-
     Gpio_Init(Gpio_WakeUp_Init);
-
     eeprom_StoreInfo_Init();
     Analog_Signal_Conv_Init();
     Data_User_Mileage_WakeupInit();
-
-   Sys_WakeUp_Init();
-   Data_Vehicle_Speed_KL30_Wakeup_Init();
-   Data_Engine_Speed_KL30_Wakeup_Init();
-   LINE_IN_Init();
-   Key_Wakeup_Init_EXample();
-   Line_In_KL15_ON_Init();
-   Fuel_KL30_Init();
-   Amt630hInit();
-   TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
-   TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
-   //Telltales_Init();
-//    RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
+    Sys_WakeUp_Init();
+    Data_Vehicle_Speed_KL30_Wakeup_Init();
+    Data_Engine_Speed_KL30_Wakeup_Init();
+    LINE_IN_Init();
+    Key_Wakeup_Init_EXample();
+    Line_In_KL15_ON_Init();
+    Fuel_KL30_Init();
+    Amt630hInit();
+    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
+    TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
+    Telltales_Init();
+    Key_KL30_Init_EXample();    
+    Menu_User_WAKEUP();
+    Can_Init();
     Protocol_KL30_Wakeup_Init();
+    //RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN, Trigger_Rising);
 }
 
 static void Power_LVP_Init(void)
@@ -109,7 +105,6 @@ static void Power_OVP_Init(void)
 static void Power_IG_OFF_Init(void)
 {
    Line_In_KL15_OFF_Init();
-
 }
 
 static void Power_IG_ON_Init(void)
@@ -123,19 +118,15 @@ static void Power_IG_ON_Init(void)
 static void Power_Sleep_Init(void)
 {
     TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 0);
-//	//RTC_Stop();
-//	rte_can_deinit(CAN_CH_0);
+	rte_can_deinit(CAN_CH_0);
 	TMM0_Stop();
 	TMM1_Stop();
     TMM_All_Stop();
-   RTE_ADC_DeInit();
-//	//CGC->CSC = 1 ;   //HIOSTOP = 1
-
+    RTE_ADC_DeInit();
     Gpio_Init(Gpio_Sleep_Init);
     AMT630H_Sleep();
-   
-   Analog_Signal_Conv_Stop();
-//    RTE_DEEPSLEEP_Enable();
+    Analog_Signal_Conv_Stop();
+    RTE_DEEPSLEEP_Enable();
 }
 
 static Power_Status_em Power_Stay_ON(void)
@@ -160,66 +151,77 @@ static Power_Status_em Power_Stay_OFF(void)
     Power_Status_em u8PowerSts;
     u8PowerSts = EM_IGN_OFF;
 
-   if (SYS_OPR_STAT_IGN_ON)
-   {
-       u8PowerSts = EM_IGN_ON_Init;
-   }
-   else
-   {
-       if ((Common_GetIgnOffTime() < 20000))
-       {
-           u8PowerSts = EM_IGN_OFF;
-       }
-       else
-       {
-           u8PowerSts = EM_IGN_Sleep_Init;
-       }
-   }
+    if (SYS_OPR_STAT_IGN_ON)
+    {
+        u8PowerSts = EM_IGN_ON_Init;
+    }
+    else
+    {
+        if ((Common_GetIgnOffTime() < 1000))
+        {
+            u8PowerSts = EM_IGN_OFF;
+        }
+        else
+        {
+            //igoff大于1s且下15电才进休眠,否则一直保持在igoff状态
+            if(Sys_Read_KL15_Voltage() < 5000)
+            {
+                u8PowerSts = EM_IGN_Sleep_Init;
+            }
+        }
+    }
 
     return u8PowerSts;
 }
 
 static Power_Status_em Power_Stay_Protect(void)
 {
-   Power_Status_em u8PowerSts;
+    Power_Status_em u8PowerSts;
 //    static uint8_t  i;
-   static uint8_t  Delaycnt;
+    static uint8_t  Delaycnt;
 
 
-   /* 关闭所有外设，坪保留AD采集，电溝状思切�? */
-   {
-
+    /* 关闭所有外设，坪保留AD采集，电溝状思切�? */
+    {
         TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0);
-   }
-   u8PowerSts = EM_IGN_OFF_Init;
-   /* 电溝模弝正常 */
-   for ( ;; )
-   {
-       RTE_WDT_Clear();
-       Gen_TimeDelay(2000u, 50u);
-       Analog_Signal_Conv_Service();
-       Sys_Status_Update_Service();
-
-       if ( SYS_OPR_STAT_RUN )
-       {
-           return u8PowerSts;
-       }
-   }
+        CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
+    }
+    u8PowerSts = EM_IGN_OFF_Init;
+    /* 电溝模弝正常 */
+    for ( ;; )
+    {
+        RTE_WDT_Clear();
+        Gen_TimeDelay(2000u, 50u);
+        Analog_Signal_Conv_Service();
+        Sys_Status_Update_Service();
+ 
+        if ( SYS_OPR_STAT_RUN )
+        {
+            CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
+            return u8PowerSts;
+        }
+ 
+        //进入异常电压,电源库里直接将15电等于0,则直接退出,状态是igoff,下15则进入休眠
+        if ( SYS_OPR_STAT_IGN_OFF )
+        {
+           break;
+        }
+    }
 }
 
 static Power_Status_em Power_Stay_Sleep(void)
 {
     Power_Status_em u8PowerSts = EM_IGN_Sleep;
 
-   while (1)
-   {
-       RTE_WDT_Clear();
-       if (RTE_GPIO_Get_Level(KL15_AD_IN))/* KL15 */
-       {
-           u8PowerSts = EM_IGN_Wakeup;
-           break;
-       }
-   }
+    while (1)
+    {
+        RTE_WDT_Clear();
+        if (RTE_GPIO_Get_Level(KL15_AD_IN))/* KL15 */
+        {
+            u8PowerSts = EM_IGN_Wakeup;
+            break;
+        }
+    }
 
     return u8PowerSts;
 }

Firmware/Source/Component/Telltales/Telltales_user.h

-//#ifndef TELLTALES_USER_H
-//#define TELLTALES_USER_H
-
-
-//typedef enum
-//{                  
-//    em_LED_High_Beam, 
-//    em_LED_Efi_Fault,
-//    em_LED_Auto_Start_Stop,
-//    em_LED_Voltage,    
-//    em_LED_Fuel,
-//    em_LED_Atmosphere,
-//    
-
-//    LED_Max ,                            
-//} LED_Idx_t;
-
-//extern Tellib_uint8_t Auto_Start_Stop ;
-//void Telltales_Init(void);
-
-//Tellib_uint8_t Telltales_Voltage_Date(void);
-
-//#endif
+#ifndef TELLTALES_USER_H
+#define TELLTALES_USER_H
+typedef enum
+{              
+    em_LED_Turn_Left,      
+    em_LED_Turn_Right,     
+    em_LED_High_Beam,      
+    em_LED_Efi_Fault,      
+    em_LED_ABS,            
+    em_LED_Auto_Start_Stop,    
+    em_LED_Oil_Pressure_Alert,
+    em_LED_TCS,           
+    em_LED_HEV,           
+    em_LED_Voltage,       
+    em_LED_Fuel_Level_Low,
+    em_LED_Coolant_Temperature,
+    em_LED_WIFI,     
+    em_LED_Bluetooth,
+    em_LED_E,        
+    em_LED_S,        
+    
+    
+    LED_Max ,                            
+} LED_Idx_t;
+extern Tellib_uint8_t Auto_Start_Stop ;
+void Telltales_Init(void);
+Tellib_uint8_t Telltales_Voltage_Date(void);
+#endif

Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/CAN/rte_can.c

@@ -20,8 +20,8 @@ static void can_recv_handler(void *msg)
     if (CAN_GetFlagStatus(CAN0, CAN_FLAG_REC) != RESET)
     {
         CAN_ClearFlag(CAN0, CAN_FLAG_REC);
-//        CANMSG = CAN_Get_CANxMSGy(CAN0);
-//        CAN_Receive_IT(CAN0, &CAN_RecvMsg);
+        // CANMSG = CAN_Get_CANxMSGy(CAN0);
+        // CAN_Receive_IT(CAN0, &CAN_RecvMsg);
         
         if (can_rx_handler != NULL)
         {
@@ -31,9 +31,9 @@ static void can_recv_handler(void *msg)
 }
 
 /**
- * @brief CAN初始?
+ * @brief CAN初始�?
  * 
- * @param config CAN初始结构体指?
+ * @param config CAN初始结构体指�?
  * @return uint8_t 0成功 1失败
  */
 uint8_t rte_can_init(can_config_st_t *config)
@@ -98,7 +98,7 @@ uint8_t rte_can_init(can_config_st_t *config)
 
 /**
  * @brief can反初始化
- * @param CANx CAN0 ? CAN1
+ * @param CANx CAN0 �? CAN1
  * 
  * @return uint8_t 0成功 1失败
  */
@@ -124,10 +124,10 @@ uint8_t rte_can_deinit(CAN_CH ch)
 
 /**
  * @brief 获取CAN是否BusOff
- * @param CANx CAN0 ? CAN1
+ * @param CANx CAN0 �? CAN1
  * 
  * @return uint8_t 0 没有busoff 
- *                 1 错误的操? 2 busoff
+ *                 1 错误的操�? 2 busoff
  */
 uint8_t get_can_busoff(CAN_CH ch)
 {
@@ -151,9 +151,9 @@ uint8_t get_can_busoff(CAN_CH ch)
 }
 
 /**
- * @brief 从busoff状态恢?
+ * @brief 从busoff状态恢�?
  * 
- * @param CANx CAN0 ? CAN1
+ * @param CANx CAN0 �? CAN1
  * @return uint8_t 0成功 1失败
  */
 uint8_t reset_busoff(CAN_CH ch)
@@ -189,7 +189,7 @@ uint8_t reset_busoff(CAN_CH ch)
     return 0;
 }
 
-/*  下面是一些例? 自己? 
+/*  下面是一些例�? 自己�? 
 	CAN_SendMsg.Id = 0x00aa0432;
 	CAN_SendMsg.IDE = CAN_Id_Extended;
 	CAN_SendMsg.CacheType = CAN_CacheType_Tx;

Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/CLOCK_Select/RTE_CLOCK_Select_BAT32A279.c

@@ -11,24 +11,21 @@ uint32_t RTE_SystemCoreClock;
 extern uint32_t SystemCoreClock; 
 void RTE_CLOCK_Select_Start(void)
 {
-	////uint32_t msCnt; 
+
 
 #ifdef USED_FX_FCLK
-/* config clock */
-    CGC_HSEConfig(OSC_OSCILLATOR,OSC_UNDER_10M);
-	CGC_PLL_Setting(PLL_SR_fMX,PLL_DIV_2,PLL_MUL_16);
-	CGC_PLL_CFG_AS_FCLK(); 
-	SystemCoreClockUpdate();
-	RTE_SystemCoreClock = SystemCoreClock;
-	delay_init(64000000);
-	SystemCoreClock = 64000000UL;
+ CGC_Osc_Setting(OSC_OSCILLATOR,OSC_UNDER_10M,OSC_OSCILLATOR,OSC_NORMAL_POWER);
+ CGC_PLL_Setting(PLL_SR_fMX,PLL_DIV_2,PLL_MUL_16);
+ CGC_PLL_CFG_AS_FCLK(); 
+ delay_init(64000000);
+ SystemCoreClock = 64000000UL;
 #endif
 
-#ifdef USED_FHOCO_FCLK	
-	SystemCoreClockUpdate();
-  msCnt = SystemCoreClock / 1000;
-  SysTick_Config(msCnt);
-  delay_init(SystemCoreClock);
+#ifdef USED_FHOCO_FCLK 
+ SystemCoreClockUpdate();
+ msCnt = SystemCoreClock / 1000;
+ SysTick_Config(msCnt);
+ delay_init(SystemCoreClock);
 #endif
 }
 

Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/RTC/RTE_RTC.c

@@ -151,7 +151,7 @@ void RTE_RTC_Init(RTC_Information_st_t g_stRTCInformation)
     RTC_InitStructure.RTC_Date.RTC_WeekDay = g_stRTCInformation.u8RTCDayOfWeek;//????
     RTC_InitStructure.RTC_Date.RTC_Month = g_stRTCInformation.u8RTCMonth;   //5??
     RTC_InitStructure.RTC_Date.RTC_Year = g_stRTCInformation.u8RTCYear;   //2022?��
-    RTC_InitStructure.RTC_Period = One_Second; //RTC ????????1s?��?��???��????????
+    RTC_InitStructure.RTC_Period = Period_None; //RTC ????????1s?��?��???��????????
 
     RTC_InitStructure.RTC_Alarm_Onoff = RTC_Alarm_Off;
     RTC_InitStructure.RTC_Alarm.Alarm_Minute = 0; 

Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/UART/RTE_UART.c

@@ -12,8 +12,8 @@ void     RTE_UART_Sleep_Init(UART_Channel_en_t enUARTCh);
 /*******************************************************/
 typedef struct
 {
-    uint8_t  u8UARTCount;      /*发送计数*/
-    uint8_t  u8UARTLEN;        /*发送数据总长*/
+    uint32_t  u32UARTCount;      /*发送计数*/
+    uint32_t  u32UARTLEN;        /*发送数据总长*/
     uint8_t  u8UARTTXBusyFlag; /*发送是否忙标志  0:idle  1:busy */
     uint8_t *pu8UARTDataBuf;   /*要发送数据的指针*/
 } UART_Ctr_st_t;
@@ -33,8 +33,8 @@ static UART_Channel_Config_st_t stUARTCh2Cfg;
 static void RTE_UART_Variate_Init(void);
 static void RTE_UART_Variate_Init(void)
 {
-    stUARTCtr0.u8UARTCount      = 0U;
-    stUARTCtr0.u8UARTLEN        = 0U;
+    stUARTCtr0.u32UARTCount      = 0U;
+    stUARTCtr0.u32UARTLEN        = 0U;
     stUARTCtr0.u8UARTTXBusyFlag = 0U;
     stUARTCtr0.pu8UARTDataBuf   = 0U;
 
@@ -43,8 +43,8 @@ static void RTE_UART_Variate_Init(void)
     stUARTCh0Cfg.pfnUARTConfirmCallBack = 0U;
     stUARTCh0Cfg.pfnUARTReadMsgCallBack = 0U;
 
-    stUARTCtr1.u8UARTCount      = 0U;
-    stUARTCtr1.u8UARTLEN        = 0U;
+    stUARTCtr1.u32UARTCount      = 0U;
+    stUARTCtr1.u32UARTLEN        = 0U;
     stUARTCtr1.u8UARTTXBusyFlag = 0U;
     stUARTCtr1.pu8UARTDataBuf   = 0U;
 
@@ -53,8 +53,8 @@ static void RTE_UART_Variate_Init(void)
     stUARTCh1Cfg.pfnUARTConfirmCallBack = 0U;
     stUARTCh1Cfg.pfnUARTReadMsgCallBack = 0U;
 
-    stUARTCtr2.u8UARTCount      = 0U;
-    stUARTCtr2.u8UARTLEN        = 0U;
+    stUARTCtr2.u32UARTCount      = 0U;
+    stUARTCtr2.u32UARTLEN        = 0U;
     stUARTCtr2.u8UARTTXBusyFlag = 0U;
     stUARTCtr2.pu8UARTDataBuf   = 0U;
 
@@ -288,8 +288,8 @@ void UART_Ch0_Send_Multiple_Byte(uint8_t *Data, uint8_t Len)
 {
     if ( UART_Ch0_Get_TX_Busy_Flag( ) == 0U )
     {
-        stUARTCtr0.u8UARTCount      = 1U;
-        stUARTCtr0.u8UARTLEN        = Len;
+        stUARTCtr0.u32UARTCount      = 1U;
+        stUARTCtr0.u32UARTLEN        = Len;
         stUARTCtr0.u8UARTTXBusyFlag = 1U;
         stUARTCtr0.pu8UARTDataBuf   = Data;
         UART0_TX                  = stUARTCtr0.pu8UARTDataBuf [ 0U ];
@@ -299,8 +299,8 @@ void UART_Ch1_Send_Multiple_Byte(uint8_t *Data, uint8_t Len)
 {
     if ( UART_Ch1_Get_TX_Busy_Flag( ) == 0U )
     {
-        stUARTCtr1.u8UARTCount      = 1U;
-        stUARTCtr1.u8UARTLEN        = Len;
+        stUARTCtr1.u32UARTCount      = 1U;
+        stUARTCtr1.u32UARTLEN        = Len;
         stUARTCtr1.u8UARTTXBusyFlag = 1U;
         stUARTCtr1.pu8UARTDataBuf   = Data;
         UART1_TX                  = stUARTCtr1.pu8UARTDataBuf [ 0U ];
@@ -310,8 +310,8 @@ void UART_Ch2_Send_Multiple_Byte(uint8_t *Data, uint8_t Len)
 {
     if ( UART_Ch2_Get_TX_Busy_Flag( ) == 0U )
     {
-        stUARTCtr2.u8UARTCount      = 1U;
-        stUARTCtr2.u8UARTLEN        = Len;
+        stUARTCtr2.u32UARTCount      = 1U;
+        stUARTCtr2.u32UARTLEN        = Len;
         stUARTCtr2.u8UARTTXBusyFlag = 1U;
         stUARTCtr2.pu8UARTDataBuf   = Data;
         UART2_TX                  = stUARTCtr2.pu8UARTDataBuf [ 0U ];
@@ -419,9 +419,9 @@ void UART_CH3_RX_ISR(void)
 void UART_CH0_TX_ISR(void)
 {
     INTC_ClearPendingIRQ(ST0_IRQn);
-    if ( stUARTCtr0.u8UARTCount < stUARTCtr0.u8UARTLEN )
+    if ( stUARTCtr0.u32UARTCount < stUARTCtr0.u32UARTLEN )
     {
-        UART0_TX = stUARTCtr0.pu8UARTDataBuf [ stUARTCtr0.u8UARTCount++ ];
+        UART0_TX = stUARTCtr0.pu8UARTDataBuf [ stUARTCtr0.u32UARTCount++ ];
     }
     else
     {
@@ -435,9 +435,9 @@ void UART_CH0_TX_ISR(void)
 void UART_CH1_TX_ISR(void)
 {
     INTC_ClearPendingIRQ(ST1_IRQn);
-    if ( stUARTCtr1.u8UARTCount < stUARTCtr1.u8UARTLEN )
+    if ( stUARTCtr1.u32UARTCount < stUARTCtr1.u32UARTLEN )
     {
-        UART1_TX = stUARTCtr1.pu8UARTDataBuf [ stUARTCtr1.u8UARTCount++ ];
+        UART1_TX = stUARTCtr1.pu8UARTDataBuf [ stUARTCtr1.u32UARTCount++ ];
     }
     else
     {
@@ -451,9 +451,9 @@ void UART_CH1_TX_ISR(void)
 void UART_CH2_TX_ISR(void)
 {
     INTC_ClearPendingIRQ(ST2_IRQn);
-    if ( stUARTCtr2.u8UARTCount < stUARTCtr2.u8UARTLEN )
+    if ( stUARTCtr2.u32UARTCount < stUARTCtr2.u32UARTLEN )
     {
-        UART2_TX = stUARTCtr2.pu8UARTDataBuf [ stUARTCtr2.u8UARTCount++ ];
+        UART2_TX = stUARTCtr2.pu8UARTDataBuf [ stUARTCtr2.u32UARTCount++ ];
     }
     else
     {

Firmware/Source/System/Sys_Task_List.c

@@ -15,6 +15,8 @@ void Sys_2ms_Tasks(void)
     Sys_Status_Update_Service();
     Analog_Signal_Conv_Service();
     AMT630H_Main();
+    //Can_Write_Fun(&CAN_CH0_CanMsgTxOp, 2000u);无外发
+    CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp, 2u);
 }
 
 void Sys_5ms_Tasks(void)
@@ -24,6 +26,10 @@ void Sys_5ms_Tasks(void)
 
 void Sys_10ms_Tasks(void)
 {
+    Line_In_Debounce_Service(10u);
+    Key_Service();
+    Key_Clear_Time();
+    Key_TimeOut_Service();
     Fuel_R_Cal(10u);
 }
 
@@ -35,26 +41,14 @@ void Sys_20ms_Tasks(void)
 
 void Sys_50ms_Tasks(void)
 {
-
+    Telltales_Management();
+    g_u8Cursor_Posittion = Menu_Get_Current_Cursor_Information();
 }
 
-uint32_t g_u32LEDFlag = 0UL;
-//uint8_t ljsuartsend[2] = { 0x55, 0x66};
 void Sys_100ms_Tasks(void)
 {
-    if (g_u32LEDFlag)
-    {
-        g_u32LEDFlag = 0UL;
-        //RTE_GPIO_Set_Level(RTE_GPIO_ANALOG_PORT0_PIN15, 0x01U);
-    }
-    else
-    {
-        g_u32LEDFlag = 1UL;
-        //RTE_GPIO_Set_Level(RTE_GPIO_ANALOG_PORT0_PIN15, 0x00U);
-    }
     Fuel_Cal_Sevice(100u);
     RTE_GPIO_Set_Level(Blacklight_PWM, 1);
-    //UART_Ch2_Send_Multiple_Byte(ljsuartsend, 2);
 }
 static uint16_t task_2ms = 0u;
 void Sys_Exact_50us_Tasks(void)

Firmware/utility/Can_BDF/haojin750TFT(1).DBF

+//******************************BUSMASTER Messages and signals Database ******************************//
+
+[DATABASE_VERSION] 1.3
+
+[PROTOCOL] CAN
+
+[BUSMASTER_VERSION] [3.2.0]
+
+[NUMBER_OF_MESSAGES] 7
+
+[START_MSG] CH0_101,257,8,10,1,S
+[START_SIGNALS] ECU_Engine_Speed,16,2,0,U,65535,0,0,0.000000,0.250000,rpm,
+[START_SIGNALS] ECU_Vehicle_Speed,8,3,0,U,255,0,0,0.000000,1.000000,Km/h,
+[START_SIGNALS] ECU_Throttle_Position,8,4,0,U,255,0,0,0.000000,0.392150,%,
+[START_SIGNALS] ECU_Engine_Temperature,16,6,0,U,65535,0,0,-273.000000,0.100000,,
+[START_SIGNALS] ECU_Engine_Speed_State,1,7,4,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_Vehicle_Speed_State,1,7,5,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_Throttle_Position_State,1,7,6,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_Engine_Temperature_State,1,7,7,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_101_Livecounter,4,7,0,U,15,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_101_Checksum,8,8,0,U,255,0,0,0.000000,1.000000,,
+[END_MSG]
+
+[START_MSG] CH0_111,273,8,12,1,S
+[START_SIGNALS] ISG_Engine_InjIgn_Cutoff,1,1,0,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_Engine_Autostop,1,2,0,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_Engine_InjIgn_Cutoff_State,1,3,0,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_Engine_Autostop_State,1,4,0,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_Batt,1,5,0,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_Ready,1,5,1,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_Power,1,5,2,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_SideStand,1,5,3,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_Power_Enable,2,5,4,U,3,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_Tair_Enable,1,5,6,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_111_Livecounter,4,7,0,U,15,0,0,0.000000,1.000000,,
+[START_SIGNALS] ISG_111_Checksum,8,8,0,U,255,0,0,0.000000,1.000000,,
+[END_MSG]
+
+[START_MSG] CH0_401,1025,8,5,1,S
+[START_SIGNALS] ECU_Environment_Presure,16,2,0,U,65535,0,0,0.000000,0.039000,hpa,
+[START_SIGNALS] ECU_Battery_Voltage,8,3,0,U,255,0,0,0.000000,0.100000,V,
+[START_SIGNALS] ECU_Fuel_Consumption,16,5,0,U,65535,0,0,0.000000,0.001000,ml/s,
+[START_SIGNALS] ECU_401_Livecounter,4,7,0,U,15,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_401_Checksum,8,8,0,U,255,0,0,0.000000,1.000000,,
+[END_MSG]
+
+[START_MSG] CH0_402,1026,8,8,1,S
+[START_SIGNALS] ECU_DTCH1,8,1,0,U,255,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_DTCM1,8,2,0,U,255,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_DTCL1,8,3,0,U,255,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_DTC1Amnt,8,4,0,U,255,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_DTCH2,8,5,0,U,255,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_DTCM2,8,6,0,U,255,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_DTCL2,8,7,0,U,255,0,0,0.000000,1.000000,,
+[START_SIGNALS] ECU_Warning_Lamp,8,8,0,U,255,0,0,0.000000,1.000000,,
+[END_MSG]
+
+[START_MSG] CH0_12B,299,8,1,1,S
+[START_SIGNALS] Abs_warning_lamp,2,5,1,U,3,0,0,0.000000,1.000000,,
+[END_MSG]
+
+[START_MSG] CH0_450,1104,8,2,1,S
+[START_SIGNALS] ABSOFF_Selection,1,1,0,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] Dashboard_TCSFunSwitch,4,2,0,U,15,0,0,0.000000,1.000000,,
+[END_MSG]
+
+[START_MSG] CH0_37B,891,8,2,1,S
+[START_SIGNALS] TCS_Warning_Lamp,1,4,2,U,1,0,0,0.000000,1.000000,,
+[START_SIGNALS] TCS_Work_Mode,4,4,4,U,15,0,0,0.000000,1.000000,,
+[END_MSG]
\ No newline at end of file

Firmware/utility/Can_BDF/haojin750TFT(1).dbc

+VERSION ""
+
+
+BS_:
+
+BU_:
+
+
+BO_ 257 CH0_101: 8 Vector__XXX
+ SG_ ECU_101_Checksum : 63|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_101_Livecounter : 51|4@0+ (1,0) [0|15] "" Vector__XXX
+ SG_ ECU_Engine_Temperature_State : 55|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ECU_Throttle_Position_State : 54|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ECU_Vehicle_Speed_State : 53|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ECU_Engine_Speed_State : 52|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ECU_Engine_Temperature : 39|16@0+ (0.1,-273) [-273|6280.5] "" Vector__XXX
+ SG_ ECU_Throttle_Position : 31|8@0+ (0.39215,0) [0|99.9983] "%" Vector__XXX
+ SG_ ECU_Vehicle_Speed : 23|8@0+ (1,0) [0|255] "Km/h" Vector__XXX
+ SG_ ECU_Engine_Speed : 7|16@0+ (0.25,0) [0|16383.8] "rpm" Vector__XXX
+
+BO_ 273 CH0_111: 8 Vector__XXX
+ SG_ ISG_111_Checksum : 63|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ISG_111_Livecounter : 51|4@0+ (1,0) [0|15] "" Vector__XXX
+ SG_ ISG_Tair_Enable : 38|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Power_Enable : 37|2@0+ (1,0) [0|3] "" Vector__XXX
+ SG_ ISG_SideStand : 35|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Power : 34|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Ready : 33|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Batt : 32|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Engine_Autostop_State : 24|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Engine_InjIgn_Cutoff_State : 16|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Engine_Autostop : 8|1@0- (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Engine_InjIgn_Cutoff : 0|1@0- (1,0) [0|1] "" Vector__XXX
+
+BO_ 1025 CH0_401: 8 Vector__XXX
+ SG_ ECU_401_Checksum : 63|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_401_Livecounter : 51|4@0+ (1,0) [0|15] "" Vector__XXX
+ SG_ ECU_Fuel_Consumption : 31|16@0+ (0.001,0) [0|65.535] "ml/s" Vector__XXX
+ SG_ ECU_Battery_Voltage : 23|8@0+ (0.1,0) [0|25.5] "V" Vector__XXX
+ SG_ ECU_Environment_Presure : 7|16@0+ (0.039,0) [0|2555.87] "hpa" Vector__XXX
+
+BO_ 1026 CH0_402: 8 Vector__XXX
+ SG_ ECU_Warning_Lamp : 63|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCL2 : 55|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCM2 : 47|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCH2 : 39|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTC1Amnt : 31|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCL1 : 23|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCM1 : 15|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCH1 : 7|8@0+ (1,0) [0|255] "" Vector__XXX
+
+BO_ 299 CH0_12B: 8 Vector__XXX
+ SG_ Abs_warning_lamp : 34|2@0+ (1,0) [0|3] "" Vector__XXX
+
+BO_ 1104 CH0_450: 8 Vector__XXX
+ SG_ Dashboard_TCSFunSwitch : 11|4@0+ (1,0) [0|15] "" Vector__XXX
+ SG_ ABSOFF_Selection : 0|1@0- (1,0) [0|1] "" Vector__XXX
+
+BO_ 891 CH0_37B: 8 Vector__XXX
+ SG_ TCS_Work_Mode : 31|4@0+ (1,0) [0|15] "" Vector__XXX
+ SG_ TCS_Warning_Lamp : 26|1@0- (1,0) [0|1] "" Vector__XXX
+
+
+
+