Merge branch 'lijianshuang' into 'dev'

Lijianshuang

See merge request !2

Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.h

@@ -3,14 +3,16 @@
 
 #include "Components.h"
 
-#define CAN_CH0 &CAN_CH0_CanMsgOp
 extern st_CanMsgOp CAN_CH0_CanMsgOp;
 extern st_CanMsgTxOp CAN_CH0_CanMsgTxOp;
 
 typedef enum
 {
     CAN_CH0_ID_CAN_0x402_Msg_Count,
+    CAN_CH0_ID_CAN_0x341_Msg_Count,
+    CAN_CH0_ID_CAN_0x111_Msg_Count,
     CAN_CH0_ID_CAN_0x401_Msg_Count,    
+    CAN_CH0_ID_CAN_0x120_Msg_Count,
     CAN_CH0_ID_CAN_0x101_Msg_Count,
 
     CAN_CH0_ID_TOTAL_MAX,
@@ -18,28 +20,76 @@ typedef enum
 
 typedef enum
 {
-    CAN_CH0_ID_CAN_0x500_Msg_Count,
+
     CAN_CH0_ID_SEND_TOTAL,
 } CAN_CH0_CAN_MSG_SEND_ID_t;
 
 extern const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] ;
 extern const st_CAN_SendAttribute    CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL] ;
 
-#define  CAN_CH0_ID_CAN_0x500_Msg    0x500ul
 #define  CAN_CH0_ID_CAN_0x402_Msg    0x402ul
+#define  CAN_CH0_ID_CAN_0x341_Msg    0x341ul
+#define  CAN_CH0_ID_CAN_0x111_Msg    0x111ul
 #define  CAN_CH0_ID_CAN_0x401_Msg    0x401ul
+#define  CAN_CH0_ID_CAN_0x220_Msg    0x220ul
+#define  CAN_CH0_ID_CAN_0x120_Msg    0x120ul
 #define  CAN_CH0_ID_CAN_0x101_Msg    0x101ul
 
-
-
-//extern uint8_t  Get_CAN_CH0_ID_500_Sig_Key_ISTOP(void);
 extern uint8_t  Get_CAN_CH0_ID_402_Sig_ECU_Warning_Lamp(void);
+extern uint8_t  Get_CAN_CH0_ID_402_Sig_ECU_DTCL2(void);
+extern uint8_t  Get_CAN_CH0_ID_402_Sig_ECU_DTCM2(void);
+extern uint8_t  Get_CAN_CH0_ID_402_Sig_ECU_DTCH2(void);
+extern uint8_t  Get_CAN_CH0_ID_402_Sig_ECU_DTCAmnt(void);
+extern uint8_t  Get_CAN_CH0_ID_402_Sig_ECU_DTCL1(void);
+extern uint8_t  Get_CAN_CH0_ID_402_Sig_ECU_DTCM1(void);
+extern uint8_t  Get_CAN_CH0_ID_402_Sig_ECU_DTCH1(void);
+extern uint8_t  Get_CAN_CH0_ID_341_Sig_software_version(void);
+extern uint8_t  Get_CAN_CH0_ID_341_Sig_Rear_LearningStatus(void);
+extern uint8_t  Get_CAN_CH0_ID_341_Sig_Front_LearningStatus(void);
+extern uint8_t  Get_CAN_CH0_ID_341_Sig_Rear_Pressure_Warning(void);
+extern uint8_t  Get_CAN_CH0_ID_341_Sig_Front_Pressure_Warning(void);
+extern uint8_t  Get_CAN_CH0_ID_341_Sig_Rear_TireTemperature(void);
+extern uint8_t  Get_CAN_CH0_ID_341_Sig_Front_TireTemperature(void);
+extern uint8_t  Get_CAN_CH0_ID_341_Sig_Rear_Pressure(void);
+extern uint8_t  Get_CAN_CH0_ID_341_Sig_Front_Pressure(void);
+extern uint8_t  Get_CAN_CH0_ID_111_Sig_ISG_SideStand_State(void);
+extern uint8_t  Get_CAN_CH0_ID_111_Sig_ISG_SideStand(void);
+extern uint8_t  Get_CAN_CH0_ID_111_Sig_ISG_Engine_InjIgn_Cutoff_State(void);
+extern uint8_t  Get_CAN_CH0_ID_111_Sig_ISG_Engine_InjIgn_Cutoff(void);
+extern uint8_t  Get_CAN_CH0_ID_111_Sig_ISG_Engine_Autostop_State(void);
+extern uint8_t  Get_CAN_CH0_ID_111_Sig_ISG_Engine_Autostop(void);
+extern uint8_t  Get_CAN_CH0_ID_111_Sig_ISG_111_Livecounter(void);
+extern uint8_t  Get_CAN_CH0_ID_111_Sig_ISG_111_Checksum(void);
+extern uint8_t  Get_CAN_CH0_ID_401_Sig_ECU_401_Checksum(void);
+extern uint8_t  Get_CAN_CH0_ID_401_Sig_ECU_401_Livecounter(void);
+extern uint8_t  Get_CAN_CH0_ID_401_Sig_ECU_Gear_State(void);
+extern uint16_t Get_CAN_CH0_ID_401_Sig_ECU_Fuel_Consumption(void);
 extern uint8_t  Get_CAN_CH0_ID_401_Sig_ECU_Battery_Voltage(void);
+extern uint16_t Get_CAN_CH0_ID_401_Sig_ECU_Environment_Presure(void);
+extern uint8_t  Get_CAN_CH0_ID_220_Sig_CheckSum(void);
+extern uint8_t  Get_CAN_CH0_ID_220_Sig_AliveCounter(void);
+extern uint8_t  Get_CAN_CH0_ID_220_Sig_TCS_Switch(void);
+extern uint8_t  Get_CAN_CH0_ID_120_Sig_TCSStatus(void);
+extern uint8_t  Get_CAN_CH0_ID_120_Sig_RearWheelSpeedValidity(void);
+extern uint16_t Get_CAN_CH0_ID_120_Sig_RearWheelSpeed(void);
+extern uint8_t  Get_CAN_CH0_ID_120_Sig_Rear_ABS_control_status(void);
+extern uint8_t  Get_CAN_CH0_ID_120_Sig_FrontWheelSpeedValidity(void);
+extern uint16_t Get_CAN_CH0_ID_120_Sig_FrontWheelSpeed(void);
+extern uint8_t  Get_CAN_CH0_ID_120_Sig_Front_ABS_control_status(void);
+extern uint8_t  Get_CAN_CH0_ID_120_Sig_CheckSum(void);
+extern uint8_t  Get_CAN_CH0_ID_120_Sig_AliveCounter(void);
+extern uint8_t  Get_CAN_CH0_ID_120_Sig_ABS_Warning_lamp(void);
+extern uint8_t  Get_CAN_CH0_ID_101_Sig_ECU_Vehicle_Speed_State(void);
 extern uint8_t  Get_CAN_CH0_ID_101_Sig_ECU_Vehicle_Speed(void);
+extern uint8_t  Get_CAN_CH0_ID_101_Sig_ECU_Throttle_Position_State(void);
+extern uint8_t  Get_CAN_CH0_ID_101_Sig_ECU_Throttle_Position(void);
+extern uint8_t  Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature_State(void);
+extern uint16_t Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature(void);
+extern uint8_t  Get_CAN_CH0_ID_101_Sig_ECU_Engine_Speed_State(void);
 extern uint16_t Get_CAN_CH0_ID_101_Sig_ECU_Engine_Speed(void);
+extern uint8_t  Get_CAN_CH0_ID_101_Sig_ECU_101_Livecounter(void);
+extern uint8_t  Get_CAN_CH0_ID_101_Sig_ECU_101_Checksum(void);
 
 extern uint8_t  Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID);
 
-void Can_Set_Buff_500(canlib_uint8_t CopyData[]);
-
 #endif

Firmware/Source/Application/CAN_User/Can_User.c

@@ -63,6 +63,33 @@ void Can_RX_Apply_Buff(void)
     CAN_MessageCache_Init(CAN0MSG06, &CAN_RecvMsg);
     CAN_MessageCache_OverWriteConfig(CAN0MSG06, ENABLE);
 
