Merge branch 'dev' into 'master'

代码审核

See merge request !2

boot/XHY_FlashDriver.s19

+S019000007473959573730313030303032354141202020202000CE
+S123C0A00000000000000100000000000000010000000000000000000000000000800000FA
+S9030000FC
\ No newline at end of file

code/Sources/Diagnostic/src/UDS_ISO14229_Services.c

@@ -1621,33 +1621,33 @@ void UDS_Service_22_Indication ( uint32_t A_TA_type, uint16_t A_Length, uint8_t
       break;
       //ECU零件号
       case 0xF187:
-          if(NVM_CONFIG_POWER == 1){//24V
-              UDS_ISO14229_Transfer[2]  = '9';
-              UDS_ISO14229_Transfer[3]  = '0';
-              UDS_ISO14229_Transfer[4]  = '3';
-              UDS_ISO14229_Transfer[5]  = '0';
-              UDS_ISO14229_Transfer[6]  = '3';
-              UDS_ISO14229_Transfer[7]  = '8';
-              UDS_ISO14229_Transfer[8]  = '4';
-              UDS_ISO14229_Transfer[9]  = '5';
-              UDS_ISO14229_Transfer[10] = ' ';
-              UDS_ISO14229_Transfer[11] = ' ';
-              UDS_ISO14229_Transfer[12] = ' ';
-              UDS_ISO14229_Transfer[13] = ' ';
-          } else if(NVM_CONFIG_POWER == 0){//12V
-              UDS_ISO14229_Transfer[2]  = '9';
-              UDS_ISO14229_Transfer[3]  = '0';
+          //if(NVM_CONFIG_POWER == 1){//24V
+          //    UDS_ISO14229_Transfer[2]  = '9';
+          //    UDS_ISO14229_Transfer[3]  = '0';
+          //    UDS_ISO14229_Transfer[4]  = '3';
+          //    UDS_ISO14229_Transfer[5]  = '0';
+          //    UDS_ISO14229_Transfer[6]  = '3';
+          //    UDS_ISO14229_Transfer[7]  = '8';
+          //    UDS_ISO14229_Transfer[8]  = '4';
+          //    UDS_ISO14229_Transfer[9]  = '5';
+          //    UDS_ISO14229_Transfer[10] = ' ';
+          //    UDS_ISO14229_Transfer[11] = ' ';
+          //    UDS_ISO14229_Transfer[12] = ' ';
+          //    UDS_ISO14229_Transfer[13] = ' ';
+          //} else if(NVM_CONFIG_POWER == 0){//12V
+              UDS_ISO14229_Transfer[2]  = '3';//'9';
+              UDS_ISO14229_Transfer[3]  = '8';//'0';
               UDS_ISO14229_Transfer[4]  = '2';
-              UDS_ISO14229_Transfer[5]  = '5';
-              UDS_ISO14229_Transfer[6]  = '7';
-              UDS_ISO14229_Transfer[7]  = '4';
-              UDS_ISO14229_Transfer[8]  = '4';
-              UDS_ISO14229_Transfer[9]  = '3';
-              UDS_ISO14229_Transfer[10] = ' ';
-              UDS_ISO14229_Transfer[11] = ' ';
-              UDS_ISO14229_Transfer[12] = ' ';
-              UDS_ISO14229_Transfer[13] = ' ';
-          }
+              UDS_ISO14229_Transfer[5]  = '0';//'5';
+              UDS_ISO14229_Transfer[6]  = '0';//'7';
+              UDS_ISO14229_Transfer[7]  = '1';//'4';
+              UDS_ISO14229_Transfer[8]  = '0';//'4';
+              UDS_ISO14229_Transfer[9]  = '-';//'3';
+              UDS_ISO14229_Transfer[10] = 'E';
+              UDS_ISO14229_Transfer[11] = 'F';
+              UDS_ISO14229_Transfer[12] = '0';
+              UDS_ISO14229_Transfer[13] = '1';
+          //}
           UDS_Service_Response ( 0x22, POSITIVE_RSP, DIAG_ID_Tx, 14, UDS_ISO14229_Transfer );
       break;
       //ECU供应商ID

code/Sources/Driver/src/MSCAN0.c

@@ -563,13 +563,13 @@ void MSCAN0_Init ( void )
     CAN0CTL1_CLKSRC = 0;        //选择OSCCLK(8MHz)为MSCAN的时钟源
     CAN0CTL1_LISTEN = 0;        //正常运行模式(非监听模式)
 #if MSCAN0_BUS_OFF_AUTO_RECOVERY
-    CAN0CTL1_BORM = 0;	      //自动总线BUS_OFF恢复
+    CAN0CTL1_BORM = 0;	        //自动总线BUS_OFF恢复
 #else
-    CAN0CTL1_BORM = 1;	      //总线BUS_OFF由用户控制恢复
+    CAN0CTL1_BORM = 1;	        //总线BUS_OFF由用户控制恢复
 #endif
     CAN0CTL1_WUPM = 1;		      //给唤醒加滤波
-    CAN0BTR0 = 0X43;   //波特率设置 现在这个配置是81.25%的采样点
-    CAN0BTR1 = 0X14;
+    CAN0BTR0 = 0X41;            //2tq, Prescaler value=4,波特率 8M/(2 * (1+2+5)=500k
+    CAN0BTR1 = 0X14;            //波特率设置 现在这个配置是1+5/1+5+2 = 75%的采样点
     /*
     myBRP=5;            p=(myBRP-1);
     mySJW=3;           sj=(mySJW-1)<<6;		//同步跳转段=2       2015-3-12

code/Sources/System/src/main.c

@@ -10,6 +10,9 @@
 //20210621 修改软硬件版本号
 //20220115 变更TFT背光频率(61194芯片换成9967芯片)
 //20231114 TYW-2023-0695变更：增加天然气报警灯、天蓝液表改为天然气表
+//20231122 修改波特率为500k
+//20231204 取消RVM报警灯
+//20231205 修改变更测出禅道问题：35470、35462、35101
 
 #include "main.h"
 #include "fuelconfig.h"
@@ -308,7 +311,7 @@ void Fuel_Process(void)                      //
   
   uint16_t  DataAvgFuel;               //平均油耗
   wdt_reset();
- if (NVM_CONFIG_POWER==1)
+  if (NVM_CONFIG_POWER==1)
   {  
       if((IO_DISPLAY_MODE != IO_DISP_MODE_IGN_OFF)&&(ANALOG_KL15_VOLTAGE>=18000))
       {

code/TBDML.ini

@@ -11,7 +11,7 @@ Layout=C_layout.hwl
 LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 CPU=HC12
 AEFWarningDialog=FALSE
-MainFrame=2,3,-32000,-32000,-1,-1,382,131,1859,919
+MainFrame=2,3,-1,-1,-1,-1,382,131,1859,919
 TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806
 Configuration=TBDML.hwc
 Statusbar=1
@@ -110,11 +110,11 @@ Search15=DoCAN_Receive_And_Assemble_N_USData
 
 
 [Recent Applications File List]
-File0=H:\EF01\源码\03-程序源码\wuzheng_a901-master\原程序\bin\WuZhengProject7.0.abs
-File1=H:\EF01\源码\03-程序源码\wuzheng_a901-master\原程序\bin\WuZhengProject7.0.abs.s19
-File2=C:\Users\可乐\Desktop\31五征A901变更燃油续航及BUG_20210125更改短路 燃油电压\31五征A901变更燃油续航及BUG_20210125\03_五征A901 程序源码\W3_A901_SVa00.06_20210224_FV0.06HV0.02-12V\bin\WuZhengProject7.0.abs
-File3=C:\Users\可乐\Desktop\五征DY09 A901短路燃油阻值测试版\A901WuZhengProject7.0.abs.s19
-LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" 
+File0=I:\GIT\DEV\WZ-EF01\s19\W3_EF01_20231122_BV1.01(500k)_SVa00.09_HV1.07_FV0.08-12V_ALL.s19
+File1=I:\GIT\DEV\WZ-EF01\s19\Merge_20231122142107669708.s19
+File2=H:\EF01\Դ\03-Դ\wuzheng_a901-master\ԭ\bin\WuZhengProject7.0.abs
+File3=H:\EF01\Դ\03-Դ\wuzheng_a901-master\ԭ\bin\WuZhengProject7.0.abs.s19
+LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
 LoadFlags3=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"