Merge branch 'lijianshuang' into 'dev'

Lijianshuang

See merge request !36

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing.uvprojx

@@ -275,7 +275,7 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
+                <StartAddress>0x8000</StartAddress>
                 <Size>0x40000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>

Firmware/Source/Application/BLUETOOTH/BlueTooth.c

@@ -15,6 +15,14 @@ void Send_UUID_To_Esp32(void)
    //Protocol_Send(MCU_ESP32_0x03, Ser2EDataForDFlash.DID_F184, 32);
    
 }
+
+void Clear_Navigation_St(void)
+{
+    if(BlueTooth.BLE_St == 0)
+    {
+        BlueTooth.Navigation_St = 0;
+    }
+}
 uint8_t Get_Navigation_St_Dis(void)
 {
     return BlueTooth.Navigation_St;

Firmware/Source/Application/BLUETOOTH/BlueTooth.h

@@ -61,6 +61,7 @@ uint8_t Get_Navigation_Code_Dis(void);
 uint32_t Get_Navigation_Mileage_Dis(void);
 void Send_UUID_To_Esp32(void);
 void BlueTooth_KL30_KL15_Wakeup_Init(void);
+void Clear_Navigation_St(void);
 
 #endif
 

Firmware/Source/Application/BackLight/BackLight.c

@@ -6,8 +6,8 @@
 #include "Line_In\Line_In_user.h"
 
 
-#define BACK_LIGHT_DAY 600
-#define BACK_LIGHT_NIGHT 420
+#define BACK_LIGHT_DAY 1000
+#define BACK_LIGHT_NIGHT 600
 //_Light g_Light;
 uint8_t LED_Turnoff = 0;
 uint8_t LED_Turnon  = 0;

Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c

@@ -8,12 +8,12 @@ st_CanMsgTxOp CAN_CH0_CanMsgTxOp;
 
 const st_CAN_SendAttribute    CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL] =
 {
-    {0x220ul, 100ul * 1000ul,  7ul * 1000ul,    0u,  MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_220, (void *)0},
+    {0x220ul, 50ul * 1000ul,  7ul * 1000ul,    0u,  MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_220, (void *)0},
     {0x6EEul, 100ul * 1000ul,  7ul * 1000ul,    0u,  MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_6EE, (void *)0},
     {0x6EFul, 100ul * 1000ul,  7ul * 1000ul,    0u,  MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_6EF, (void *)0},
     {0x450ul, 100ul * 1000ul,  7ul * 1000ul,    0u,  MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_450, (void *)0},
 #if (IC_Current == TY200_080000b_ty)
-    {0x580ul, 10ul * 1000ul,  7ul * 1000ul,    0u,  MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_580, (void *)0},
+    {0x580ul, 8ul * 1000ul,  0ul * 1000ul,    0u,  MSG_STD, 1u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_580, (void *)0},
 #endif
 };
 

Firmware/Source/Application/Data_TPMS/Data_TPMS.c

@@ -18,7 +18,7 @@ void Data_TPMS_KL30_Init ( void )
     TPMS.Front_TPMS_Valid  = 0;
     TPMS.Rear_TPMS_Valid   = 0;
     TPMS.TPMS_Warning      = 0;
-    TPMS.TPMS_Unit         = Get_Dis_Tpms_Unit();
+    //TPMS.TPMS_Unit         = Get_Dis_Tpms_Unit();
     TPMS.TPMS_Front_Learn  = MenuData.TPMS_Front_Learn;
     TPMS.TPMS_Rear_Learn   = MenuData.TPMS_Rear_Learn;
     TPMS.TPMS_Front_FirstLearn_Flag  = MenuData.TPMS_Front_FirstLearn_Flag;
