Commit 33ae57e5 authored by 高士达's avatar 高士达

Merge branch 'CJL' into 'dev'

Cjl

See merge request !112
parents d5d7fac7 799d20bf
...@@ -95,7 +95,7 @@ const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".AR ...@@ -95,7 +95,7 @@ const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".AR
// </e> // </e>
// </e> // </e>
// </h> // </h>
0xEF, 0x7C,//0xEF,
/** /**
* @brief LVD Control BYTE (C1H) * @brief LVD Control BYTE (C1H)
......
...@@ -574,7 +574,7 @@ uint16_t Get_Front_TPMS_Sig_Value (void) ...@@ -574,7 +574,7 @@ uint16_t Get_Front_TPMS_Sig_Value (void)
//else //else
{ {
//value = TPMS.Front_Press_Value + 50; //value = TPMS.Front_Press_Value + 50;
value = (uint16_t)((Relaying_Rear_Press_Value + 50) / 100); value = (uint16_t)((Relaying_Front_Press_Value + 50) / 100);
} }
return value; return value;
} }
......
...@@ -79,7 +79,7 @@ const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".AR ...@@ -79,7 +79,7 @@ const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".AR
// </e> // </e>
// </e> // </e>
// </h> // </h>
0xEF, 0x7C,
/** /**
* @brief LVD Control BYTE (C1H) * @brief LVD Control BYTE (C1H)
......
...@@ -79,7 +79,7 @@ const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".AR ...@@ -79,7 +79,7 @@ const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".AR
// </e> // </e>
// </e> // </e>
// </h> // </h>
0xEF, 0x7C,
/** /**
* @brief LVD Control BYTE (C1H) * @brief LVD Control BYTE (C1H)
...@@ -120,7 +120,7 @@ const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".AR ...@@ -120,7 +120,7 @@ const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".AR
// <0x72=> VLVDH = 4.06V/3.98V, VLVDL = 2.75V ( interrupt & reset mode ) // <0x72=> VLVDH = 4.06V/3.98V, VLVDL = 2.75V ( interrupt & reset mode )
// <i> Please setting the item for interrupt & reset mode // <i> Please setting the item for interrupt & reset mode
// </h> // </h>
0x3F, 0x72,
/** /**
* @brief HOCO Control BYTE (FRQSEL) * @brief HOCO Control BYTE (FRQSEL)
......
...@@ -312,13 +312,13 @@ ...@@ -312,13 +312,13 @@
#define CheckSumErr 7 // Checksum Error #define CheckSumErr 7 // Checksum Error
#define UnknownPartID 8 // Unknown Part ID #define UnknownPartID 8 // Unknown Part ID
#define SWV 0x125 // 0x100 = 1.00 software version 软件版本号 #define SWV 0x126 // 0x100 = 1.00 software version 软件版本号
#define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号 #define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
#define INTLV 0x125 // 0x100 = 1.00 internal version 内部版本号 #define INTLV 0x126 // 0x100 = 1.00 internal version 内部版本号
#define PROG_Y 0x24 // 0x24 = 2024年, program year #define PROG_Y 0x24 // 0x24 = 2024年, program year
#define PROG_M 0x10 // 0x03 = 3月, program month #define PROG_M 0x10 // 0x03 = 3月, program month
#define PROG_D 0x08 // 0x19 = 19日, program day #define PROG_D 0x09 // 0x19 = 19日, program day
/****************************************************************************** /******************************************************************************
Bootloader Variable Bootloader Variable
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment