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

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/system_BAT32G139.c

@@ -25,6 +25,7 @@
 
 #include <stdint.h>
 #include "BAT32G139.h"
+#include "userdefine.h"
 
 
 /*----------------------------------------------------------------------------
@@ -64,7 +65,11 @@ typedef enum {
          following is an example for different system frequencies */
 
 //-------- <<< Use Configuration Wizard in Context Menu >>> ------------------
+#if HAS_BOOTLOADER
+const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".ARM.__AT_0x000080C0"))) =
+#else
 const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".ARM.__AT_0x000000C0"))) =
+#endif
 {
 
 /**

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/userdefine.h

@@ -17,6 +17,10 @@ User definitions
 #ifndef __TYPEDEF__
 
 typedef unsigned short 	MD_STATUS;
+
+#define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
+#define APP_BASE (0x00008000ul)
+
 /* Status list definition */
 #define MD_STATUSBASE        (0x00U)
 #define MD_OK                (MD_STATUSBASE + 0x00U) /* register setting OK */

Firmware/Source/UDS/UDS_ISO14229_Services.c

@@ -27,9 +27,9 @@ extern void UDS_Service_Response(uint8_t si, uint8_t RspType, uint16_t A_TA_type
 /*诊断使用, 判断App一致性, 禁止修改（内部版本号除外）*/
 extern const ProjectInfoStruct ProjectInfo __attribute__((section(".ARM.__at_0x00007800"))) =
 {
-    "HaoJin232",    // 豪进232
-    "HJYB-5",
-    "BAT32A239KK64FB", // 中微芯片
+    "TianYing100",    // 天鹰100
+    "TY200.080000b",
+    "BAT32G139GK64FB", // 中微芯片
     {
         "CAN_STD",
         "CAN_CH_0",
@@ -93,7 +93,7 @@ uint8_t MCU_HWversion[6] = {'H', 'V', (uint8_t)((HWV >> 8u) & 0x0Fu) + 0x30u, '.
 uint8_t MCU_FBLversion[6] = {'B', 'V', (uint8_t)((BTV >> 8u) & 0x0Fu) + 0x30u, '.', (uint8_t)((BTV >> 4u) & 0x0Fu) + 0x30u, (uint8_t)(BTV & 0x0Fu) + 0x30u};
 
 //零件号信息 F187
-uint8_t MCU_PartNumber[6] = {'H', 'J', 'Y', 'B', '-', '5'};
+uint8_t MCU_PartNumber[13] = {'T', 'Y', '2', '0', '0', '.', '0', '8', '0', '0', '0', '0', 'b'};
 
 void Data_Set_DiagPara(void)
 {
@@ -104,7 +104,7 @@ void Data_Set_DiagPara(void)
     {
         DiagDataForDFlash.DID_F180[i] = MCU_FBLversion[i];
     }
-    for(i = 0; i < 6; i++)
+    for(i = 0; i < 13; i++)
     {
         DiagDataForDFlash.DID_F187[i] = MCU_PartNumber[i];
     }
@@ -141,7 +141,7 @@ void DFlash_init(void)
     
     if( (ReadDiagDataForDFlash->Flag != 0x5AA5A77Au)||
         (0!=memcmp(ReadDiagDataForDFlash->DID_F180 , MCU_FBLversion,sizeof(MCU_FBLversion)))||
-        (0!=memcmp(ReadDiagDataForDFlash->DID_F187 , MCU_PartNumber,sizeof(MCU_FBLversion)))||
+        (0!=memcmp(ReadDiagDataForDFlash->DID_F187 , MCU_PartNumber,sizeof(MCU_PartNumber)))||
         (0!=memcmp(ReadDiagDataForDFlash->DID_F193 , MCU_HWversion ,sizeof(MCU_HWversion )))||
         (0!=memcmp(ReadDiagDataForDFlash->DID_F195 , MCU_SWversion ,sizeof(MCU_SWversion )))
       )
@@ -774,11 +774,11 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
             break;
 
         case 0xF187: // 读零件号
-            for (i = 0; i < 6; i++)
+            for (i = 0; i < 13; i++)
             {
                 UDS_ISO14229_Transfer[i + 2] = MCU_PartNumber[i];
             }
-            UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, 2 + 6, UDS_ISO14229_Transfer);
+            UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, 2 + 13, UDS_ISO14229_Transfer);
             break;
 
         case 0x1024: // 读内部版本号
@@ -1168,13 +1168,13 @@ void UDS_Service_28_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
         NrcCode = SerXXNRC22Filter();
     }
 
-    if (0 == NrcCode)
-    {
-        if (normalCommunicationMessages != UDS_ISO14229_Transfer[1])
-        {
-            NrcCode = requestOutOfRange;
-        }
-    }
+    // if (0 == NrcCode)
+    // {
+    //     if (normalCommunicationMessages != UDS_ISO14229_Transfer[1])
+    //     {
+    //         NrcCode = requestOutOfRange;
+    //     }
+    // }
 
     if (0 == NrcCode)
     {
@@ -1229,6 +1229,9 @@ void UDS_Service_28_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
             if (UDS_ISO14229_Transfer[1] & networkManagementCommunicationMessages)
             {
             }
+            if (UDS_ISO14229_Transfer[1] & networkManagementCommunicationMessagesnormalCommunicationMessages)
+            {
+            }
         }
 
         if (AbleResponseType == Ser28BanResponse)

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -152,8 +152,8 @@
  SecurityAccess
  ********************************************************************************/
 #define SecurityAccess    0x27
-#define requestSeed_LV1   0x01
-#define sendKey_LV1       0x02
+#define requestSeed_LV1   0x09
+#define sendKey_LV1       0x0A
 #define requestSeed_LV3   0x03
 #define sendKey_LV3       0x04
 #define requestSeed_LV5   0x05
@@ -341,10 +341,10 @@ typedef struct
 {
     uint32_t Flag;
     uint8_t DID_F180[6];
-    uint8_t DID_F187[6];
+    uint8_t DID_F187[13];
     uint8_t DID_F193[6];
     uint8_t DID_F195[6];
-    uint8_t Filldata[4];
+    uint8_t Filldata[1];
 }DiagDFlashData;
 extern DiagDFlashData DiagDataForDFlash;
 typedef struct

Firmware/utility/Boot_Release/变更记录.txt

+----2024/05/10----
+BOOT文件V1.0
+文件名：TianYing_TY200.080000b_Boot_B1.00_240513.hex
+变更内容：BOOT文件出版提交
\ No newline at end of file

Firmware/utility/TianYing升级脚本/bootloader.stcfg

+[NStatePersistence]
+Signature=VectorStatePersistence
+[VGlobalMeasurementIndex]
+mMeasurementIndex=936

Firmware/utility/TianYing升级脚本/source/can/resetCAN.can

+/*@!Encoding:936*/
+on busOff
+{
+  resetCan();
+}
\ No newline at end of file

Firmware/utility/TianYing升级脚本/source/can/resetCAN.canencr

+#:	
+tbAf_YR(+wm
+faɇbay{FvەEA&?I
\ No newline at end of file

Firmware/utility/TianYing升级脚本/source/cin/var.cin

+/*@!Encoding:936*/
+variables
+{
+  const word testWaitForRsp = 1600; //等待诊断响应完成的总时间
+  const word pendding = 5000;      //两帧NRC78的Δt
+  const word P2CAN_Client = 150;    //ECU响应超时时间, 仅适用于单帧和首帧
+  const word P2CAN_Server = 50;
+  const word P2xCAN_Server = 5000;  //P2*Server，用于判断10服务响应数据
+  
+  //点亮转向灯，0x144报文的前7个字节，第8字节(checksum)会自动计算
+  byte _144_B0 = 0x00;
+  byte _144_B1 = 0x00;
+  byte _144_B2 = 0x00;
+  byte _144_B3 = 0x00;
+  byte _144_B4 = 0x00;
+  byte _144_B5 = 0x61;//EQEAL = 0x51, HA6HA = 0x61
+  byte _144_B6 = 0x08;//EQEAL = 0x08, HA6HA = 0x08
+}
\ No newline at end of file

Firmware/utility/TianYing升级脚本/source/cin/var.cinencr

+#|
+tbAf_YR(+hjk`ɇbazfqmwnH
h4hBcd~{ca-:`P>uL0,usҨ}luwj80WASWfBb\|;x
+ 
&Lvqݧrc=	ǠCȌSHZw
+}wh
+ZurDX$91%;RCx|yreM9	lóA[Jӹ
+g$Χm;iGydnErrSK-.P utX&{Ed/঩iunjZLO:\<P)AG
+!j"
\ No newline at end of file

Firmware/utility/TianYing升级脚本/source/panel/sysvar.vsysvar

+<?xml version="1.0" encoding="utf-8"?>
+<systemvariables version="4">
+  <namespace name="" comment="" interface="">
+    <namespace name="Bootloader" comment="" interface="">
+      <variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="Count" comment="" bitcount="32" isSigned="false" encoding="65001" type="int" />
+    </namespace>
+    <namespace name="CheckBox" comment="" interface="">
+      <variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="FlashDriverUnused" comment="" bitcount="32" isSigned="false" encoding="65001" type="int" />
+    </namespace>
+    <namespace name="File" comment="" interface="">
+      <variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="ApplicationFilePath" comment="" bitcount="88" isSigned="true" encoding="65001" type="string" />
+      <variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="FlashDriverFilePath" comment="" bitcount="88" isSigned="true" encoding="65001" type="string" />
+    </namespace>
+    <namespace name="ProgressBar" comment="" interface="">
+      <variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="Application" comment="" bitcount="32" isSigned="false" encoding="65001" type="int" />
+      <variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="FlashDriver" comment="" bitcount="64" isSigned="true" encoding="65001" type="float" />
+    </namespace>
+    <namespace name="TP" comment="" interface="">
+      <variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="MaxCANFDFrameLength" comment="" bitcount="32" isSigned="false" encoding="65001" type="int" />
+      <variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="RxID" comment="" bitcount="32" isSigned="false" encoding="65001" type="int" />
+      <variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="TxID_Func" comment="" bitcount="32" isSigned="false" encoding="65001" type="int" />
+      <variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="TxID_Phys" comment="" bitcount="32" isSigned="false" encoding="65001" type="int" />
+    </namespace>
+  </namespace>
+</systemvariables>
\ No newline at end of file

Firmware/utility/TianYing升级脚本/source/template/include/impl/multipage.xslt

+<?xml version="1.0" encoding="ISO-8859-1" standalone="yes" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">  
+  
+  <xsl:template name="showTimeStampImpl">
+    <xsl:param name="timeStampValue"/>
+    <xsl:value-of select="$timeStampValue"/>
+  </xsl:template>
+  
+</xsl:stylesheet>

Firmware/utility/诊断工具/FlashDriver/R5_FlashDriver.srec

+S00F000050726F6A6563742E737265633E
+S315019F0000F0F00FFF000FFF22FF33F66FFAAFCCFF21
+S315019F0010F0F0112302013F23F334F161F9AF2C4F25
+S70501ABD96411
\ No newline at end of file