调整时间未T-BOX时间同步显示，仪表不再自主计时

source/Application/APP/Telltales/Telltales_user.c

@@ -1454,26 +1454,26 @@ void LED_eco_stop_OFF_L_Execution(uint8_t led_status)
 
 /******************************************************************************
   L14 AMT
-  信号接口：  无多包处理 /18EBFF03/18ECFF03  PGN:65226 DM1
+  信号接口：  20220616 条件变更
   信号定义：
   输出信号：
  ******************************************************************************/
 uint8_t LED_AMT_L_Judgement(void)
 {
     uint8_t u8Result = 0u;
-    uint8_t m_Condition1 = 0u;
-    uint8_t m_Condition2 = 0u;
     uint8_t m_Condition3 = 0u;
     uint8_t m_Condition4 = 0u;
-    uint8_t m_Condition5 = 0u;
-    uint8_t m_Condition6 = 0u;
+    uint8_t CanStatus = 0u;
 
-    m_Condition1 = (uint8_t)Get_ID_18FECA03_Sig_Amber_Warning_Lamp_Status();
-    m_Condition2 = (uint8_t)Get_ID_18FECA03_Sig_Malfunction_indicator_Lamp();
+    //m_Condition1 = (uint8_t)Get_ID_18FECA03_Sig_Amber_Warning_Lamp_Status();
+    //m_Condition2 = (uint8_t)Get_ID_18FECA03_Sig_Malfunction_indicator_Lamp();
+    m_Condition3 = (uint8_t)Get_ID_18FF8503_Sig_Stop_Warning();
+    m_Condition4 = (uint8_t)Get_ID_18FF8503_Sig_Spanner_Warning();
+    CanStatus = CAN_MSG_Status(ID_CanMsg18FF8503_Msg_Count);
 
     if (K_Line_Set.K_Line_LID41 == 0x13u)
     {
-        if ((m_Condition1 == 1u) || (m_Condition2 == 1u))
+        if ((m_Condition3 == 1u) || (m_Condition4 == 1u) || (CanStatus == CAN_SIG_LOST))
         {
             u8Result = 1u;
         }

source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c

@@ -18,8 +18,8 @@ const st_CAN_SendAttribute    st_CANSendAttr[ID_SEND_TOTAL] =
     {0x18FFE517ul,    0ul * 1000ul, 29ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18FFE517, Common_SetId18FFE517Msg_TXSUCCESS},
     //{0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18EF2D17, (void *)0},
     {0x18033317ul,    0ul * 1000ul, 34ul, 0u, MSG_EXT, 14u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18033317, (void *)0},
-    {0x180433A2ul,  100ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_180433A2, (void *)0},
-    {0x18EA0017ul, 5000ul * 1000ul, 47ul, 0u, MSG_EXT, 16u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18EA0017, (void *)0},
+    //{0x180433A2ul,  100ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_180433A2, (void *)0},
+    {0x18EA0017ul, 5000ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18EA0017, (void *)0},
 };
 
 const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
@@ -108,7 +108,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
-        3000ul,
+        7500ul,
         0xCF02F2Aul,
         (( void * )0),
         (( void * )0),
@@ -118,7 +118,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
-        3000ul,
+        7500ul,
         0xCF02FA1ul,
         (( void * )0),
         (( void * )0),
@@ -128,7 +128,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
-        3000ul,
+        7500ul,
         0xCF02FA0ul,
         (( void * )0),
         (( void * )0),
@@ -474,6 +474,19 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
         (( void * )0),
         (( void * )0),
     },
+    {
+        {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
+        {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
+        {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
+        5000ul,
+        0x18FEE64Aul,
+        (( void * )0),
+        (( void * )0),
+        (( void * )0),
+    },
+
+
+
     {
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
@@ -1357,6 +1370,36 @@ uint8_t  Get_ID_18FF064A_Sig_TBOX_Sig_Error(void)
     return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FF064A_Msg_Count, 1u) >> 4u) & 0x0Fu);
 }
 
+uint8_t  Get_ID_18FEE64A_Sig_TBOX_Seconds(void)
+{
+    return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 0u) >> 0u) & 0xFFu);
+}
+
+uint8_t  Get_ID_18FEE64A_Sig_TBOX_Minutes(void)
+{
+    return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 1u) >> 0u) & 0xFFu);
+}
+
+uint8_t  Get_ID_18FEE64A_Sig_TBOX_Hours(void)
+{
+    return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 2u) >> 0u) & 0xFFu);
+}
+
+uint8_t  Get_ID_18FEE64A_Sig_TBOX_Month(void)
+{
+    return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 3u) >> 0u) & 0xFFu);
+}
+
+uint8_t  Get_ID_18FEE64A_Sig_TBOX_Day(void)
+{
+    return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 4u) >> 0u) & 0xFFu);
+}
+
+uint8_t  Get_ID_18FEE64A_Sig_TBOX_Year(void)
+{
+    return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 5u) >> 0u) & 0xFFu);
+}
+
 uint8_t  Get_ID_18ECFFA0_Sig_PRIO(void)
 {
     return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18ECFFA0_Msg_Count, 0u) >> 0u) & 0xFFu);