@@ -68,43 +68,44 @@ void Data_TPMS_Processing_Service ( void )
     
     if(TPMS.TPMS_Front_Learn == 0x0)
     {        
-        if(LearnTime_Count <= 6000)
-        {
-            LearnTime_Count++;
+        //if(LearnTime_Count <= 6000)
+        //{
+        //    LearnTime_Count++;
             TPMS.TPMS_Front_Learn = Unstudied;
-        }
-        else
-        {
-            if(TPMS.TPMS_Front_Timeclean == 1)
-            {
-                LearnTime_Count = 0;
-            }
-            TPMS.TPMS_Front_Timeclean = 0;  
-            if ((MenuData.TPMS_Front_Learn != 0x2) && (MenuData.TPMS_Front_Learn != 0x3) ) 
-            {
-                if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x341_Msg_Count) != CAN_SIG_LOST) 
-                {
-                    TPMS.TPMS_Front_Learn = LearningFailure;
-                }
-                else
-                {
-                    TPMS.TPMS_Front_Learn = MenuData.TPMS_Front_Learn;
-                }
-                
-            }
-            else
-            {
-                TPMS.TPMS_Front_Learn = MenuData.TPMS_Front_Learn;
-            }
-        }
+            LearnTime_Count = 0;
+        //}
+        //else
+        //{
+        //    if(TPMS.TPMS_Front_Timeclean == 1)
+        //    {
+        //        LearnTime_Count = 0;
+        //    }
+        //    TPMS.TPMS_Front_Timeclean = 0;  
+        //    if ((MenuData.TPMS_Front_Learn != 0x2) && (MenuData.TPMS_Front_Learn != 0x3) ) 
+        //    {
+        //        if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x341_Msg_Count) != CAN_SIG_LOST) 
+        //        {
+        //            TPMS.TPMS_Front_Learn = LearningFailure;
+        //        }
+        //        else
+        //        {
+        //            TPMS.TPMS_Front_Learn = MenuData.TPMS_Front_Learn;
+        //        }
+        //        
+        //    }
+        //    else
+        //    {
+        //        TPMS.TPMS_Front_Learn = MenuData.TPMS_Front_Learn;
+        //    }
+        //}
     }
     else if(TPMS.TPMS_Front_Learn == 0x1)
     { 
-        if(TPMS.TPMS_Front_Timeclean == 0)
-        {
-            LearnTime_Count = 0;
-        }
-        TPMS.TPMS_Front_Timeclean = 1;        
+        //if(TPMS.TPMS_Front_Timeclean == 0)
+        //{
+        //    LearnTime_Count = 0;
+        //}
+        //TPMS.TPMS_Front_Timeclean = 1;        
         if(LearnTime_Count <= 6000)
         {
             LearnTime_Count++;
@@ -155,34 +156,34 @@ void Data_TPMS_Processing_Service ( void )
 
     if(TPMS.TPMS_Rear_Learn == 0x0)
     {        
-        if(LearnTime_Count1 <= 6000)
-        {
-            LearnTime_Count1++;
+        //if(LearnTime_Count1 <= 6000)
+        //{
+            LearnTime_Count1 = 0;
             TPMS.TPMS_Rear_Learn = Unstudied;
-        }
-        else
-        {
-            if(TPMS.TPMS_Rear_Timeclean == 1)
-            {
-                LearnTime_Count1 = 0;
-            }
-            TPMS.TPMS_Rear_Timeclean = 0; 
-            if ((MenuData.TPMS_Rear_Learn != 0x2) && (MenuData.TPMS_Rear_Learn != 0x3) ) 
-            {
-                if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x341_Msg_Count) != CAN_SIG_LOST) 
-                {
-                    TPMS.TPMS_Rear_Learn = LearningFailure;
-                }
-                else
-                {
-                    TPMS.TPMS_Rear_Learn = MenuData.TPMS_Rear_Learn;
-                }
-            }
-            else
-            {
-                TPMS.TPMS_Rear_Learn = MenuData.TPMS_Rear_Learn;
-            }
-        }
+        //}
+        //else
+        //{
+        //    if(TPMS.TPMS_Rear_Timeclean == 1)
+        //    {
+        //        LearnTime_Count1 = 0;
+        //    }
+        //    TPMS.TPMS_Rear_Timeclean = 0; 
+        //    if ((MenuData.TPMS_Rear_Learn != 0x2) && (MenuData.TPMS_Rear_Learn != 0x3) ) 
+        //    {
+        //        if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x341_Msg_Count) != CAN_SIG_LOST) 
+        //        {
+        //            TPMS.TPMS_Rear_Learn = LearningFailure;
+        //        }
+        //        else
+        //        {
+        //            TPMS.TPMS_Rear_Learn = MenuData.TPMS_Rear_Learn;
+        //        }
+        //    }
+        //    else
+        //    {
+        //        TPMS.TPMS_Rear_Learn = MenuData.TPMS_Rear_Learn;
+        //    }
+        //}
     }
     else if(TPMS.TPMS_Rear_Learn == 0x1)
     {        
@@ -269,7 +270,7 @@ void Data_TPMS_Processing_Service ( void )
         
     }
 
-    TPMS.TPMS_Unit      = Get_Dis_Tpms_Unit();
+    //TPMS.TPMS_Unit      = Get_Dis_Tpms_Unit();
     Front_TPMS          = Get_CAN_CH0_ID_341_Sig_Front_Pressure();
     Rear_TPMS           = Get_CAN_CH0_ID_341_Sig_Rear_Pressure();
 
@@ -457,15 +458,15 @@ uint8_t Get_Rear_TPMS_Sig_Vaild (void)
 uint16_t Get_Front_TPMS_Sig_Value (void)
 {
     uint16_t value = 0;
-    if (TPMS.TPMS_Unit == 1)
-    {
-        value = (Data_Bar_To_Psi(TPMS.Front_Press_Value) + 500) / 1000;
-        if(value > 99)
-        {
-            value = 99;
-        }
-    }
-    else
+    //if (TPMS.TPMS_Unit == 1)
+    //{
+    //    value = (Data_Bar_To_Psi(TPMS.Front_Press_Value) + 500) / 1000;
+    //    if(value > 99)
+    //    {
+    //        value = 99;
+    //    }
+    //}
+    //else
     {        
         value = TPMS.Front_Press_Value + 50;        
         value = value / 100;
@@ -475,16 +476,16 @@ uint16_t Get_Front_TPMS_Sig_Value (void)
 uint16_t Get_Rear_TPMS_Sig_Value (void)
 {
     uint16_t value = 0;
-    if (TPMS.TPMS_Unit == 1)
-    {
-        value = (Data_Bar_To_Psi(TPMS.Rear_Press_Value) + 500) / 1000;
-        if(value > 99)
-        {
-            value = 99;
-        }
-        
-    }
-    else
+    //if (TPMS.TPMS_Unit == 1)
+    //{
+    //    value = (Data_Bar_To_Psi(TPMS.Rear_Press_Value) + 500) / 1000;
+    //    if(value > 99)
+    //    {
+    //        value = 99;
+    //    }
+    //    
+    //}
+    //else
     {        
         value = TPMS.Rear_Press_Value + 50;        
         value = value / 100;        

Firmware/Source/Application/GUI_Display/GUI_Display.c

@@ -122,7 +122,7 @@ void Gauge_Service(void)
                 SEG_SET_CoolantDial(1, GET_DataCoolantTempSegDisp(), GET_DataCoolantTempValueDisp(), GET_DataCollantTempSegValid());
                 SEG_SET_Voltage_NUM(1, Get_Battery_Voltage());
             #if(IC_Current == TY200_080000b_ty) 
-                SEG_SET_TPMS_DISPLAY(1, Get_Front_TPMS_Sig_Value(), Get_Rear_TPMS_Sig_Value(), Get_Dis_Tpms_Unit(),Get_Front_TPMS_Sig_Vaild(), Get_Rear_TPMS_Sig_Vaild());       
+                SEG_SET_TPMS_DISPLAY(1, Get_Front_TPMS_Sig_Value(), Get_Rear_TPMS_Sig_Value(), 0 ,Get_Front_TPMS_Sig_Vaild(), Get_Rear_TPMS_Sig_Vaild());       
             #endif    
                 SEG_SET_Navigation_STS(Get_Navigation_St_Dis(),Get_Navigation_Code_Dis(),Get_Navigation_Mileage_Dis());
           

Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c

@@ -677,7 +677,7 @@ void SEG_SET_Navigation_STS(uint8_t m_Flag, uint8_t m_Code, uint32_t m_Mileage)
             break;
         }
     }
-    if (m_Flag  && BlueTooth.BLE_St)
+    if ((m_Flag  && BlueTooth.BLE_St) || (Common_GetIgnOnTime() < 3000))
     {
 
         LED_Driver_Channel_Set(LampChannel_0, LampCh0_17_Length2, LED_ON);
@@ -2089,40 +2089,40 @@ void SEG_SET_TPMS_DISPLAY(uint8_t m_Flag, uint16_t m_NUM1, uint16_t m_NUM2, uint
         IC2_SEG122 = IC_SEG_ON;
         if ((ClearODO_Flag != 1) && (Common_GetIgnOnTime() >= 3000))
         {
-            if (Get_Current_PageType() == Page_Tpms_Unit)
-            {
-                if (m_Unit == 0)
-                {
-                    IC2_SEG118 = IC_SEG_ON;
-                    IC2_SEG138 = IC_SEG_ON;
-                    if (FLASH_SYNC_1Hz)
-                    {
-                        IC2_SEG109 = IC_SEG_OFF;
-                        IC2_SEG110 = IC_SEG_ON;
-                    }
-                    else
-                    {
-                        IC2_SEG109 = IC_SEG_OFF;
-                        IC2_SEG110 = IC_SEG_OFF;
-                    }
-                }
-                else
-                {
-                    IC2_SEG118 = IC_SEG_OFF;
-                    IC2_SEG138 = IC_SEG_OFF;
-                    if (FLASH_SYNC_1Hz)
-                    {
-                        IC2_SEG109 = IC_SEG_ON;
-                        IC2_SEG110 = IC_SEG_OFF;
-                    }
-                    else
-                    {
-                        IC2_SEG109 = IC_SEG_OFF;
-                        IC2_SEG110 = IC_SEG_OFF;
-                    }
-                }
-            }
-            else
+            //if (Get_Current_PageType() == Page_Tpms_Unit)
+            //{
+            //    if (m_Unit == 0)
+            //    {
+            //        IC2_SEG118 = IC_SEG_ON;
+            //        IC2_SEG138 = IC_SEG_ON;
+            //        if (FLASH_SYNC_1Hz)
+            //        {
+            //            IC2_SEG109 = IC_SEG_OFF;
+            //            IC2_SEG110 = IC_SEG_ON;
+            //        }
+            //        else
+            //        {
+            //            IC2_SEG109 = IC_SEG_OFF;
+            //            IC2_SEG110 = IC_SEG_OFF;
+            //        }
+            //    }
+            //    else
+            //    {
+            //        IC2_SEG118 = IC_SEG_OFF;
+            //        IC2_SEG138 = IC_SEG_OFF;
+            //        if (FLASH_SYNC_1Hz)
+            //        {
+            //            IC2_SEG109 = IC_SEG_ON;
+            //            IC2_SEG110 = IC_SEG_OFF;
+            //        }
+            //        else
+            //        {
+            //            IC2_SEG109 = IC_SEG_OFF;
+            //            IC2_SEG110 = IC_SEG_OFF;
+            //        }
+            //    }
+            //}
+            //else
             {
 
                 if (m_Unit == 0)
@@ -2130,37 +2130,46 @@ void SEG_SET_TPMS_DISPLAY(uint8_t m_Flag, uint16_t m_NUM1, uint16_t m_NUM2, uint
                     IC2_SEG109 = IC_SEG_OFF;
                     IC2_SEG110 = IC_SEG_ON;
 
-                    if ((Get_Current_PageType() == Page_Front_Tpms) || (Get_Front_FirstLearn_Flag() == 1) || (Get_Front_FirstLearn_Flag() == 3))
+                    if(Get_TPMS_CAN_LOST() == 0)
+                    {
+                        IC2_SEG138 = IC_SEG_ON;
+                        IC2_SEG118 = IC_SEG_ON;
+                    }
+                    else
                     {
-                        if (FLASH_SYNC_1Hz)
+                        if ((Get_Current_PageType() == Page_Front_Tpms) || (Get_Front_FirstLearn_Flag() == 1) || (Get_Front_FirstLearn_Flag() == 3))
                         {
-                            IC2_SEG138 = IC_SEG_ON;
+                            if (FLASH_SYNC_1Hz)
+                            {
+                                IC2_SEG138 = IC_SEG_ON;
+                            }
+                            else
+                            {
+                                IC2_SEG138 = IC_SEG_OFF;
+                            }
                         }
                         else
                         {
-                            IC2_SEG138 = IC_SEG_OFF;
+                            IC2_SEG138 = IC_SEG_ON;
                         }
-                    }
-                    else
-                    {
-                        IC2_SEG138 = IC_SEG_ON;
-                    }
-
-                    if ((Get_Current_PageType() == Page_Rear_Tpms) || (Get_Rear_FirstLearn_Flag() == 1) || (Get_Rear_FirstLearn_Flag() == 3))
-                    {
-                        if (FLASH_SYNC_1Hz)
+    
+                        if ((Get_Current_PageType() == Page_Rear_Tpms) || (Get_Rear_FirstLearn_Flag() == 1) || (Get_Rear_FirstLearn_Flag() == 3))
                         {
-                            IC2_SEG118 = IC_SEG_ON;
+                            if (FLASH_SYNC_1Hz)
+                            {
+                                IC2_SEG118 = IC_SEG_ON;
+                            }
+                            else
+                            {
+                                IC2_SEG118 = IC_SEG_OFF;
+                            }
                         }
                         else
                         {
-                            IC2_SEG118 = IC_SEG_OFF;
+                            IC2_SEG118 = IC_SEG_ON;
                         }
                     }
-                    else
-                    {
-                        IC2_SEG118 = IC_SEG_ON;
-                    }
+                    
                 }
                 else
                 {
@@ -2173,12 +2182,43 @@ void SEG_SET_TPMS_DISPLAY(uint8_t m_Flag, uint16_t m_NUM1, uint16_t m_NUM2, uint
             }
             if(Get_TPMS_CAN_LOST() == 0)
             {
-                
+                if (Get_Current_PageType() == Page_Front_Tpms) 
+                {
+                    if(FLASH_SYNC_1Hz)
+                    {
+                        IC2_SEG140 = IC_SEG_ON;
+                        IC2_SEG133 = IC_SEG_ON;
+                    }
+                    else
+                    {
+                        IC2_SEG140 = IC_SEG_OFF;
+                        IC2_SEG133 = IC_SEG_OFF;
+                    }
+                    IC2_SEG120 = IC_SEG_ON;
+                    IC2_SEG113 = IC_SEG_ON;
+                }
+                else if (Get_Current_PageType() == Page_Rear_Tpms)
+                {
+                    if(FLASH_SYNC_1Hz)
+                    {
+                        IC2_SEG120 = IC_SEG_ON;
+                        IC2_SEG113 = IC_SEG_ON;
+                    }
+                    else
+                    {
+                        IC2_SEG120 = IC_SEG_OFF;
+                        IC2_SEG113 = IC_SEG_OFF;
+                    }
                     IC2_SEG140 = IC_SEG_ON;
                     IC2_SEG133 = IC_SEG_ON;
+                }
+                else
+                {
                     IC2_SEG120 = IC_SEG_ON;
                     IC2_SEG113 = IC_SEG_ON;
-                
+                    IC2_SEG140 = IC_SEG_ON;
+                    IC2_SEG133 = IC_SEG_ON;
+                }            
                 
                 IC2_SEG143 = IC_SEG_OFF;
                 IC2_SEG141 = IC_SEG_OFF;

Firmware/Source/Component/Key/Key_user.c

@@ -12,8 +12,8 @@ uint8_t PageMenu = 0;
 uint8_t Hour_Set = 0;
 uint8_t Minute_Set = 0;
 uint8_t Tpms_TX_Flag = 0;
-RTC_TimeTypeDef RTC_TimeStruct;
-RTC_DateTypeDef RTC_DateStruct;
+//RTC_TimeTypeDef RTC_TimeStruct;
+//RTC_DateTypeDef RTC_DateStruct;
 RTC_CounterTypeDef counter_val;
 
 void Data_TCS_Set_OnOff(uint32_t u32Data)
@@ -296,18 +296,18 @@ void Key_Left_Short_Press(void)
 		Unit_Convert_Service();
 	}
 #if (IC_Current == TY200_080000b_ty)
-	else if(PageType == Page_Tpms_Unit)
-	{
-		if(Get_Dis_Tpms_Unit() == 0)
-		{
-			MenuData.Tpms_Unit = 1;//psi
-		}
-		else
-		{
-			MenuData.Tpms_Unit = 0;//bar
-		}
-		Unit_Convert_Service();
-	}
+	//else if(PageType == Page_Tpms_Unit)
+	//{
+	//	if(Get_Dis_Tpms_Unit() == 0)
+	//	{
+	//		MenuData.Tpms_Unit = 1;//psi
+	//	}
+	//	else
+	//	{
+	//		MenuData.Tpms_Unit = 0;//bar
+	//	}
+	//	Unit_Convert_Service();
+	//}
 	else if(PageType == Page_Front_Tpms)
 	{
 		PageType = Page_Rear_Tpms;
@@ -386,12 +386,13 @@ void Key_Left_Long_Press(void)
 #if (IC_Current == TY200_080000b_ty)
 	else if(PageType == Page_Km_Unit)
 	{
-		PageType = Page_Tpms_Unit;
-	}
-	else if(PageType == Page_Tpms_Unit)
-	{
+		//PageType = Page_Tpms_Unit;
 		PageType = Page_Front_Tpms;
 	}
+	//else if(PageType == Page_Tpms_Unit)
+	//{
+	//	PageType = Page_Front_Tpms;
+	//}
 	else if((PageType == Page_Front_Tpms) || (PageType == Page_Rear_Tpms))
 	{
 		PageType = Page_Menu;
@@ -466,7 +467,7 @@ void MenuData_Unit_Init(void)
 	uint32_t TCS[1] = {0};
 	Data_User_EEPROM_Read(EM_MenuData_Tcs_Val, TCS, 1u);
 	MenuData.KM_Unit = 0;
-	MenuData.Tpms_Unit = 0;	
+	//MenuData.Tpms_Unit = 0;	
 	MenuData.Tcs_Val = TCS[0];
 	
 }
@@ -537,7 +538,8 @@ uint8_t Get_Dis_KM_Unit(void)
 
 uint8_t Get_Dis_Tpms_Unit(void)
 {
-	return MenuData.Tpms_Unit; //0bar,1psi
+	//return MenuData.Tpms_Unit; //0bar,1psi
+	return 0; 
 }
 
 uint8_t Get_Dis_Tcs_Val(void)

Firmware/Source/Component/LED_Driver/LED_Driver_Interface.h

@@ -3,7 +3,7 @@
 
 
 /*-----------------------------------------------------------*/
-#define LED_ON  186
+#define LED_ON  255
 #define LED_OFF 0
 #define LED_LINEOUT_Low   0
 #define LED_LINEOUT_High  1

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -6,7 +6,7 @@
 #include "UDS_ISO14229_Services.h"
 #include "timm.h"
 
-RTC_Information_st_t g_stRTCInformation;
+RTC_Information_st_t RTCInformation;
 
 static void Power_KL30_Init(void);
 static void Power_Wakeup_Init(void);
@@ -83,13 +83,13 @@ static void Power_KL30_Init(void)
     Telltales_UserInit();
     MenuData_Unit_Init();
     Data_TPMS_KL30_Init ();
-    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);
+    RTCInformation.u8RTCSecond = 0;
+	RTCInformation.u8RTCMinute = 0;
+	RTCInformation.u8RTCHour = 0;          
+	RTCInformation.u8RTCDayOfMonth = 1;
+	RTCInformation.u8RTCMonth = 1;   
+	RTCInformation.u8RTCYear = 20; 
+    RTE_RTC_Init(RTCInformation);
     RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
     FaultCode_Init();
 

Firmware/Source/Component/Telltales/Telltales_user.c

@@ -41,7 +41,7 @@ static void            LED_Tire_Pressure_Execution(Tellib_uint16_t led_status);
 //static void            LED_Navigato_Execution(Tellib_uint16_t led_status);
 
 
-Led_HighBeam_Count HighBeam_Timer;
+//Led_HighBeam_Count HighBeam_Timer;
 Tellib_uint16_t LED_Battery_Voltage = 0;
 Tellib_uint16_t Battery_Voltage_valid = 0;
 const LED_Attribute_st LED_Attribute [ LED_Max ] = {
@@ -82,8 +82,8 @@ void Telltales_Init(void)
 }
 void Telltales_UserInit(void)
 {
-    HighBeam_Timer.LED_Turnon       = 0;
-    HighBeam_Timer.LED_Turnoff      = 0;
+    //HighBeam_Timer.LED_Turnon       = 0;
+    //HighBeam_Timer.LED_Turnoff      = 0;
     LED_Battery_Voltage             = 0;
     Battery_Voltage_valid           = 0;
 }

Firmware/Source/Component/Telltales/Telltales_user.h

@@ -23,12 +23,12 @@ typedef enum
     LED_Max ,                            
 } LED_Idx_t;
 
-typedef struct
-{
-    Tellib_uint8_t LED_Turnon;    
-    Tellib_uint8_t LED_Turnoff;     
-}Led_HighBeam_Count;
-extern Led_HighBeam_Count HighBeam_Timer;
+// typedef struct
+// {
+//     //Tellib_uint8_t LED_Turnon;    
+//     //Tellib_uint8_t LED_Turnoff;     
+// }Led_HighBeam_Count;
+// extern Led_HighBeam_Count HighBeam_Timer;
 
 
 void Telltales_Init(void);

Firmware/Source/Device/Cmsemicon/BAT32A239/Library/Driver/include/timm.h

@@ -354,8 +354,8 @@ typedef struct
 	
 	uint8_t		TMM_CounterClear;	/*!< TMM counter TM Register clear conditon This parameter can be a value of @ref TMM_Counter_Clear_t */
 	
-	uint8_t		TMM_Combine_TransMode;	/*!< TMM counter TM buffer Register transfer mode: 1buffer register copyed to general register when TM1 
-										underflows 2buffer register copyed to general register when TM0 compare match to  TMGRA0; it only used 
+	uint8_t		TMM_Combine_TransMode;	/*!< TMM counter TM buffer Register transfer mode: 1��buffer register copyed to general register when TM1 
+										underflows 2��buffer register copyed to general register when TM0 compare match to  TMGRA0; it only used 
 											in complementary PWM mode This parameter can be a value of @ref TMM_Combine_TransMode_t */
 
 	uint8_t TMM_Intp;         /*!< Specifies the whether open the interrupt flag of Capture Compare Register TBGRA.TBGRB/TBGRC/TBGRD 
@@ -392,6 +392,7 @@ void TMM_Init(TMM_InitTypeDef *TMM_InitStruct);
 void TMM1_Start(FunctionalState match_flag);
 void TMM0_Start(FunctionalState match_flag);
 void TMM0_Stop(void);
+void TMM1_Stop(void);
 void TMM_All_Start(void);
 void TMM_All_Stop(void);
 FlagStatus TMM_GetFlagStatus(TMMSelect_TypeDef TMMx, uint8_t TMM_FLAG);

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

@@ -25,7 +25,7 @@ uint8_t RTC_Bcd2ToByte(uint8_t Value)
   * @param  Value: Byte to be converted.
   * @retval Converted byte
   */
-uint8_t RTC_ByteToBcd2(uint8_t Value)
+uint8_t RTC_ByteToBcd2_Format(uint8_t Value)
 {
   uint8_t bcdhigh = 0;
   

Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/RTC/RTE_RTC.h

@@ -62,7 +62,7 @@ extern  RTC_Information_st_t g_stRTCInformation;
 #define RTC_LEAP_YEAR g_RTCLeapYear
 
 uint8_t RTC_Bcd2ToByte(uint8_t Value);
-uint8_t RTC_ByteToBcd2(uint8_t Value);
+uint8_t RTC_ByteToBcd2_Format(uint8_t Value);
 extern void RTE_RTC_Pre_Init(void);
 extern void RTE_RTC_Init(RTC_Information_st_t g_stRTCInformation);
 extern void RTE_RTC_Set_Time(RTC_TimeTypeDef* RTC_TimeStruct, RTC_DateTypeDef* RTC_DateStruct);

Firmware/Source/System/Sys_Task_List.c

@@ -106,7 +106,9 @@ void Sys_100ms_Tasks(void)
     else
     {
         u8LEDDriverCheckCount++;
-    }    
+    }   
+
+    Clear_Navigation_St(); 
 }
 
 

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -314,10 +314,10 @@
 #define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x100 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
-#define INTLV 0x104 // 0x100 = 1.00 internal version 内部版本号
+#define INTLV 0x105 // 0x100 = 1.00 internal version 内部版本号
 #define PROG_Y 0x24 // 0x24 = 2024年, program year
-#define PROG_M 0x06 // 0x03 = 3月, program month
-#define PROG_D 0x26 // 0x19 = 19日, program day
+#define PROG_M 0x07 // 0x03 = 3月, program month
+#define PROG_D 0x01 // 0x19 = 19日, program day
 
 /******************************************************************************
  Bootloader Variable

Firmware/utility/程序释放/20240628释放给亿连app的测试程序/TY_TY200.080000b_ty_ESP32-D0WD-V3_BootApp_S1.02_240628/ota_data_initial.bin

+
\ No newline at end of file

Firmware/utility/程序释放/20240701/TY_TY200.080000b_ty_ESP32-D0WD-V3_BootApp_S1.03_240701/ota_data_initial.bin

+
\ No newline at end of file

Firmware/utility/诊断工具/Option/Option.properties

 #new Option
-#Wed Jun 26 11:58:06 CST 2024
+#Mon Jul 01 14:18:29 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
-MergeCanXLSPath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Can_BDF\\Can\u914D\u7F6E20240626115754122931.xls
+MergeCanXLSPath=
 RH850_D1M1AGPIOJSONpath=
 DBFFilePath=
 MergeCrcTtpe=21
-MergeBootFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.00_240607.hex
+MergeBootFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.01_240620.hex
 IsMergeChangeAddress=false
 MergeFlashOutPutFilePath=
 GPIOOutPutPath=
@@ -56,8 +56,8 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240619
-MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240619\\TianYing.hex
+MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240701
+MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240701\\TianYing.hex
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0