Merge branch 'dev' of http://tyw-server.synology.me:12345/ty/tianying_ty100 into ZMY

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>
@@ -823,11 +823,6 @@
               <FileType>4</FileType>
               <FilePath>..\..\..\..\Source\Component\Eeprom\eepromManage_20240305.lib</FilePath>
             </File>
-            <File>
-              <FileName>CAN_Signal.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>..\..\..\..\Source\Component\CAN_Signal\CAN_Signal.lib</FilePath>
-            </File>
             <File>
               <FileName>Telltales_user.c</FileName>
               <FileType>1</FileType>
@@ -878,6 +873,11 @@
               <FileType>5</FileType>
               <FilePath>..\..\..\..\Source\Component\Service_Interval\Service_Interval_User.h</FilePath>
             </File>
+            <File>
+              <FileName>CAN_Signal.lib</FileName>
+              <FileType>4</FileType>
+              <FilePath>..\..\..\..\Source\Component\CAN_Signal\CAN_Signal.lib</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing200.BAT

 SET PATH=C:\Keil_v5\ARM\ARMCC\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Users\tyw05\AppData\Local\Microsoft\WindowsApps;
+SET ARMCC5_ASMOPT=--diag_suppress=9931
+SET ARMCC5_CCOPT=--diag_suppress=9931
+SET ARMCC5_LINKOPT=--diag_suppress=9931
 SET CPU_TYPE=BAT32G139GK64FB
 SET CPU_VENDOR=Cmsemicon
 SET UV2_TARGET=TianYing200

Firmware/Source/Application/BLUETOOTH/BlueTooth.c

 #include "BlueTooth.h"
 #include "UDS_ISO14229_Services.h"
 BlueTooth_t  BlueTooth;
-uint8_t UUIDData[32] = {"tywtywtywtywtywtywtywtywtywtyw03"};
+uint8_t UUIDData[32] = {"000000000000000000000"};
 extern Ser2EDFlashData Ser2EDataForDFlash;
 void BlueTooth_KL30_KL15_Wakeup_Init(void)
 {

Firmware/Source/Application/BLUETOOTH/Protocol_User.c

@@ -7,6 +7,8 @@
 #define UART_RX_MAX_DEPTH (2 * 1024UL)    // 4K
 #define UART_DATA_BUF_LEN (2 * 1024UL)    // 4K
 
+uint32_t u32ActiveCount = 0;
+uint32_t u32ActiveReset = 0;
 typedef struct __attribute__((aligned(4)))
 {
     Protocol_uint32_t read_pos;
@@ -170,6 +172,8 @@ static Protocol_uint32_t Protocol_UartSend(const Protocol_uint8_t *pData, Protoc
 static void Protocol_UartHandle(const Protocol_Data_t *pData)
 {
     uint8_t ID04[1] = {0};
+    u32ActiveCount = 0;
+
     if ( pData->CmdID == ESP32_MCU_0x10 )
     {       
         BlueTooth.BlueTooth_St = pData->Data[0];
@@ -227,6 +231,37 @@ static void Protocol_UartHandle(const Protocol_Data_t *pData)
         //非本协议数据，不处理
     }
 }
+void Protocol_ESP32_Active_Service(void)
+{
+    if (RTE_GPIO_Get_Level(L_BD433Ctrl_OUT) == 1)
+    {
+        if (u32ActiveCount >= 200)
+        {
+            u32ActiveReset = 0;
+            RTE_GPIO_Set_Level(L_BD433Ctrl_OUT, RTE_GPIO_LEVEL_LOW);           
+                
+        }
+        else
+        {                
+            u32ActiveCount++;
+        }
+    }
+    else
+    {
+        if(u32ActiveReset <= 2)
+        {
+            u32ActiveReset++;           
+        }
+        else
+        {
+            u32ActiveReset = 0;
+            u32ActiveCount = 0;
+            RTE_GPIO_Set_Level(L_BD433Ctrl_OUT, RTE_GPIO_LEVEL_HIGH);
+        }
+    }
+ 
+    
+}
 
 void UART_Put(Protocol_uint16_t Data)
 {

Firmware/Source/Application/BLUETOOTH/Protocol_User.h

@@ -9,5 +9,6 @@
 void Protocol_KL30_Wakeup_Init(void);
 void Protocol_Send_Service(void);    // 10ms任务调用
 void UART_Put(Protocol_uint16_t Data);
+void Protocol_ESP32_Active_Service(void);
 
 #endif

Firmware/Source/Application/CAN_User/Can_User.c

@@ -236,11 +236,39 @@ void COM_CAN_Init(void)
     Can_RX_BuffInit(&CAN_CH0_CanMsgOp, CAN_CH0_CAN_MSG_CONST_ARRAY, CAN_CH0_ID_TOTAL_MAX);
     CAN_RX_SetEnable(&CAN_CH0_CanMsgOp, CAN_N_RX_Enable);
 
+
+}
+
+
+void CAN_TX_Init(void)
+{
+
     memset(pTXBuff, 0, sizeof(pTXBuff));
     CAN_CH0_CanMsgTxOp.CanMsg = (st_CAN_SendOperation *)pTXBuff;
     Can_TX_BuffInit(&CAN_CH0_CanMsgTxOp, CAN_CH0_CANSendAttr, CAN_CH0_ID_SEND_TOTAL, COM_APP_Process);
     CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
+
+
+
+
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void Can_QuickTimer_Init(void)
 {
     uint32_t i = 0u;

Firmware/Source/Application/CAN_User/Can_User.h

@@ -31,7 +31,7 @@ typedef struct
 } RSCAN0BusoffMonitorStruct;
 
 
-
+extern void CAN_TX_Init(void);
 extern void Can_Tx_Apply_Buff(void);
 extern void Can_RX_Apply_Buff(void);
 extern void Can_BusOff_Recover(uint8_t deltaTime);

Firmware/Source/Application/Data_Coolant/Data_Coolant.c

@@ -286,14 +286,16 @@ void Data_Coolant_Temp_Display ( void )
                 DataCoolantTemp_Dis.u8_DownFlashtimer = DataCoolantTemp_Dis.u8_Downtimer; 
                 DataCoolantTemp_Dis.u8_CurSeg = 0;
                 DataCoolantTemp_Dis.u8_DestSeg = 0 ;                            
-                DataCoolantTemp_Dis.u8_Flg = 0;            
+                DataCoolantTemp_Dis.u8_Flg = 0;  
+                u32ColCurNum = DataCoolantTemp.Value * 100 ;
+                DataCoolantTemp_Dis.u8_Holdtimer = CoolantFlashtimer;          
             } 
             else
             {  
                 DataCoolantTemp_Dis.Dis_Valid = 1; 
                 if (DataCoolantTemp_Dis.u8_Flg == 2)
                 {
-                    DataCoolantTemp_Dis.u8_Flg = 1; 
+                    DataCoolantTemp_Dis.u8_Flg = 1;
                     DataCoolantTemp_Dis.u8_UpFlashtimer = 0; 
                     DataCoolantTemp_Dis.u8_DownFlashtimer = 0; 
                 }  
@@ -303,6 +305,8 @@ void Data_Coolant_Temp_Display ( void )
                     DataCoolantTemp_Dis.u8_CurSeg =  DataCoolantTemp_Dis.u8_DestSeg; 
                     DataCoolantTemp_Dis.u8_UpFlashtimer = DataCoolantTemp_Dis.u8_Uptimer; 
                     DataCoolantTemp_Dis.u8_DownFlashtimer = DataCoolantTemp_Dis.u8_Downtimer; 
+                    u32ColCurNum = DataCoolantTemp.Value * 100;                    
+                    DataCoolantTemp_Dis.u8_Holdtimer = CoolantFlashtimer;
                 } 
                 else
                 {
@@ -311,44 +315,56 @@ void Data_Coolant_Temp_Display ( void )
                 
             }
         }
-        
-        if(DataCoolantTemp_Dis.u8_CurSeg > DataCoolantTemp_Dis.u8_DestSeg )
+        if (Common_GetIgnOnTime() >= 3030)
         {
-            u32ColCurNum = Data_Coolant_Cal_Num(DataCoolantTemp_Dis.u8_CurSeg, 0, (DataCoolantTemp_Dis.u8_Downtimer - DataCoolantTemp_Dis.u8_DownFlashtimer), u32ColCurNum, DataCoolantTemp.Value*100);
-            DataCoolantTemp_Dis.u8_UpFlashtimer = 0; 
-            DataCoolantTemp_Dis.u8_Holdtimer = 0; 
-            DataCoolantTemp_Dis.u8_DownFlashtimer++;
-            if(DataCoolantTemp_Dis.u8_DownFlashtimer >= DataCoolantTemp_Dis.u8_Downtimer)
+            if(DataCoolantTemp_Dis.u8_CurSeg > DataCoolantTemp_Dis.u8_DestSeg )
+            {
+                u32ColCurNum = Data_Coolant_Cal_Num(DataCoolantTemp_Dis.u8_CurSeg, 0, (DataCoolantTemp_Dis.u8_Downtimer - DataCoolantTemp_Dis.u8_DownFlashtimer), u32ColCurNum, DataCoolantTemp.Value*100);
+                DataCoolantTemp_Dis.u8_UpFlashtimer = 0; 
+                DataCoolantTemp_Dis.u8_Holdtimer = 0; 
+                DataCoolantTemp_Dis.u8_DownFlashtimer++;
+                if(DataCoolantTemp_Dis.u8_DownFlashtimer >= DataCoolantTemp_Dis.u8_Downtimer)
+                {
+                    DataCoolantTemp_Dis.u8_DownFlashtimer = 0;
+                    DataCoolantTemp_Dis.u8_CurSeg--;
+                }
+            }
+            else if (DataCoolantTemp_Dis.u8_CurSeg < DataCoolantTemp_Dis.u8_DestSeg)
             {
+                u32ColCurNum = Data_Coolant_Cal_Num(DataCoolantTemp_Dis.u8_CurSeg, 1, (DataCoolantTemp_Dis.u8_Uptimer - DataCoolantTemp_Dis.u8_UpFlashtimer), u32ColCurNum, DataCoolantTemp.Value*100);
                 DataCoolantTemp_Dis.u8_DownFlashtimer = 0;
-                DataCoolantTemp_Dis.u8_CurSeg--;
+                DataCoolantTemp_Dis.u8_Holdtimer = 0;
+                DataCoolantTemp_Dis.u8_UpFlashtimer++;
+                if (DataCoolantTemp_Dis.u8_UpFlashtimer >= DataCoolantTemp_Dis.u8_Uptimer)
+                {
+                    DataCoolantTemp_Dis.u8_UpFlashtimer = 0;
+                    DataCoolantTemp_Dis.u8_CurSeg++;
+                }
             }
-        }
-        else if (DataCoolantTemp_Dis.u8_CurSeg < DataCoolantTemp_Dis.u8_DestSeg)
-        {
-            u32ColCurNum = Data_Coolant_Cal_Num(DataCoolantTemp_Dis.u8_CurSeg, 1, (DataCoolantTemp_Dis.u8_Uptimer - DataCoolantTemp_Dis.u8_UpFlashtimer), u32ColCurNum, DataCoolantTemp.Value*100);
-            DataCoolantTemp_Dis.u8_DownFlashtimer = 0;
-            DataCoolantTemp_Dis.u8_Holdtimer = 0;
-            DataCoolantTemp_Dis.u8_UpFlashtimer++;
-            if (DataCoolantTemp_Dis.u8_UpFlashtimer >= DataCoolantTemp_Dis.u8_Uptimer)
+            else
             {
+                   DataCoolantTemp_Dis.u8_DownFlashtimer = 0;
                 DataCoolantTemp_Dis.u8_UpFlashtimer = 0;
-                DataCoolantTemp_Dis.u8_CurSeg++;
+                DataCoolantTemp_Dis.u8_Holdtimer++;
+                if (DataCoolantTemp_Dis.u8_Holdtimer >= CoolantFlashtimer)
+                {
+                    DataCoolantTemp_Dis.u8_Holdtimer = CoolantFlashtimer;
+                }
+                /*目标格和当前格一致时，数显如何处理*/
+                /*5S后更新为目标数值*/
+
+
+                
+                u32ColCurNum = Data_Coolant_Cal_Num(DataCoolantTemp_Dis.u8_CurSeg, 2, (CoolantFlashtimer-DataCoolantTemp_Dis.u8_Holdtimer ), u32ColCurNum, DataCoolantTemp.Value*100);
+                
+   
             }
         }
         else
         {
-               DataCoolantTemp_Dis.u8_DownFlashtimer = 0;
-            DataCoolantTemp_Dis.u8_UpFlashtimer = 0;
-            DataCoolantTemp_Dis.u8_Holdtimer++;
-            if (DataCoolantTemp_Dis.u8_Holdtimer >= CoolantFlashtimer)
-            {
-                DataCoolantTemp_Dis.u8_Holdtimer = CoolantFlashtimer;
-            }
-            /*目标格和当前格一致时，数显如何处理*/
-            /*5S后更新为目标数值*/
-            u32ColCurNum = Data_Coolant_Cal_Num(DataCoolantTemp_Dis.u8_CurSeg, 2, (CoolantFlashtimer-DataCoolantTemp_Dis.u8_Holdtimer ), u32ColCurNum, DataCoolantTemp.Value*100);
+            u32ColCurNum = DataCoolantTemp.Value * 100;
         }
+        
 
         // warning
 
@@ -368,7 +384,10 @@ void Data_Coolant_Temp_Display ( void )
             }
             else
             {
-                ;
+                if(DataCoolantTemp_Dis.u8_Warnflg == 1)
+                {
+                    DataCoolantTemp_Dis.u8_Warnflg = 0;
+                }
             }
         }
     }

Firmware/Source/Application/Data_TPMS/Data_TPMS.c

@@ -357,7 +357,7 @@ void Data_TPMS_Processing_Service ( void )
     Front_TPMS          = Get_CAN_CH0_ID_341_Sig_Front_Pressure();
     Rear_TPMS           = Get_CAN_CH0_ID_341_Sig_Rear_Pressure();
 
-    if ( Common_Get_IG_Sts() == COMMON_POWER_ON )
+    if ( 1 )
     {
         if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x341_Msg_Count) == CAN_SIG_LOST)
         {

Firmware/Source/Application/GUI_Display/GUI_Display.c

@@ -104,7 +104,7 @@ void Gauge_Service(void)
     {
         if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
         {
-            if (Common_GetIgnOnTime() >= 3000)
+            if (Common_GetIgnOnTime() >= 3030)
             {
                 //for(i = 0; i < BU98R10_DDRAM_SIZE; i ++)
                 //{

Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c

@@ -4574,30 +4574,34 @@ void Checkself_SEG_Display(void)
 //     BU98R10Chip1DDRAM.Byte[i] = 1;
 // }
 #if (1)
-    if (Checkself_SEG_step_count < 60)
+    if (Common_GetIgnOnTime() >= 30)
     {
-        Checkself_SEG_step_count++;
-    }
-    else
-    {
-        Checkself_SEG_step_count = 60;
-    }
-
-    if (Checkself_SEG_step_count <= 29)
-    {
-        Checkself_SEG_step++;
-    }
-    else
-    {
-        if (Checkself_SEG_step == 0)
+        if (Checkself_SEG_step_count < 60)
         {
-            Checkself_SEG_step = 0;
+            Checkself_SEG_step_count++;
         }
         else
         {
-            Checkself_SEG_step--;
+            Checkself_SEG_step_count = 60;
+        }
+    
+        if (Checkself_SEG_step_count <= 29)
+        {
+            Checkself_SEG_step++;
+        }
+        else
+        {
+            if (Checkself_SEG_step == 0)
+            {
+                Checkself_SEG_step = 0;
+            }
+            else
+            {
+                Checkself_SEG_step--;
+            }
         }
     }
+    
     Mileage = ((Checkself_SEG_step / 3) * 111100);
     Fuel = Checkself_SEG_step / 5u;
     collant = 100 + ((Checkself_SEG_step / 3) * 11);

Firmware/Source/Component/BU98R10/BU98R10.c

 
 #include "Components.h"
+#include "BAT32A239.h"
+#include <string.h>
+#include <stdio.h>
+
 
 #define BU98R10_CHIP0_SD  RTE_GPIO_PORT00_PIN02
 #define BU98R10_CHIP0_CSB RTE_GPIO_PORT00_PIN03
@@ -25,12 +29,16 @@ void BU98R10_CHIP0_SET_SD_LEVEL(uint8_t Level)
 	if (Level)
 	{
 		//RTE_GPIO_Config(BU98R10_CHIP0_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
-		RTE_GPIO_Set_Level(BU98R10_CHIP0_SD, RTE_GPIO_LEVEL_HIGH);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP0_SD, RTE_GPIO_LEVEL_HIGH);
+		PORT->P0 |= (1<<2);
+		PORT->PM0 &= ~(1<<2);
 	}
 	else
 	{
 		//RTE_GPIO_Config(BU98R10_CHIP0_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
-		RTE_GPIO_Set_Level(BU98R10_CHIP0_SD, RTE_GPIO_LEVEL_LOW);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP0_SD, RTE_GPIO_LEVEL_LOW);
+		PORT->P0 &= ~(1<<2);//P02
+		PORT->PM0 &= ~(1<<2); 
 	}
 }
 void BU98R10_CHIP1_SET_SD_LEVEL(uint8_t Level);
@@ -39,12 +47,16 @@ void BU98R10_CHIP1_SET_SD_LEVEL(uint8_t Level)
 	if (Level)
 	{
 		//RTE_GPIO_Config(BU98R10_CHIP1_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
-		RTE_GPIO_Set_Level(BU98R10_CHIP1_SD, RTE_GPIO_LEVEL_HIGH);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP1_SD, RTE_GPIO_LEVEL_HIGH);
+		PORT->P7 |= (1<<2);
+		PORT->PM7 &= ~(1<<2); 
 	}
 	else
 	{
 		//RTE_GPIO_Config(BU98R10_CHIP1_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
-		RTE_GPIO_Set_Level(BU98R10_CHIP1_SD, RTE_GPIO_LEVEL_LOW);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP1_SD, RTE_GPIO_LEVEL_LOW);
+		PORT->P7 &= ~(1<<2);//P72
+		PORT->PM7 &= ~(1<<2);
 	}
 }
 void BU98R10_CHIP0_SET_CSB_LEVEL(uint8_t Level);
@@ -53,12 +65,16 @@ void BU98R10_CHIP0_SET_CSB_LEVEL(uint8_t Level)
 	if (Level)
 	{
 		// RTE_GPIO_Config(BU98R10_CHIP0_CSB, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
-		RTE_GPIO_Set_Level(BU98R10_CHIP0_CSB, RTE_GPIO_LEVEL_HIGH);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP0_CSB, RTE_GPIO_LEVEL_HIGH);
+		PORT->P0 |= (1<<3);
+		PORT->PM0 &= ~(1<<3); 
 	}
 	else
 	{
 		// RTE_GPIO_Config(BU98R10_CHIP0_CSB, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
-		RTE_GPIO_Set_Level(BU98R10_CHIP0_CSB, RTE_GPIO_LEVEL_LOW);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP0_CSB, RTE_GPIO_LEVEL_LOW);
+		PORT->P0 &= ~(1<<3);//P03
+		PORT->PM0 &= ~(1<<3); 
 	}
 }
 void BU98R10_CHIP1_SET_CSB_LEVEL(uint8_t Level);
@@ -67,12 +83,16 @@ void BU98R10_CHIP1_SET_CSB_LEVEL(uint8_t Level)
 	if (Level)
 	{
 		// RTE_GPIO_Config(BU98R10_CHIP1_CSB, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
-		RTE_GPIO_Set_Level(BU98R10_CHIP1_CSB, RTE_GPIO_LEVEL_HIGH);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP1_CSB, RTE_GPIO_LEVEL_HIGH);
+		PORT->P7 |= (1<<1);
+		PORT->PM7 &= ~(1<<1);
 	}
 	else
 	{
 		//RTE_GPIO_Config(BU98R10_CHIP1_CSB, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
-		RTE_GPIO_Set_Level(BU98R10_CHIP1_CSB, RTE_GPIO_LEVEL_LOW);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP1_CSB, RTE_GPIO_LEVEL_LOW);
+		PORT->P7 &= ~(1<<1);//P71
+		PORT->PM7 &= ~(1<<1);
 	}
 }
 void BU98R10_CHIP0_SET_SCL_LEVEL(uint8_t Level);
@@ -81,12 +101,16 @@ void BU98R10_CHIP0_SET_SCL_LEVEL(uint8_t Level)
 	if (Level)
 	{
 		//RTE_GPIO_Config(BU98R10_CHIP0_SCL, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
-		RTE_GPIO_Set_Level(BU98R10_CHIP0_SCL, RTE_GPIO_LEVEL_HIGH);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP0_SCL, RTE_GPIO_LEVEL_HIGH);
+		PORT->P0 |= (1<<4);
+		PORT->PM0 &= ~(1<<4); 
 	}
 	else
 	{
 		//RTE_GPIO_Config(BU98R10_CHIP0_SCL, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
-		RTE_GPIO_Set_Level(BU98R10_CHIP0_SCL, RTE_GPIO_LEVEL_LOW);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP0_SCL, RTE_GPIO_LEVEL_LOW);
+		PORT->P0 &= ~(1<<4);//P04
+		PORT->PM0 &= ~(1<<4); 
 	}
 }
 void BU98R10_CHIP1_SET_SCL_LEVEL(uint8_t Level);
@@ -95,12 +119,16 @@ void BU98R10_CHIP1_SET_SCL_LEVEL(uint8_t Level)
 	if (Level)
 	{
 		 //RTE_GPIO_Config(BU98R10_CHIP1_SCL, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
-		RTE_GPIO_Set_Level(BU98R10_CHIP1_SCL, RTE_GPIO_LEVEL_HIGH);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP1_SCL, RTE_GPIO_LEVEL_HIGH);
+		PORT->P7 |= (1<<0);
+		PORT->PM7 &= ~(1<<0); 
 	}
 	else
 	{
 		//RTE_GPIO_Config(BU98R10_CHIP1_SCL, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
-		RTE_GPIO_Set_Level(BU98R10_CHIP1_SCL, RTE_GPIO_LEVEL_LOW);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP1_SCL, RTE_GPIO_LEVEL_LOW);
+		PORT->P7 &= ~(1<<0);//P70
+		PORT->PM7 &= ~(1<<0); 
 	}
 }
 void BU98R10_CHIP0_SET_SD_DIR(uint8_t Dir);
@@ -108,12 +136,15 @@ void BU98R10_CHIP0_SET_SD_DIR(uint8_t Dir)
 {
 	if (Dir)
 	{
-		RTE_GPIO_Set_Level(BU98R10_CHIP0_SD, RTE_GPIO_LEVEL_HIGH);
+		//RTE_GPIO_Set_Level(BU98R10_CHIP0_SD, RTE_GPIO_LEVEL_HIGH);
+		PORT->P0 |= (1<<2);
+		PORT->PM0 &= ~(1<<2); 
 		// RTE_GPIO_Config(BU98R10_CHIP0_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
 	}
 	else
 	{
-		RTE_GPIO_Config(BU98R10_CHIP0_SD, RTE_GPIO_DIR_IN);
+		//RTE_GPIO_Config(BU98R10_CHIP0_SD, RTE_GPIO_DIR_IN);
+		PORT->PM0 |= (1<<2);
 	}
 }
 void BU98R10_CHIP1_SET_SD_DIR(uint8_t Dir);
@@ -122,11 +153,14 @@ void BU98R10_CHIP1_SET_SD_DIR(uint8_t Dir)
 	if (Dir)
 	{
 		//RTE_GPIO_Set_Level(BU98R10_CHIP1_SD, RTE_GPIO_LEVEL_HIGH);
-		 RTE_GPIO_Config(BU98R10_CHIP1_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
+		 //RTE_GPIO_Config(BU98R10_CHIP1_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
+		PORT->P7 |= (1<<2);
+		PORT->PM7 &= ~(1<<2); 
 	}
 	else
 	{
-		RTE_GPIO_Config(BU98R10_CHIP1_SD, RTE_GPIO_DIR_IN);
+		//RTE_GPIO_Config(BU98R10_CHIP1_SD, RTE_GPIO_DIR_IN);
+		PORT->PM7 |= (1<<2); 
 	}
 }
 

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -52,6 +52,20 @@ static void Power_KL30_Init(void)
 
     Data_TPMS_KL30_Init ();
     CAN_TX_Count_Init();
+    
+    CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+    CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+    CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+    Data_TPMS_Processing_Service();
+    CAN_TX_Init();
+
+
+
+
+
+
+
+
     CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
     
     
@@ -97,8 +111,8 @@ static void Power_KL30_Init(void)
     RTE_RTC_Init(RTCInformation);
     RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
     FaultCode_Init();
+// Data_TPMS_Processing_Service();
 
-    
 
 }
 extern uint32_t PowerIgnOffTimeLine;
@@ -109,7 +123,7 @@ static void Power_Wakeup_Init(void)
     Simulated_IIC_2_Init();
     Gpio_Init(Gpio_WakeUp_Init);
     Can_Init();
-    CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
+
     DFlash_init();
     Data_Read_DiagPara();
     eeprom_StoreInfo_Init();