+    CAN_RecvMsg.Id = 0x341;
+    CAN_RecvMsg.IDE = CAN_Id_Standard;
+    CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
+    CAN_RecvMsg.RTR = CAN_RTR_Data;
+    CAN_RecvMsg.Interrupt = ENABLE;
+    CAN_MessageCache_DeInit(CAN0MSG05);
+    CAN_MessageCache_Init(CAN0MSG05, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG05, ENABLE);
+
+    CAN_RecvMsg.Id = 0x111;
+    CAN_RecvMsg.IDE = CAN_Id_Standard;
+    CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
+    CAN_RecvMsg.RTR = CAN_RTR_Data;
+    CAN_RecvMsg.Interrupt = ENABLE;
+    CAN_MessageCache_DeInit(CAN0MSG07);
+    CAN_MessageCache_Init(CAN0MSG07, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG07, ENABLE);    
+
+    CAN_RecvMsg.Id = 0x120;
+    CAN_RecvMsg.IDE = CAN_Id_Standard;
+    CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
+    CAN_RecvMsg.RTR = CAN_RTR_Data;
+    CAN_RecvMsg.Interrupt = ENABLE;
+    CAN_MessageCache_DeInit(CAN0MSG11);
+    CAN_MessageCache_Init(CAN0MSG11, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG11, ENABLE);
+
     CAN_RecvMsg.Id = DIAG_ID_Rx_PHY;
     CAN_RecvMsg.IDE = CAN_Id_Standard;
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
@@ -90,7 +117,7 @@ void Can_Tx_Apply_Buff(void)
 {
     CanTxRxMsg CAN_SendMsg;
     CanTxRxMsg CAN_SendMsg_Diag_Tx;
-	CAN_SendMsg.Id = 0x500;
+	CAN_SendMsg.Id = 0x6EE;
 	CAN_SendMsg.IDE = CAN_Id_Standard;
 	CAN_SendMsg.CacheType = CAN_CacheType_Tx;
 	CAN_SendMsg.RTR = CAN_RTR_Data;
@@ -104,6 +131,49 @@ void Can_Tx_Apply_Buff(void)
     CAN_MessageCache_DeInit(CAN0MSG08);
     CAN_MessageCache_Init(CAN0MSG08, &CAN_SendMsg);
 
+    CAN_SendMsg.Id = 0x6EF;
+	CAN_SendMsg.IDE = CAN_Id_Standard;
+	CAN_SendMsg.CacheType = CAN_CacheType_Tx;
+	CAN_SendMsg.RTR = CAN_RTR_Data;
+	CAN_RecvMsg.Interrupt = DISABLE;
+	CAN_SendMsg.DLC = 8;
+    for (uint8_t i = 0; i < CAN_SendMsg.DLC; i++)
+    {
+        CAN_SendMsg.Data[i] = 0;
+    }
+
+    CAN_MessageCache_DeInit(CAN0MSG12);
+    CAN_MessageCache_Init(CAN0MSG12, &CAN_SendMsg);
+
+    CAN_SendMsg.Id = 0x450;
+	CAN_SendMsg.IDE = CAN_Id_Standard;
+	CAN_SendMsg.CacheType = CAN_CacheType_Tx;
+	CAN_SendMsg.RTR = CAN_RTR_Data;
+	CAN_RecvMsg.Interrupt = DISABLE;
+	CAN_SendMsg.DLC = 8;
+    for (uint8_t i = 0; i < CAN_SendMsg.DLC; i++)
+    {
+        CAN_SendMsg.Data[i] = 0;
+    }
+
+    CAN_MessageCache_DeInit(CAN0MSG13);
+    CAN_MessageCache_Init(CAN0MSG13, &CAN_SendMsg);
+
+    CAN_SendMsg.Id = 0x220;
+	CAN_SendMsg.IDE = CAN_Id_Standard;
+	CAN_SendMsg.CacheType = CAN_CacheType_Tx;
+	CAN_SendMsg.RTR = CAN_RTR_Data;
+	CAN_RecvMsg.Interrupt = DISABLE;
+	CAN_SendMsg.DLC = 8;
+    for (uint8_t i = 0; i < CAN_SendMsg.DLC; i++)
+    {
+        CAN_SendMsg.Data[i] = 0;
+    }
+
+    CAN_MessageCache_DeInit(CAN0MSG10);
+    CAN_MessageCache_Init(CAN0MSG10, &CAN_SendMsg);
+
+
     
 	CAN_SendMsg_Diag_Tx.Id = DIAG_ID_Tx;
 	CAN_SendMsg_Diag_Tx.IDE = CAN_Id_Standard;
@@ -239,9 +309,18 @@ void Can_Write(st_CAN_Msg *Msg)
 
     switch (CAN_SendMsg.Id)
     {
-    case 0x500:
+    case 0x6EE:
         CAN_Transmit(CAN0MSG08, &CAN_SendMsg);
         break;
+    case 0x6EF:
+        CAN_Transmit(CAN0MSG12, &CAN_SendMsg);
+        break;
+    case 0x450:
+        CAN_Transmit(CAN0MSG13, &CAN_SendMsg);
+        break;
+    case 0x220:
+        CAN_Transmit(CAN0MSG10, &CAN_SendMsg);
+        break;
 
     default:
         break;

Firmware/Source/Application/GPIO_USER/GpioUser.h

@@ -2,46 +2,41 @@
 #define _GPIOUSER_H_
 
 /* GPIO映射 */
-#define VSPEED_PWM_IN           RTE_GPIO_PORT00_PIN00   
+   
 #define WAKEUP_KL15_In          RTE_GPIO_PORT00_PIN01   
 #define SEG1_SD                 RTE_GPIO_PORT00_PIN02   
 #define SEG1_CSB                RTE_GPIO_PORT00_PIN03   
 #define SEG1_SCL                RTE_GPIO_PORT00_PIN04   
-#define HighBeam_P_In           RTE_GPIO_PORT00_PIN05   
-#define VSPEED_TEN_OUT          RTE_GPIO_PORT00_PIN06   
+#define PositionBeam_P_IN       RTE_GPIO_PORT00_PIN05   
+#define HighBeam_P_In           RTE_GPIO_PORT00_PIN06   
 
 #define BACKLIGHT_PWM           RTE_GPIO_PORT01_PIN00   
 #define LIN_RXD_ESP             RTE_GPIO_PORT01_PIN01   
 #define LIN_TXD_ESP             RTE_GPIO_PORT01_PIN02  
-#define EFI_FAULT_OUT           RTE_GPIO_PORT01_PIN03   
-#define AMBIENT_LIGHT_R         RTE_GPIO_PORT01_PIN04   
-#define RESEVER1_OUT_LOW        RTE_GPIO_PORT01_PIN05   
-#define AMBIENT_LIGHT_B         RTE_GPIO_PORT01_PIN06   
-#define AMBIENT_LIGHT_G         RTE_GPIO_PORT01_PIN07   
+#define VSpeed_Tens             RTE_GPIO_PORT01_PIN05   
+#define VSpeed_Hundreds         RTE_GPIO_PORT01_PIN06   
+#define ODO_TenThousand         RTE_GPIO_PORT01_PIN07   
 
 #define AVDD_OUT_LOW            RTE_GPIO_PORT02_PIN00   
 #define GND_OUT_LOW             RTE_GPIO_PORT02_PIN01   
 #define POWER_KL30_In           RTE_GPIO_PORT02_PIN02   
 #define POWER_KL15_In           RTE_GPIO_PORT02_PIN03   
-#define RESEVER2_OUT_LOW        RTE_GPIO_PORT02_PIN04   
+  
 #define FUEL_MCU_IN             RTE_GPIO_PORT02_PIN05
-#define VERSION_T_OUT_LOW       RTE_GPIO_PORT02_PIN06   
 #define FUEL_POWER_IN           RTE_GPIO_PORT02_PIN07   
 
-#define MAINTENANCE_LAMP_OUT    RTE_GPIO_PORT03_PIN00   
-#define RESEVER3_OUT_LOW        RTE_GPIO_PORT03_PIN01   
+   
+#define SDB_LED_DRIVER          RTE_GPIO_PORT03_PIN01   
 
 #define SWDIO                   RTE_GPIO_PORT04_PIN00
-#define RESEVER4_OUT_LOW        RTE_GPIO_PORT04_PIN01   
-#define LeftTurn_P_In           RTE_GPIO_PORT04_PIN02   
-#define RightTurn_P_In          RTE_GPIO_PORT04_PIN03   
+#define Key_MCU_IN              RTE_GPIO_PORT04_PIN03   
 
 #define CAN_MCU_RXD             RTE_GPIO_PORT05_PIN00   
 #define CAN_MCU_TXD             RTE_GPIO_PORT05_PIN01   
 #define CAN_STB_MCU             RTE_GPIO_PORT05_PIN02   
-#define MODE_P_IN               RTE_GPIO_PORT05_PIN03   
-#define SET_P_IN                RTE_GPIO_PORT05_PIN04   
-#define START_STOP_P_IN         RTE_GPIO_PORT05_PIN05   
+#define LeftTurn_P_In           RTE_GPIO_PORT05_PIN03   
+#define RightTurn_P_In          RTE_GPIO_PORT05_PIN04   
+#define ODO_Thousand            RTE_GPIO_PORT05_PIN05   
 
 #define IIC_SCL_24G16           RTE_GPIO_PORT06_PIN00   
 #define IIC_SDA_24G16           RTE_GPIO_PORT06_PIN01   
@@ -51,11 +46,11 @@
 #define SEG2_SCL                RTE_GPIO_PORT07_PIN00   
 #define SEG2_CSB                RTE_GPIO_PORT07_PIN01   
 #define SEG2_SD                 RTE_GPIO_PORT07_PIN02   
-#define SDB_LED_DRIVER          RTE_GPIO_PORT07_PIN03   
-#define HighBeam_MUC_OUT        RTE_GPIO_PORT07_PIN04   
-#define TPMS_MUC_OUT            RTE_GPIO_PORT07_PIN05   
-#define RightTurn_MUC_OUT       RTE_GPIO_PORT07_PIN06   
-#define LeftTurn_MUC_OUT        RTE_GPIO_PORT07_PIN07   
+#define Auto_StartStop_IN       RTE_GPIO_PORT07_PIN03   
+#define Low_Batt_Vol_IN         RTE_GPIO_PORT07_PIN04   
+#define Fault_Diagnosis_IN      RTE_GPIO_PORT07_PIN05   
+#define Oil_Pressure_IN         RTE_GPIO_PORT07_PIN06   
+#define Fault_ABS_IN            RTE_GPIO_PORT07_PIN07   
 
 #define POWER_5V_MCU            RTE_GPIO_PORT12_PIN00 
 #define MCU_XI                  RTE_GPIO_PORT12_PIN01 
@@ -63,14 +58,13 @@
 #define X32768_IN               RTE_GPIO_PORT12_PIN03 
 #define X32768_OUT              RTE_GPIO_PORT12_PIN04 
 
-#define VSPEED_HUNDREDS_OUT     RTE_GPIO_PORT13_PIN00 
-#define RESEVER5_OUT_LOW        RTE_GPIO_PORT13_PIN06 
+
 #define SWCLK                   RTE_GPIO_PORT13_PIN07 
 
 #define L_BD433Ctrl_OUT         RTE_GPIO_PORT14_PIN00 
 #define FUEL_POWER_MCU_OUT      RTE_GPIO_PORT14_PIN01 
 #define VERSION_F_OUT_LOW       RTE_GPIO_PORT14_PIN06 
-#define VERSION_S_OUT_LOW       RTE_GPIO_PORT14_PIN07 
+
 
 typedef enum
 {

Firmware/Source/UDS/Diag_ID_Def.h

@@ -8,8 +8,8 @@
 #ifndef _DIAG_ID_DEF_H_
 #define _DIAG_ID_DEF_H_
 
-#define DIAG_ID_Tx      0x0789u     /*发送ID*/
-#define DIAG_ID_Rx_PHY  0x0781u     /*接收ID,物理寻址*/
+#define DIAG_ID_Tx      0x07E8u     /*发送ID*/
+#define DIAG_ID_Rx_PHY  0x07E0u     /*接收ID,物理寻址*/
 #define DIAG_ID_Rx_FUN  0x07DFu     /*接收ID,功能寻址*/
 
 #endif

Firmware/utility/Boot_Release/Boot程序变更说明.txt

-# 2024.03.20
-    添加回滚App的功能
-    添加更新Boot程序的功能
-    添加校验App正确性的功能
-
-# 2024.03.15
-    上传初版程序
\ No newline at end of file

Firmware/utility/Can_BDF/Haojin232.dbc

-VERSION ""
-
-
-NS_ : 
-	NS_DESC_
-	CM_
-	BA_DEF_
-	BA_
-	VAL_
-	CAT_DEF_
-	CAT_
-	FILTER
-	BA_DEF_DEF_
-	EV_DATA_
-	ENVVAR_DATA_
-	SGTYPE_
-	SGTYPE_VAL_
-	BA_DEF_SGTYPE_
-	BA_SGTYPE_
-	SIG_TYPE_REF_
-	VAL_TABLE_
-	SIG_GROUP_
-	SIG_VALTYPE_
-	SIGTYPE_VALTYPE_
-	BO_TX_BU_
-	BA_DEF_REL_
-	BA_REL_
-	BA_DEF_DEF_REL_
-	BU_SG_REL_
-	BU_EV_REL_
-	BU_BO_REL_
-	SG_MUL_VAL_
-
-BS_:
-
-BU_: Haojin232
-VAL_TABLE_ ECU_Battery_Voltage ;
-VAL_TABLE_ ECU_Warning_Lamp 1 "ON" 0 "OFF" ;
-VAL_TABLE_ ECU_Vehicle_Speed ;
-VAL_TABLE_ ECU_Engine_Speed ;
-VAL_TABLE_ Key_ISTOP 1 "Enable" 0 "Unenable" ;
-
-
-BO_ 1280 CAN_0x500: 8 Vector__XXX
- SG_ Key_ISTOP : 0|1@0+ (1,0) [0|1] "" Vector__XXX
-
-BO_ 1026 CAN_0x402: 8 Haojin232
- SG_ ECU_Warning_Lamp : 63|1@0+ (1,0) [0|1] "" Vector__XXX
-
-BO_ 1025 CAN_0x401: 8 Haojin232
- SG_ ECU_Battery_Voltage : 23|8@0+ (0.1,0) [0|255] "" Vector__XXX
-
-BO_ 257 CAN_0x101: 3 Haojin232
- SG_ ECU_Vehicle_Speed : 23|8@0+ (1,0) [0|255] "" Vector__XXX
- SG_ ECU_Engine_Speed : 7|16@0+ (0.25,0) [0|65535] "" Vector__XXX
-
-
-
-BA_DEF_  "BusType" STRING ;
-BA_DEF_ BU_  "NodeLayerModules" STRING ;
-BA_DEF_ BU_  "ECU" STRING ;
-BA_DEF_ BU_  "CANoeJitterMax" INT 0 0;
-BA_DEF_ BU_  "CANoeJitterMin" INT 0 0;
-BA_DEF_ BU_  "CANoeDrift" INT 0 0;
-BA_DEF_ BU_  "CANoeStartDelay" INT 0 0;
-BA_DEF_DEF_  "BusType" "";
-BA_DEF_DEF_  "NodeLayerModules" "";
-BA_DEF_DEF_  "ECU" "";
-BA_DEF_DEF_  "CANoeJitterMax" 0;
-BA_DEF_DEF_  "CANoeJitterMin" 0;
-BA_DEF_DEF_  "CANoeDrift" 0;
-BA_DEF_DEF_  "CANoeStartDelay" 0;
-VAL_ 1280 Key_ISTOP 1 "Enable" 0 "Unenable" ;
-VAL_ 1026 ECU_Warning_Lamp 1 "ON" 0 "OFF" ;
-

Firmware/utility/Can_BDF/tianying.dbc

+VERSION ""
+
+
+NS_ : 
+	NS_DESC_
+	CM_
+	BA_DEF_
+	BA_
+	VAL_
+	CAT_DEF_
+	CAT_
+	FILTER
+	BA_DEF_DEF_
+	EV_DATA_
+	ENVVAR_DATA_
+	SGTYPE_
+	SGTYPE_VAL_
+	BA_DEF_SGTYPE_
+	BA_SGTYPE_
+	SIG_TYPE_REF_
+	VAL_TABLE_
+	SIG_GROUP_
+	SIG_VALTYPE_
+	SIGTYPE_VALTYPE_
+	BO_TX_BU_
+	BA_DEF_REL_
+	BA_REL_
+	BA_DEF_DEF_REL_
+	BU_SG_REL_
+	BU_EV_REL_
+	BU_BO_REL_
+	SG_MUL_VAL_
+
+BS_:
+
+BU_:
+
+
+BO_ 3221225472 VECTOR__INDEPENDENT_SIG_MSG: 0 Vector__XXX
+ SG_ ECU_Altitude : 0|8@0+ (50,0) [0|12750] "" Vector__XXX
+
+BO_ 1026 CAN_0x402: 8 Vector__XXX
+ SG_ ECU_Warning_Lamp : 56|1@1+ (1,0) [0|1] "" Vector__XXX
+ SG_ ECU_DTCL2 : 55|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCM2 : 47|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCH2 : 39|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCAmnt : 31|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCL1 : 23|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCM1 : 15|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_DTCH1 : 7|8@0+ (1,0) [0|255] "" Vector__XXX
+
+BO_ 833 CAN_0x341: 8 Vector__XXX
+ SG_ software_version : 63|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ Rear_LearningStatus : 41|2@0+ (1,0) [0|3] "" Vector__XXX
+ SG_ Front_LearningStatus : 39|2@0+ (1,0) [0|3] "" Vector__XXX
+ SG_ Rear_Pressure_Warning : 37|3@0+ (1,0) [0|7] "" Vector__XXX
+ SG_ Front_Pressure_Warning : 34|3@0+ (1,0) [0|7] "" Vector__XXX
+ SG_ Rear_TireTemperature : 31|8@0+ (1,-40) [-40|215] "" Vector__XXX
+ SG_ Front_TireTemperature : 23|8@0+ (1,-40) [-40|215] "" Vector__XXX
+ SG_ Rear_Pressure : 15|8@0+ (2.75,0) [0|701.25] "" Vector__XXX
+ SG_ Front_Pressure : 7|8@0+ (2.75,0) [0|701.25] "" Vector__XXX
+
+BO_ 273 CAN_0x111: 8 Vector__XXX
+ SG_ ISG_SideStand_State : 40|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_SideStand : 32|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Engine_InjIgn_Cutoff_State : 16|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Engine_InjIgn_Cutoff : 0|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Engine_Autostop_State : 24|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_Engine_Autostop : 8|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ ISG_111_Livecounter : 51|4@0+ (1,0) [0|15] "" Vector__XXX
+ SG_ ISG_111_Checksum : 63|8@0+ (1,0) [0|255] "" Vector__XXX
+
+BO_ 1025 CAN_0x401: 8 Vector__XXX
+ SG_ ECU_401_Checksum : 63|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_401_Livecounter : 51|4@0+ (1,0) [0|15] "" Vector__XXX
+ SG_ ECU_Gear_State : 43|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_Fuel_Consumption : 31|16@0+ (0.001,0) [0|65.535] "" Vector__XXX
+ SG_ ECU_Battery_Voltage : 23|8@0+ (0.1,0) [0|25.5] "" Vector__XXX
+ SG_ ECU_Environment_Presure : 7|16@0+ (0.039,0) [0|2555.865] "" Vector__XXX
+
+BO_ 544 CAN_0x220: 8 Vector__XXX
+ SG_ CheckSum : 60|5@0+ (1,0) [0|31] "" Vector__XXX
+ SG_ AliveCounter : 63|3@0+ (1,0) [0|7] "" Vector__XXX
+ SG_ TCS_Switch : 3|1@0+ (1,0) [0|1] "" Vector__XXX
+
+BO_ 288 CAN_0x120: 8 Vector__XXX
+ SG_ TCSStatus : 6|3@0+ (1,0) [0|7] "" Vector__XXX
+ SG_ RearWheelSpeedValidity : 49|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ RearWheelSpeed : 39|16@0+ (0.01,0) [0|655.35] "" Vector__XXX
+ SG_ Rear_ABS_control_status : 53|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ FrontWheelSpeedValidity : 48|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ FrontWheelSpeed : 23|16@0+ (0.01,0) [0|655.35] "" Vector__XXX
+ SG_ Front_ABS_control_status : 52|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ CheckSum : 60|5@0+ (1,0) [0|31] "" Vector__XXX
+ SG_ AliveCounter : 63|3@0+ (1,0) [0|7] "" Vector__XXX
+ SG_ ABS_Warning_lamp : 51|2@0+ (1,0) [0|3] "" Vector__XXX
+
+BO_ 257 CAN_0x101: 8 Vector__XXX
+ SG_ ECU_Vehicle_Speed_State : 53|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ ECU_Vehicle_Speed : 23|8@0+ (1,0) [0|255] "" Vector__XXX
+ SG_ ECU_Throttle_Position_State : 54|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ ECU_Throttle_Position : 31|8@0+ (0.392,0) [0|99.96] "" Vector__XXX
+ SG_ ECU_Engine_Temperature_State : 55|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ ECU_Engine_Temperature : 39|16@0+ (0.1,-273) [-273|6280.5] "" Vector__XXX
+ SG_ ECU_Engine_Speed_State : 52|1@0+ (1,0) [0|1] "" Vector__XXX
+ SG_ ECU_Engine_Speed : 7|16@0+ (0.25,0) [0|16383.75] "" Vector__XXX
+ SG_ ECU_101_Livecounter : 51|4@0+ (1,0) [0|15] "" Vector__XXX
+ SG_ ECU_101_Checksum : 63|8@0+ (1,0) [0|255] "" Vector__XXX
+
+
+
+CM_ BO_ 3221225472 "This is a message for not used signals, created by Vector CANdb++ DBC OLE DB Provider.";
+BA_DEF_  "BusType" STRING ;
+BA_DEF_ BU_  "NodeLayerModules" STRING ;
+BA_DEF_ BU_  "ECU" STRING ;
+BA_DEF_ BU_  "CANoeJitterMax" INT 0 0;
+BA_DEF_ BU_  "CANoeJitterMin" INT 0 0;
+BA_DEF_ BU_  "CANoeDrift" INT 0 0;
+BA_DEF_ BU_  "CANoeStartDelay" INT 0 0;
+BA_DEF_DEF_  "BusType" "";
+BA_DEF_DEF_  "NodeLayerModules" "";
+BA_DEF_DEF_  "ECU" "";
+BA_DEF_DEF_  "CANoeJitterMax" 0;
+BA_DEF_DEF_  "CANoeJitterMin" 0;
+BA_DEF_DEF_  "CANoeDrift" 0;
+BA_DEF_DEF_  "CANoeStartDelay" 0;
+

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

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

Firmware/utility/诊断工具/Option/BackStack.json

-[
-  "31 01 02 03",
-  "31 01 02 03",
-  "34",
-  "34",
-  "14",
-  "14 FF FF FF",
-  "31 01 02 03",
-  "31 01 02 03",
-  "31 01 02 03",
-  "31 01 02 03",
-  "22 F1 F1",
-  "22 F1 F1"
-]
\ No newline at end of file

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

-#new Option
-#Fri Apr 12 15:33:42 CST 2024
-IsSort=true
-MergeFlashIsCompression=false
-ChangeAppFilePath=
-MergeCanXLSPath=
-RH850_D1M1AGPIOJSONpath=
-DBFFilePath=
-MergeCrcTtpe=21
-MergeBootFilePath=D\:\\Desktop\\haojin232\\Firmware\\utility\\Boot_Release\\HaoJin_HJYB-5_Boot_BV1.01_20240320.hex
-IsMergeChangeAddress=false
-MergeFlashOutPutFilePath=
-GPIOOutPutPath=
-MergeCanDBCPath=
-IsFilling=true
-RxID=789
-MergeAudioInPutPath=
-MergeAudioIndex=3
-IsFastSend=true
-MergeBinFilePath=
-MsgMaxBc=0
-UDS_22_2E_DID_FilePath=
-SoftwareVersion=0
-MsgSTmin=0
-MergeLineInOutPutPath=
-Leave2ID=1
-PHYID=781
-BaudRate=500K
-AppUpdateFilePath=
-FUNID=7DF
-IsMergeCreateBin=false
-IsOverWrite=false
-DllFilePath=D\:\\Desktop\\haojin232\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\\u89E3\u9501\u6587\u4EF6\\HJ232 x64.dll
-MergeAudioOutPutPath=
-MergeCanOutPutPath=
-ChangeOutPutFilePath=
-MergeTelltalesOutPutPath=
-TTFExtractTXTpath=
-JieFaRH850GPIOJSONpath=
-MergeFlashIsMandatory=false
-UpdateProcess=\u6BD4\u4E9A\u8FEA
-Driver=Kvaser
-MergeFlashImageFormat=
-RH850_F1KMGPIOJSONpath=
-DriverFilePath=D\:\\Desktop\\haojin232\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\FlashDriver\\R5_FlashDriver.srec
-IsMergeCreateHex=false
-MergeFlashIsCreateREC=false
-TTFExtractTTFpath=
-MergeImageFilePath=
-IsMergeCreateUpdateBin=false
-MergeImageSize=64M
-CRCFilePath=
-MergeFlashCompressionFormat=
-IsPlayMusic=false
-IsHexDisplay=true
-MergeLineInXLSPath=
-MergeFlashInPutFilePath=
-MergeFlashIsInternal=false
-MergeOutPutFilePath=
-MergeAppFilePath=
-MergeTelltalesXLSPath=
-FillingByte=-86
-ImageVersion=0
-XHYGPIOJSONpath=
-Leave1ID=1
-TTFExtractOUTpath=
-MergeAudioPWMMax=2000

Firmware/utility/诊断工具/jre/conf/net.properties

-############################################################
-#       Default Networking Configuration File
-#
-# This file may contain default values for the networking system properties.
-# These values are only used when the system properties are not specified
-# on the command line or set programmatically.
-# For now, only the various proxy settings can be configured here.
-############################################################
-
-# Whether or not the DefaultProxySelector will default to System Proxy
-# settings when they do exist.
-# Set it to 'true' to enable this feature and check for platform
-# specific proxy settings
-# Note that the system properties that do explicitly set proxies
-# (like http.proxyHost) do take precedence over the system settings
-# even if java.net.useSystemProxies is set to true.
-
-java.net.useSystemProxies=false
-
-#------------------------------------------------------------------------
-# Proxy configuration for the various protocol handlers.
-# DO NOT uncomment these lines if you have set java.net.useSystemProxies
-# to true as the protocol specific properties will take precedence over
-# system settings.
-#------------------------------------------------------------------------
-
-# HTTP Proxy settings. proxyHost is the name of the proxy server
-# (e.g. proxy.mydomain.com), proxyPort is the port number to use (default
-# value is 80) and nonProxyHosts is a '|' separated list of hostnames which
-# should be accessed directly, ignoring the proxy server (default value is
-# localhost & 127.0.0.1).
-#
-# http.proxyHost=
-# http.proxyPort=80
-http.nonProxyHosts=localhost|127.*|[::1]
-#
-# HTTPS Proxy Settings. proxyHost is the name of the proxy server
-# (e.g. proxy.mydomain.com), proxyPort is the port number to use (default
-# value is 443). The HTTPS protocol handlers uses the http nonProxyHosts list.
-#
-# https.proxyHost=
-# https.proxyPort=443
-#
-# FTP Proxy settings. proxyHost is the name of the proxy server
-# (e.g. proxy.mydomain.com), proxyPort is the port number to use (default
-# value is 80) and nonProxyHosts is a '|' separated list of hostnames which
-# should be accessed directly, ignoring the proxy server (default value is
-# localhost & 127.0.0.1).
-#
-# ftp.proxyHost=
-# ftp.proxyPort=80
-ftp.nonProxyHosts=localhost|127.*|[::1]
-#
-# Gopher Proxy settings. proxyHost is the name of the proxy server
-# (e.g. proxy.mydomain.com), proxyPort is the port number to use (default
-# value is 80)
-#
-# gopher.proxyHost=
-# gopher.proxyPort=80
-#
-# Socks proxy settings. socksProxyHost is the name of the proxy server
-# (e.g. socks.domain.com), socksProxyPort is the port number to use
-# (default value is 1080)
-#
-# socksProxyHost=
-# socksProxyPort=1080
-#
-# HTTP Keep Alive settings. remainingData is the maximum amount of data
-# in kilobytes that will be cleaned off the underlying socket so that it
-# can be reused (default value is 512K), queuedConnections is the maximum
-# number of Keep Alive connections to be on the queue for clean up (default
-# value is 10).
-# http.KeepAlive.remainingData=512
-# http.KeepAlive.queuedConnections=10
-
-# Authentication Scheme restrictions for HTTP and HTTPS.
-#
-# In some environments certain authentication schemes may be undesirable
-# when proxying HTTP or HTTPS.  For example, "Basic" results in effectively the
-# cleartext transmission of the user's password over the physical network.
-# This section describes the mechanism for disabling authentication schemes
-# based on the scheme name. Disabled schemes will be treated as if they are not
-# supported by the implementation.
-#
-# The 'jdk.http.auth.tunneling.disabledSchemes' property lists the authentication
-# schemes that will be disabled when tunneling HTTPS over a proxy, HTTP CONNECT.
-# The 'jdk.http.auth.proxying.disabledSchemes' property lists the authentication
-# schemes that will be disabled when proxying HTTP.
-#
-# In both cases the property is a comma-separated list of, case-insensitive,
-# authentication scheme names, as defined by their relevant RFCs. An
-# implementation may, but is not required to, support common schemes whose names
-# include: 'Basic', 'Digest', 'NTLM', 'Kerberos', 'Negotiate'.  A scheme that
-# is not known, or not supported, by the implementation is ignored.
-#
-# Note: This property is currently used by the JDK Reference implementation. It
-# is not guaranteed to be examined and used by other implementations.
-#
-#jdk.http.auth.proxying.disabledSchemes=
-jdk.http.auth.tunneling.disabledSchemes=Basic
-
-#
-# Transparent NTLM HTTP authentication mode on Windows. Transparent authentication
-# can be used for the NTLM scheme, where the security credentials based on the
-# currently logged in user's name and password can be obtained directly from the
-# operating system, without prompting the user. This property has three possible
-# values which regulate the behavior as shown below. Other unrecognized values
-# are handled the same as 'disabled'. Note, that NTLM is not considered to be a
-# strongly secure authentication scheme and care should be taken before enabling
-# this mechanism.
-#
-# Transparent authentication never used.
-#jdk.http.ntlm.transparentAuth=disabled
-#
-# Enabled for all hosts.
-#jdk.http.ntlm.transparentAuth=allHosts
-#
-# Enabled for hosts that are trusted in Windows Internet settings
-#jdk.http.ntlm.transparentAuth=trustedHosts
-#
-jdk.http.ntlm.transparentAuth=disabled

Firmware/utility/诊断工具/jre/conf/security/java.policy

-//
-// This system policy file grants a set of default permissions to all domains
-// and can be configured to grant additional permissions to modules and other
-// code sources. The code source URL scheme for modules linked into a
-// run-time image is "jrt".
-//
-// For example, to grant permission to read the "foo" property to the module
-// "com.greetings", the grant entry is:
-//
-// grant codeBase "jrt:/com.greetings" {
-//     permission java.util.PropertyPermission "foo", "read";
-// };
-//
-
-// default permissions granted to all domains
-grant {
-    // allows anyone to listen on dynamic ports
-    permission java.net.SocketPermission "localhost:0", "listen";
-
-    // "standard" properies that can be read by anyone
-    permission java.util.PropertyPermission "java.version", "read";
-    permission java.util.PropertyPermission "java.vendor", "read";
-    permission java.util.PropertyPermission "java.vendor.url", "read";
-    permission java.util.PropertyPermission "java.class.version", "read";
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "os.version", "read";
-    permission java.util.PropertyPermission "os.arch", "read";
-    permission java.util.PropertyPermission "file.separator", "read";
-    permission java.util.PropertyPermission "path.separator", "read";
-    permission java.util.PropertyPermission "line.separator", "read";
-    permission java.util.PropertyPermission
-                   "java.specification.version", "read";
-    permission java.util.PropertyPermission "java.specification.vendor", "read";
-    permission java.util.PropertyPermission "java.specification.name", "read";
-    permission java.util.PropertyPermission
-                   "java.vm.specification.version", "read";
-    permission java.util.PropertyPermission
-                   "java.vm.specification.vendor", "read";
-    permission java.util.PropertyPermission
-                   "java.vm.specification.name", "read";
-    permission java.util.PropertyPermission "java.vm.version", "read";
-    permission java.util.PropertyPermission "java.vm.vendor", "read";
-    permission java.util.PropertyPermission "java.vm.name", "read";
-};

Firmware/utility/诊断工具/jre/conf/security/policy/README.txt

-
-            Java(TM) Cryptography Extension Policy Files
-    for the Java(TM) Platform, Standard Edition Runtime Environment
-
-                               README
-------------------------------------------------------------------------
-
-Import and export control rules on cryptographic software vary from
-country to country.  The Java Cryptography Extension (JCE) architecture
-allows flexible cryptographic key strength to be configured via the
-jurisdiction policy files which are referenced by the "crypto.policy"
-security property in the <java-home>/conf/security/java.security file.
-
-By default, Java provides two different sets of cryptographic policy
-files:
-
-    unlimited:  These policy files contain no restrictions on cryptographic
-                strengths or algorithms
-
-    limited:    These policy files contain more restricted cryptographic
-                strengths
-
-These files reside in <java-home>/conf/security/policy in the "unlimited"
-or "limited" subdirectories respectively.
-
-Each subdirectory contains a complete policy configuration,
-and subdirectories can be added/edited/removed to reflect your
-import or export control product requirements.
-
-Within a subdirectory, the effective policy is the combined minimum
-permissions of the grant statements in the file(s) matching the filename
-pattern "default_*.policy".  At least one grant is required.  For example:
-
-    limited   =  Export (all) + Import (limited)  =  Limited
-    unlimited =  Export (all) + Import (all)      =  Unlimited
-
-The effective exemption policy is the combined minimum permissions
-of the grant statements in the file(s) matching the filename pattern
-"exempt_*.policy".  Exemption grants are optional.  For example:
-
-    limited   =  grants exemption permissions, by which the
-                 effective policy can be circumvented.
-                 e.g.  KeyRecovery/KeyEscrow/KeyWeakening.
-
-Please see the Java Cryptography Architecture (JCA) documentation for
-additional information on these files and formats.
-
-YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY
-TO DETERMINE THE EXACT REQUIREMENTS.
-
-Please note that the JCE for Java SE, including the JCE framework,
-cryptographic policy files, and standard JCE providers provided with
-the Java SE, have been reviewed and approved for export as mass market
-encryption item by the US Bureau of Industry and Security.

Firmware/utility/诊断工具/jre/conf/security/policy/limited/default_US_export.policy

-// Default US Export policy file.
-
-grant {
-    // There is no restriction to any algorithms.
-    permission javax.crypto.CryptoAllPermission; 
-};