Skip to content

H
haoJin750TFT
Commit 80ad8fd8 authored by 张金硕's avatar 张金硕
Browse files
Options

Merge branch 'zhengping' into 'dev' 

Zhengping

See merge request !71
parents 1f470d3a bf24c047
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 57 deletions
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx
View file @ 80ad8fd8
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
</OCR_RVCT3> </OCR_RVCT3>
<OCR_RVCT4> <OCR_RVCT4>
<Type>1</Type> <Type>1</Type>
<StartAddress>0xc400</StartAddress> <StartAddress>0x0</StartAddress>
<Size>0x73c00</Size> <Size>0x73c00</Size>
</OCR_RVCT4> </OCR_RVCT4>
<OCR_RVCT5> <OCR_RVCT5>
...@@ -978,11 +978,6 @@ ...@@ -978,11 +978,6 @@
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath> <FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath>
</File> </File>
<File>
<FileName>kei_S1.0.6_20240827.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\kei_S1.0.6_20240827.lib</FilePath>
</File>
<File> <File>
<FileName>UartProtocol.h</FileName> <FileName>UartProtocol.h</FileName>
<FileType>5</FileType> <FileType>5</FileType>
...@@ -1018,6 +1013,16 @@ ...@@ -1018,6 +1013,16 @@
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.h</FilePath> <FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.h</FilePath>
</File> </File>
<File>
<FileName>System_Monitor.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor.lib</FilePath>
</File>
<File>
<FileName>kei_S1.0.6_20240827.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\kei_S1.0.6_20240827.lib</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
......
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Objects/HaoJin750TFT.sct
View file @ 80ad8fd8
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
; *** Scatter-Loading Description File generated by uVision *** ; *** Scatter-Loading Description File generated by uVision ***
; ************************************************************* ; *************************************************************
LR_IROM1 0x0000C400 0x00073C00 { ; load region size_region LR_IROM1 0x00000000 0x00073C00 { ; load region size_region
ER_IROM1 0x0000C400 0x00073C00 { ; load address = execution address ER_IROM1 0x00000000 0x00073C00 { ; load address = execution address
*.o (RESET, +First) *.o (RESET, +First)
*(InRoot$$Sections) *(InRoot$$Sections)
.ANY (+RO) .ANY (+RO)
......
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h
View file @ 80ad8fd8
...@@ -20,7 +20,7 @@ User definitions ...@@ -20,7 +20,7 @@ User definitions
typedef unsigned short MD_STATUS; typedef unsigned short MD_STATUS;
#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0 #define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
#define APP_BASE (0x0000C400ul) #define APP_BASE (0x0000C400ul)
/* Status list definition */ /* Status list definition */
......
Firmware/Source/Application/Data_ESpeed.c
View file @ 80ad8fd8
...@@ -289,26 +289,26 @@ void Data_Engine_Speed_Processing_Service ( void ) ...@@ -289,26 +289,26 @@ void Data_Engine_Speed_Processing_Service ( void )
} }
} }
DataESpeedDisp = DataESPeedDamping.Speed; DataESpeedDisp = DataESPeedDamping.Speed;
// //第4步 增加回差 //第4步 增加回差
// if (DataESpeedDisp <= 80) if (DataESpeedDisp <= 80)
// { {
// DataESpeedDisp = DataESPeedDamping.Speed; DataESpeedDisp = DataESPeedDamping.Speed;
// } }
// else else
// { {
// if ( DataESpeedDisp < DataESPeedDamping.Speed ) if ( DataESpeedDisp < DataESPeedDamping.Speed )
// { {
// DataESpeedDisp = DataESPeedDamping.Speed; DataESpeedDisp = DataESPeedDamping.Speed;
// } }
// else else
// { {
// Delta = DataESpeedDisp - DataESPeedDamping.Speed; Delta = DataESpeedDisp - DataESPeedDamping.Speed;
// if ( Delta >= DATA_ESPEED_HYSTERESIS ) if ( Delta >= DATA_ESPEED_HYSTERESIS )
// { {
// DataESpeedDisp = DataESPeedDamping.Speed; DataESpeedDisp = DataESPeedDamping.Speed;
// } }
// } }
// } }
} }
uint8_t Get_EngineValid(void) uint8_t Get_EngineValid(void)
......
Firmware/Source/Application/Data_VSpeed.c
View file @ 80ad8fd8
...@@ -321,12 +321,22 @@ void Data_Vehicle_Speed_Processing_Service(void) ...@@ -321,12 +321,22 @@ void Data_Vehicle_Speed_Processing_Service(void)
} }
// 第3步：生成显示车速 // 第3步：生成显示车速
DataVSpeedHysteresis = DataVSPeedDamping.Speed; if ((DataVSPeedDamping.Speed >= DataVSpeedHysteresis) || (DataVSPeedDamping.Speed < DATA_VSPEED_HYSTERESIS))
{
DataVSpeedHysteresis = DataVSPeedDamping.Speed;
}
else
{
if (DataVSpeedHysteresis - DataVSPeedDamping.Speed >= DATA_VSPEED_HYSTERESIS)
{
DataVSpeedHysteresis = DataVSPeedDamping.Speed;
}
}
VSpeedCal = ( uint32_t )DataVSpeedHysteresis; VSpeedCal = ( uint32_t )DataVSpeedHysteresis;
if ( DataVSpeedValid ) // if ( DataVSpeedValid )
{ // {
VSpeedCal *= 105; VSpeedCal *= 105;
VSpeedCal /= 100; VSpeedCal /= 100;
// if((VSpeedCal % 10) >= 5) // if((VSpeedCal % 10) >= 5)
...@@ -334,11 +344,11 @@ void Data_Vehicle_Speed_Processing_Service(void) ...@@ -334,11 +344,11 @@ void Data_Vehicle_Speed_Processing_Service(void)
// VSpeedCal += 5; /* 四舍五入 */ // VSpeedCal += 5; /* 四舍五入 */
// } // }
DataVSpeedDisp = ( uint16_t )VSpeedCal; DataVSpeedDisp = ( uint16_t )VSpeedCal;
} // }
else // else
{ // {
DataVSpeedDisp = 0; // DataVSpeedDisp = 0;
} // }
} }
/*车速有效位：有效=1，无效=0*/ /*车速有效位：有效=1，无效=0*/
......
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ 80ad8fd8
...@@ -4207,33 +4207,19 @@ void AMT630H_GUI_BACKGRAND() ...@@ -4207,33 +4207,19 @@ void AMT630H_GUI_BACKGRAND()
{ {
AMT630H_GUI_Trip(Get_Trip_Value(), Get_Dis_Unit()); AMT630H_GUI_Trip(Get_Trip_Value(), Get_Dis_Unit());
} }
if(0) if(VechileSpeed_time < 4)
{ {
VechileSpeed_time++; VechileSpeed_time++;
} }
else else
{ {
VechileSpeed_time = 0; VechileSpeed_time = 0;
VechileSpeed = Get_DispVechileSpeed() / 10; VechileSpeed = Get_DispVechileSpeed() / 10;
} }
if (Get_VechileSpeedValid() == 1) AMT630H_GUI_VSpeed(VechileSpeed);
{
AMT630H_GUI_VSpeed(VechileSpeed);
}
else
{
AMT630H_GUI_VSpeed(0);
}
/*转速*/ /*转速*/
if (Get_EngineValid() == 1) AMT630H_GUI_ESpeed(Get_DispEngineSpeed());
{
AMT630H_GUI_ESpeed(Get_DispEngineSpeed());
}
else
{
AMT630H_GUI_ESpeed(0);
}
} }
......
Firmware/Source/Component/Key/Key_user.c
View file @ 80ad8fd8
...@@ -147,7 +147,7 @@ void Key_KL30_Init_EXample(void) ...@@ -147,7 +147,7 @@ void Key_KL30_Init_EXample(void)
Key_Parameter_Set_Short_Press_1_Time(50U,2000U); Key_Parameter_Set_Short_Press_1_Time(50U,2000U);
Key_Parameter_Set_Short_Press_2_Time(3000U,6000U); Key_Parameter_Set_Short_Press_2_Time(3000U,6000U);
Key_Parameter_Set_Long_Press_1_Time(7000U); Key_Parameter_Set_Long_Press_1_Time(2000U);
Key_Parameter_Set_Long_Press_2_Time(8000U); Key_Parameter_Set_Long_Press_2_Time(8000U);
Key_Parameter_Set_Long_Press_3_Time(9000U); Key_Parameter_Set_Long_Press_3_Time(9000U);
Key_Parameter_Set_Long_Press_4_Time(10000U); Key_Parameter_Set_Long_Press_4_Time(10000U);
...@@ -163,7 +163,7 @@ void Key_Wakeup_Init_EXample(void) ...@@ -163,7 +163,7 @@ void Key_Wakeup_Init_EXample(void)
Key_Parameter_Set_Short_Press_1_Time(50U,2000U); Key_Parameter_Set_Short_Press_1_Time(50U,2000U);
Key_Parameter_Set_Short_Press_2_Time(3000U,6000U); Key_Parameter_Set_Short_Press_2_Time(3000U,6000U);
Key_Parameter_Set_Long_Press_1_Time(7000U); Key_Parameter_Set_Long_Press_1_Time(2000U);
Key_Parameter_Set_Long_Press_2_Time(8000U); Key_Parameter_Set_Long_Press_2_Time(8000U);
Key_Parameter_Set_Long_Press_3_Time(9000U); Key_Parameter_Set_Long_Press_3_Time(9000U);
Key_Parameter_Set_Long_Press_4_Time(10000U); Key_Parameter_Set_Long_Press_4_Time(10000U);
......
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