@@ -117,6 +131,20 @@ static void Power_Wakeup_Init(void)
     Data_User_Mileage_WakeupInit();
     BU98R10_Init();    
     Sys_WakeUp_Init();
+    Data_TPMS_KL15_WAKE_UP_Init();
+
+    CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+        CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+            CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
+    Data_TPMS_Processing_Service();
+    CAN_TX_Init();
+
+    CAN_TX_Count_Init();
+    CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
+
+
+
+
     Data_Vehicle_Speed_KL30_Init();
     Data_Vehicle_Speed_Wakeup_Init();
     Data_Engine_Speed_KL30_Wakeup_Init();
@@ -142,11 +170,11 @@ static void Power_Wakeup_Init(void)
     TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
     Telltales_Init();
     Telltales_UserInit();
-    Data_TPMS_KL15_WAKE_UP_Init();
+    
     RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
     FaultCode_Init();
     Service_Interval_User_WakeupInit();
-    CAN_TX_Count_Init();
+
 }
 
 static void Power_LVP_Init(void)
@@ -162,7 +190,7 @@ static void Power_IG_OFF_Init(void)
 {
     Line_In_KL15_OFF_Init();
     Checkself_Init();
-    CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
+    //CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
 }
 
 static void Power_IG_ON_Init(void)

Firmware/Source/System/Sys_Task_List.c

@@ -114,7 +114,11 @@ void Sys_100ms_Tasks(void)
     }   
 
     Clear_Navigation_St(); 
-
+    Protocol_ESP32_Active_Service();
+    if(Common_GetIgnOffTime() >= 1000)
+    {
+        CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
+    }
     //R_test = ADC_Read_Signal(ADC_CH_FUEL1);
 }
 

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -311,13 +311,13 @@
 #define CheckSumErr       7    // Checksum Error
 #define UnknownPartID     8    // Unknown Part ID
 
-#define SWV 0x115 // 0x100 = 1.00 software version 软件版本号
+#define SWV 0x118 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
-#define INTLV 0x115 // 0x100 = 1.00 internal version 内部版本号
+#define INTLV 0x118 // 0x100 = 1.00 internal version 内部版本号
 #define PROG_Y 0x24 // 0x24 = 2024年, program year
 #define PROG_M 0x08 // 0x03 = 3月, program month
-#define PROG_D 0x17 // 0x19 = 19日, program day
+#define PROG_D 0x19 // 0x19 = 19日, program day
 
 /******************************************************************************
  Bootloader Variable

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

 #new Option
-#Sat Aug 03 16:25:18 CST 2024
+#Mon Aug 19 18:11:24 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -7,13 +7,13 @@ MergeCanXLSPath=
 RH850_D1M1AGPIOJSONpath=
 DBFFilePath=
 MergeCrcTtpe=21
-MergeBootFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.02_240719.hex
+MergeBootFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.03_240814.hex
 IsMergeChangeAddress=false
 MergeFlashOutPutFilePath=
 GPIOOutPutPath=
 MergeCanDBCPath=
 IsFilling=true
-RxID=7E8
+RxID=794
 MergeAudioInPutPath=
 MergeAudioIndex=3
 IsFastSend=true
@@ -24,13 +24,13 @@ SoftwareVersion=0
 MsgSTmin=0
 MergeLineInOutPutPath=
 Leave2ID=9
-PHYID=7E0
+PHYID=714
 BaudRate=500K
 AppUpdateFilePath=
 FUNID=7DF
 IsMergeCreateBin=false
 IsOverWrite=false
-DllFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\\u89E3\u9501\u6587\u4EF6\\TY100 x64.dll
+DllFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\\u89E3\u9501\u6587\u4EF6\\TY100 x64.dll
 MergeAudioOutPutPath=
 MergeCanOutPutPath=
 ChangeOutPutFilePath=
@@ -39,7 +39,7 @@ TTFExtractTXTpath=
 JieFaRH850GPIOJSONpath=
 MergeFlashIsMandatory=false
 UpdateProcess=\u6BD4\u4E9A\u8FEA
-Driver=PCAN
+Driver=Kvaser
 MergeFlashImageFormat=
 RH850_F1KMGPIOJSONpath=
 DriverFilePath=
@@ -56,8 +56,8 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240803
-MergeAppFilePath=D\:\\git\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240803\\TianYing.hex
+MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240819
+MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240819\\TianYing.hex
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0