@@ -1575,6 +1618,10 @@ uint8_t  Co_Can_ConvertSubID(uint32_t MsgID)
     case ID_CanMsg18FF064A_Msg:
         u8Result = ID_CanMsg18FF064A_Msg_Count;
         break;
+    case ID_CanMsg18FEE64A_Msg:
+        u8Result = ID_CanMsg18FEE64A_Msg_Count;
+        break;
+
 
     case ID_CanMsg18FECA00_Msg:
         u8Result = ID_CanMsg18FECA00_Msg_Count;

source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h

@@ -51,6 +51,7 @@ typedef enum
     /*42*/ID_CanMsg18FECAA1_Msg_Count,
     /*43*/ID_CanMsg18FECAA0_Msg_Count,
     /*44*/ID_CanMsg18FF064A_Msg_Count,
+    /*45*/ID_CanMsg18FEE64A_Msg_Count,
 
     ID_CanMsg18FECA00_Msg_Count,
     ID_CanMsg18FECA10_Msg_Count,
@@ -83,7 +84,7 @@ typedef enum
     MSGID_18FFE517,
     //MSGID_18EF2D17,
     MSGID_18033317,
-    MSGID_180433A2,
+    //MSGID_180433A2,
     MSGID_18EA0017,
 
     ID_SEND_TOTAL,
@@ -137,6 +138,7 @@ extern const st_CAN_SendAttribute    st_CANSendAttr[ID_SEND_TOTAL] ;
 #define  ID_CanMsg18FECAA1_Msg    0x18FECAA1u
 #define  ID_CanMsg18FECAA0_Msg    0x18FECAA0u
 #define  ID_CanMsg18FF064A_Msg    0x18FF064Au
+#define  ID_CanMsg18FEE64A_Msg    0x18FEE64Au
 
 #define  ID_CanMsg18FECA00_Msg    0x18FECA00u
 #define  ID_CanMsg18FECA10_Msg    0x18FECA10u
@@ -260,6 +262,12 @@ extern uint8_t  Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void);
 extern uint8_t  Get_ID_18FF064A_Sig_TBOX_Sta(void);
 extern uint8_t  Get_ID_18FF064A_Sig_TBOX_Sig(void);
 extern uint8_t  Get_ID_18FF064A_Sig_TBOX_Sig_Error(void);
+extern uint8_t  Get_ID_18FEE64A_Sig_TBOX_Seconds(void);
+extern uint8_t  Get_ID_18FEE64A_Sig_TBOX_Minutes(void);
+extern uint8_t  Get_ID_18FEE64A_Sig_TBOX_Hours(void);
+extern uint8_t  Get_ID_18FEE64A_Sig_TBOX_Month(void);
+extern uint8_t  Get_ID_18FEE64A_Sig_TBOX_Day(void);
+extern uint8_t  Get_ID_18FEE64A_Sig_TBOX_Year(void);
 //extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void);
 extern uint8_t  Get_ID_0C010305_Sig_Auto_EcoPow(void);
 extern uint32_t Get_ID_18FECA03_Sig_SPN(void);

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -267,12 +267,19 @@ void Can_Set_Buff_18FEE617(uint8_t CopyData[])
     uint8_t Day = 0u;
     uint8_t Year = 0u;
 
-    Seconds = Get_RTC_SECOND() * 4u;
-    Minutes = Get_RTC_MINUTE();
-    Hours = Get_RTC_HOUR();
-    Month = Get_RTC_MONTH();
-    Day = Get_RTC_DATE() * 4u;
-    Year = (uint8_t)((Get_RTC_YEAR() + 2000u - 1985u) & 0xFFu);
+    //Seconds = Get_RTC_SECOND() * 4u;
+    //Minutes = Get_RTC_MINUTE();
+    //Hours   = Get_RTC_HOUR();
+    //Month   = Get_RTC_MONTH();
+    //Day     = Get_RTC_DATE() * 4u;
+    //Year    = (uint8_t)((Get_RTC_YEAR() + 2000u - 1985u) & 0xFFu);
+
+    Seconds = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Seconds();
+    Minutes = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Minutes();
+    Hours   = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Hours();
+    Month   = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Month();
+    Day     = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Day();
+    Year    = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Year();
 
     CopyData[0] = (uint8_t)Seconds; /* 1  */
     CopyData[1] = (uint8_t)Minutes; /* 2  */

source/Application/Graphic/Menu/Menu_user.c

