Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
haoJin750TFT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
时昊
haoJin750TFT
Commits
e21755e6
Commit
e21755e6
authored
Aug 08, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:54709 【豪进750TFT】【车速数值刷新】车速数值刷新时间改为200ms并去掉车速转速的阻尼
parent
26e8ccac
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
9 deletions
+21
-9
HaoJin750TFT.uvprojx
.../Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx
+2
-2
HaoJin750TFT.sct
...ject/Cmsemicon/BAT32A279/MDK_ARM/Objects/HaoJin750TFT.sct
+4
-4
Data_ESpeed.h
Firmware/Source/Application/Data_ESpeed.h
+1
-1
Data_VSpeed.h
Firmware/Source/Application/Data_VSpeed.h
+1
-1
AMT630H_Datas.c
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+13
-1
No files found.
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx
View file @
e21755e6
...
@@ -275,7 +275,7 @@
...
@@ -275,7 +275,7 @@
</OCR_RVCT3>
</OCR_RVCT3>
<OCR_RVCT4>
<OCR_RVCT4>
<Type>
1
</Type>
<Type>
1
</Type>
<StartAddress>
0x
c40
0
</StartAddress>
<StartAddress>
0x0
</StartAddress>
<Size>
0x73c00
</Size>
<Size>
0x73c00
</Size>
</OCR_RVCT4>
</OCR_RVCT4>
<OCR_RVCT5>
<OCR_RVCT5>
...
@@ -361,7 +361,7 @@
...
@@ -361,7 +361,7 @@
</VariousControls>
</VariousControls>
</Aads>
</Aads>
<LDads>
<LDads>
<umfTarg>
0
</umfTarg>
<umfTarg>
1
</umfTarg>
<Ropi>
0
</Ropi>
<Ropi>
0
</Ropi>
<Rwpi>
0
</Rwpi>
<Rwpi>
0
</Rwpi>
<noStLib>
0
</noStLib>
<noStLib>
0
</noStLib>
...
...
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Objects/HaoJin750TFT.sct
View file @
e21755e6
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
; *** Scatter-Loading Description File generated by uVision ***
; *** Scatter-Loading Description File generated by uVision ***
; *************************************************************
; *************************************************************
LR_IROM1 0x0000
C4
00 0x00073C00 { ; load region size_region
LR_IROM1 0x0000
00
00 0x00073C00 { ; load region size_region
ER_IROM1 0x0000
C4
00 0x00073C00 { ; load address = execution address
ER_IROM1 0x0000
00
00 0x00073C00 { ; load address = execution address
*.o (RESET, +First)
*.o (RESET, +First)
*(InRoot$$Sections)
*(InRoot$$Sections)
.ANY (+RO)
.ANY (+RO)
...
@@ -12,8 +12,8 @@ LR_IROM1 0x0000C400 0x00073C00 { ; load region size_region
...
@@ -12,8 +12,8 @@ LR_IROM1 0x0000C400 0x00073C00 { ; load region size_region
RW_IRAM1 0x20000000 0x0000FF00 { ; RW data
RW_IRAM1 0x20000000 0x0000FF00 { ; RW data
.ANY (+RW +ZI)
.ANY (+RW +ZI)
}
}
RW_IRAM2 0x2000FF00 0x00000100 {
; RW data
RW_IRAM2 0x2000FF00 0x00000100 {
.ANY (
RW_FUNC_PLL
)
.ANY (
+RW +ZI
)
}
}
}
}
Firmware/Source/Application/Data_ESpeed.h
View file @
e21755e6
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#define DATA_ENGINE_RUNNING_THRESHOLD 400 //发动机运转阈值
#define DATA_ENGINE_RUNNING_THRESHOLD 400 //发动机运转阈值
#define DATA_ENGINE_STOP_THRESHOLD 300 //发动机停止阈值
#define DATA_ENGINE_STOP_THRESHOLD 300 //发动机停止阈值
#define DATA_ESPEED_DAMPING_FACTOR
4
//阻尼系数
#define DATA_ESPEED_DAMPING_FACTOR
1
//阻尼系数
#define DATA_ESPEED_INC_STEP 10 //速度增加时慢加速速度变化步长
#define DATA_ESPEED_INC_STEP 10 //速度增加时慢加速速度变化步长
#define DATA_ESPEED_DEC_STEP 20 //方向改变时急减速速度变化步长
#define DATA_ESPEED_DEC_STEP 20 //方向改变时急减速速度变化步长
#define DATA_ESPEED_APPR_SPEED_MIN 10 //最小逼近速度
#define DATA_ESPEED_APPR_SPEED_MIN 10 //最小逼近速度
...
...
Firmware/Source/Application/Data_VSpeed.h
View file @
e21755e6
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#define DATA_VEHICLE_RUNNING_THRESHOLD 25 //汽车行进阈值
#define DATA_VEHICLE_RUNNING_THRESHOLD 25 //汽车行进阈值
#define DATA_VEHICLE_STOP_THRESHOLD 20 //汽车停止阈值
#define DATA_VEHICLE_STOP_THRESHOLD 20 //汽车停止阈值
#define DATA_VSPEED_DAMPING_FACTOR
3
//阻尼系数
#define DATA_VSPEED_DAMPING_FACTOR
1
//阻尼系数
#define DATA_VSPEED_INC_STEP 2 //速度增加时慢加速速度变化步长
#define DATA_VSPEED_INC_STEP 2 //速度增加时慢加速速度变化步长
#define DATA_VSPEED_DEC_STEP 6 //方向改变时急减速速度变化步长
#define DATA_VSPEED_DEC_STEP 6 //方向改变时急减速速度变化步长
#define DATA_VSPEED_APPR_SPEED_MIN 2 //最小逼近速度
#define DATA_VSPEED_APPR_SPEED_MIN 2 //最小逼近速度
...
...
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @
e21755e6
...
@@ -3215,6 +3215,8 @@ static void AMT630H_GUI_ESpeed(uint16_t ESpeed)
...
@@ -3215,6 +3215,8 @@ static void AMT630H_GUI_ESpeed(uint16_t ESpeed)
* @brief 主界面显示
* @brief 主界面显示
*
*
*/
*/
uint8_t
VechileSpeed_time
=
0
;
uint8_t
VechileSpeed
=
0
;
void
AMT630H_GUI_BACKGRAND
()
void
AMT630H_GUI_BACKGRAND
()
{
{
/*背景图*/
/*背景图*/
...
@@ -3259,9 +3261,19 @@ void AMT630H_GUI_BACKGRAND()
...
@@ -3259,9 +3261,19 @@ void AMT630H_GUI_BACKGRAND()
}
}
AMT630H_GUI_Voltage
((
ADC_Read_Signal
(
ADC_CH_KL30_VOLTAGE
))
/
10
);
AMT630H_GUI_Voltage
((
ADC_Read_Signal
(
ADC_CH_KL30_VOLTAGE
))
/
10
);
AMT630H_GUI_ODO
(
Get_ODO_Value
()
/
10
,
0
);
AMT630H_GUI_ODO
(
Get_ODO_Value
()
/
10
,
0
);
if
(
VechileSpeed_time
<
4
)
{
VechileSpeed_time
++
;
}
else
{
VechileSpeed_time
=
0
;
VechileSpeed
=
Get_DispVechileSpeed
()
/
10
;
}
if
(
Get_VechileSpeedValid
()
==
1
)
if
(
Get_VechileSpeedValid
()
==
1
)
{
{
AMT630H_GUI_VSpeed
(
Get_DispVechileSpeed
()
/
10
);
AMT630H_GUI_VSpeed
(
VechileSpeed
);
}
}
else
else
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment