huahua/P417_SWTL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复部分信号不会发3的问题

Browse Source
This commit is contained in:
sunbeam 2024-11-25 10:11:58 +08:00
parent 690ed35ab4
commit 67a20eefe4
6 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/p417_SWTL.X/nbproject/Makefile-genesis.properties
View File

@ -1,10 +1,10 @@
#
#Sat Oct 19 09:22:34 CST 2024
#Fri Nov 01 13:47:44 CST 2024
mcal.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=1eaf555a844840d91945cb14109201c3
conf.ids=mcal
mcal.languagetoolchain.version=4.10
host.id=124p-5vo2-40
configurations-xml=7a043e46d7f93d763f97fd2108601ccb
configurations-xml=82d12c4bf5f229226e945ddd8fae0eb3
mcal.Pack.dfplocation=E\:\\Program Files\\Microchip\\MPLABX\\v6.20\\packs\\Microchip\\SAME51_DFP\\3.7.242
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=f612087c95360c842296d189edfe3321
proj.dir=F\:\\FCB_project\\P417\\CODE\\20240727HW06\\P417_SWTL\\firmware\\p417_SWTL.X

2
firmware/p417_SWTL.X/nbproject/configurations.xml
View File

@ -493,7 +493,7 @@
<targetPluginBoard></targetPluginBoard>
<platformTool>noID</platformTool>
<languageToolchain>XC32</languageToolchain>
<languageToolchainVersion>4.40</languageToolchainVersion>
<languageToolchainVersion>4.10</languageToolchainVersion>
<platform>3</platform>
</toolsSet>
<packs>

2
firmware/p417_SWTL.X/nbproject/private/configurations.xml
View File

@ -5,7 +5,7 @@
<confs>
<conf name="mcal" type="2">
<platformToolSN>noToolString</platformToolSN>
<languageToolchainDir>C:\Program Files\Microchip\xc32\v4.40\bin</languageToolchainDir>
<languageToolchainDir>E:\Program Files\Microchip\xc32\v4.10\bin</languageToolchainDir>
<mdbdebugger version="1">
<placeholder1>place holder 1</placeholder1>
<placeholder2>place holder 2</placeholder2>

6
firmware/p417_SWTL.X/nbproject/private/private.xml
View File

@ -3,10 +3,10 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/RTE/RTE.c</file>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/FunctionState/FunctionState.c</file>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/main.c</file>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/TouchPanel/TouchPanel.c</file>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/RTE/RTE.c</file>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/main.c</file>
<file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/FunctionState/FunctionState.c</file>
</group>
</open-files>
</project-private>

4
firmware/src/DiagnosticL/Sys_Diag_Detect/SysDiagDetect.c
View File

@ -115,7 +115,7 @@ static void Touch_Sensor_Diag_Task(void)
//取消
if (Touch_Sensor_delta02 < 200 && Touch_Sensor_delta15 < 200)
{
Touch_Sensor_Fault_key2 = Touch_NoFault;
Touch_Sensor_Fault_key3 = Touch_NoFault;
fault_countk3 = 0;
}
else
@ -125,7 +125,7 @@ static void Touch_Sensor_Diag_Task(void)
{
fault_countk3 = 40;
}
Touch_Sensor_Fault_key2 = Touch_Out_Range;
Touch_Sensor_Fault_key3 = Touch_Out_Range;
}
//PAD
if (Touch_Sensor_delta03 < 300 && Touch_Sensor_delta04 < 300 && Touch_Sensor_delta05 < 300 && Touch_Sensor_delta06 < 300 && Touch_Sensor_delta07 < 300

33
firmware/src/RTE/RTE.c
View File

@ -1025,7 +1025,10 @@ void RTE_Set_CAN_LeMFctActSgCe(uint8_t Value)
{
Value = 0;
}
if (Touch_Sensor_Fault_pad != Touch_NoFault)
{
Value = 0x03;
}
InitMessage(SIG_LEMFCTACTSGCE, &Value);
}
@ -1036,6 +1039,10 @@ void RTE_Set_CAN_LeMFctActSgDn(uint8_t Value)
{
Value = 0;
}
if (Touch_Sensor_Fault_pad != Touch_NoFault)
{
Value = 0x03;
}
InitMessage(SIG_LEMFCTACTSGDN, &Value);
}
@ -1045,6 +1052,10 @@ void RTE_Set_CAN_LeMFctActSgLe(uint8_t Value)
{
Value = 0;
}
if (Touch_Sensor_Fault_pad != Touch_NoFault)
{
Value = 0x03;
}
InitMessage(SIG_LEMFCTACTSGLE, &Value);
}
@ -1054,6 +1065,10 @@ void RTE_Set_CAN_LeMFctActSgRi(uint8_t Value)
{
Value = 0;
}
if (Touch_Sensor_Fault_pad != Touch_NoFault)
{
Value = 0x03;
}
InitMessage(SIG_LEMFCTACTSGRI, &Value);
}
@ -1063,6 +1078,10 @@ void RTE_Set_CAN_LeMFctActSgUp(uint8_t Value)
{
Value = 0;
}
if (Touch_Sensor_Fault_pad != Touch_NoFault)
{
Value = 0x03;
}
InitMessage(SIG_LEMFCTACTSGUP, &Value);
}
@ -1074,7 +1093,7 @@ void RTE_Set_CAN_SteerWhlTouchBdADAS(uint8_t Value)
{
Value = 0;
}
if (Value != 0 && Touch_Sensor_Fault_key2 != Touch_NoFault)
if (Touch_Sensor_Fault_key2 != Touch_NoFault)
{
Value = 0x03;
}
@ -1139,7 +1158,7 @@ void RTE_Set_CAN_SteerWhlTouchBdCnclSteerWhlTouchBdSts(uint8_t Value)
{
Value = 0;
}
if (Value != 0 && Touch_Sensor_Fault_key3 != Touch_NoFault)
if (Touch_Sensor_Fault_key3 != Touch_NoFault)
{
Value = 0x03;
}
@ -1164,7 +1183,7 @@ void RTE_Set_CAN_SteerWhlTouchBdCrsResuSteerWhlTouchBdSts(uint8_t Value)
{
Value = 0;
}
if (Value != 0 && Touch_Sensor_Fault_key1 != Touch_NoFault)
if (Touch_Sensor_Fault_key1 != Touch_NoFault)
{
Value = 0x00;
}
@ -1190,7 +1209,7 @@ void RTE_Set_CAN_SteerWhlTouchBdLeSteerWhlTouchBdSts(uint8_t Value)
{
Value = 0;
}
if (Value != 0 && Touch_Sensor_Fault_pad != Touch_NoFault)
if (Touch_Sensor_Fault_pad != Touch_NoFault)
{
Value = 0x03;
}
@ -1352,8 +1371,8 @@ const uint16_t max_on_time_arr[16] = {
const uint16_t low_baseline_reset_arr[16] = {
// 0 1 2 3 4 5 6 7
40,40,40,40,40,40,40,40,
40,40,40,40,40,40,40,40,
59,59,52,62,60,62,64,60,
56,59,57,59,59,54,58,52,
};
#if 1
void RTE_Set_All_Test_Value(void)