@@ -42,7 +42,7 @@ const _MenuOptTab   MenuOptTab[] =
     /*07*/{ _MN_DSP_LEVEL2_1_MENU_1,  _MN_IDX_NULL,             _MN_DSP_LEVEL2MENU_2,     _MN_IDX_NULL,             Level2Menu_1Enter,       Level2Menu_1Do,       Level2Menu_1Exit},
     /*08*/{ _MN_DSP_LEVEL2_2_MENU_1,  _MN_DSP_LEVEL2MENU_1,     _MN_DSP_LEVEL2MENU_3,     _MN_IDX_NULL,             Level2Menu_2Enter,       Level2Menu_2Do,       Level2Menu_2Exit},
     /*09*/{ _MN_DSP_LEVEL2_3_MENU_1,  _MN_DSP_LEVEL2MENU_2,     _MN_DSP_LEVEL2MENU_4,     _MN_IDX_NULL,             Level2Menu_3Enter,       Level2Menu_3Do,       Level2Menu_3Exit},
-    /*10*/{ _MN_DSP_LEVEL2_4_MENU_1,  _MN_DSP_LEVEL2MENU_3,     _MN_DSP_LEVEL2MENU_5,     _MN_IDX_NULL,             Level2Menu_4Enter,       Level2Menu_4Do,       Level2Menu_4Exit},
+    /*10*/{ _MN_DSP_LEVEL2_4_MENU_7,  _MN_DSP_LEVEL2MENU_3,     _MN_DSP_LEVEL2MENU_5,     _MN_IDX_NULL,             Level2Menu_4Enter,       Level2Menu_4Do,       Level2Menu_4Exit},
     /*11*/{ _MN_DSP_LEVEL2_5_MENU_1,  _MN_DSP_LEVEL2MENU_4,     _MN_DSP_LEVEL2MENU_6,     _MN_IDX_NULL,             Level2Menu_5Enter,       Level2Menu_5Do,       Level2Menu_5Exit},
     /*12*/{ _MN_DSP_LEVEL2_6_MENU_1,  _MN_DSP_LEVEL2MENU_5,     _MN_IDX_NULL,             _MN_IDX_NULL,             Level2Menu_6Enter,       Level2Menu_6Do,       Level2Menu_6Exit},
 
@@ -70,7 +70,7 @@ const _MenuOptTab   MenuOptTab[] =
 
     /*31*/{ _MN_DSP_LEVEL3_4_MENU_11, _MN_IDX_NULL,             _MN_DSP_LEVEL2_4_MENU_2,  _MN_DSP_LEVEL2MENU_4,     Level2_4Menu_1Enter,     Level2_4Menu_1Do,     Level2_4Menu_1Exit},
     /*32*/{ _MN_DSP_LEVEL3_4_MENU_21, _MN_DSP_LEVEL2_4_MENU_1,  _MN_DSP_LEVEL2_4_MENU_7,  _MN_DSP_LEVEL2MENU_4,     Level2_4Menu_2Enter,     Level2_4Menu_2Do,     Level2_4Menu_2Exit},
-    /*33*/{ _MN_DSP_LEVEL3_7_MENU_1,  _MN_DSP_LEVEL2_4_MENU_2,  _MN_DSP_LEVEL2_4_MENU_3,  _MN_DSP_LEVEL2MENU_4,     Level2_4Menu_7Enter,     Level2_4Menu_7Do,     Level2_4Menu_7Exit},
+    /*33*/{ _MN_DSP_LEVEL3_7_MENU_1,  _MN_IDX_NULL,             _MN_DSP_LEVEL2_4_MENU_3,  _MN_DSP_LEVEL2MENU_4,     Level2_4Menu_7Enter,     Level2_4Menu_7Do,     Level2_4Menu_7Exit},
     /*34*/{ _MN_DSP_LEVEL3_4_MENU_3,  _MN_DSP_LEVEL2_4_MENU_7,  _MN_DSP_LEVEL2_4_MENU_4,  _MN_DSP_LEVEL2MENU_4,     Level2_4Menu_3Enter,     Level2_4Menu_3Do,     Level2_4Menu_3Exit},
     /*35*/{ _MN_DSP_LEVEL3_4_MENU_41, _MN_DSP_LEVEL2_4_MENU_3,  _MN_DSP_LEVEL2_4_MENU_5,  _MN_DSP_LEVEL2MENU_4,     Level2_4Menu_4Enter,     Level2_4Menu_4Do,     Level2_4Menu_4Exit},
     /*36*/{ _MN_DSP_LEVEL3_4_MENU_5,  _MN_DSP_LEVEL2_4_MENU_4,  _MN_DSP_LEVEL2_4_MENU_6,  _MN_DSP_LEVEL2MENU_4,     Level2_4Menu_5Enter,     Level2_4Menu_5Do,     Level2_4Menu_5Exit},

source/Driver/Clock/RTC.h

@@ -45,5 +45,4 @@ extern void RTC_Set_Time(uint8_t year, uint8_t month, uint16_t day, uint8_t hour
 extern void RTC_Get_Time(void);
 extern void RTC_Backup_Time(void);
 extern void Rtc_Restore_Time(void);
-
 #endif