diff --git a/firmware/p417_SWTL.X/nbproject/Makefile-genesis.properties b/firmware/p417_SWTL.X/nbproject/Makefile-genesis.properties
index 0d6fa34..60abaa7 100644
--- a/firmware/p417_SWTL.X/nbproject/Makefile-genesis.properties
+++ b/firmware/p417_SWTL.X/nbproject/Makefile-genesis.properties
@@ -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
diff --git a/firmware/p417_SWTL.X/nbproject/configurations.xml b/firmware/p417_SWTL.X/nbproject/configurations.xml
index 352eb83..7685992 100644
--- a/firmware/p417_SWTL.X/nbproject/configurations.xml
+++ b/firmware/p417_SWTL.X/nbproject/configurations.xml
@@ -493,7 +493,7 @@
noID
XC32
- 4.40
+ 4.10
3
diff --git a/firmware/p417_SWTL.X/nbproject/private/configurations.xml b/firmware/p417_SWTL.X/nbproject/private/configurations.xml
index 2a4afe5..38270a8 100644
--- a/firmware/p417_SWTL.X/nbproject/private/configurations.xml
+++ b/firmware/p417_SWTL.X/nbproject/private/configurations.xml
@@ -5,7 +5,7 @@
noToolString
- C:\Program Files\Microchip\xc32\v4.40\bin
+ E:\Program Files\Microchip\xc32\v4.10\bin
place holder 1
place holder 2
diff --git a/firmware/p417_SWTL.X/nbproject/private/private.xml b/firmware/p417_SWTL.X/nbproject/private/private.xml
index 35c0cf8..f84c477 100644
--- a/firmware/p417_SWTL.X/nbproject/private/private.xml
+++ b/firmware/p417_SWTL.X/nbproject/private/private.xml
@@ -3,10 +3,10 @@
- file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/RTE/RTE.c
- file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/FunctionState/FunctionState.c
- file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/main.c
file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/TouchPanel/TouchPanel.c
+ file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/RTE/RTE.c
+ file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/main.c
+ file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTL/firmware/src/FunctionState/FunctionState.c
diff --git a/firmware/src/DiagnosticL/Sys_Diag_Detect/SysDiagDetect.c b/firmware/src/DiagnosticL/Sys_Diag_Detect/SysDiagDetect.c
index d862c69..5072d39 100644
--- a/firmware/src/DiagnosticL/Sys_Diag_Detect/SysDiagDetect.c
+++ b/firmware/src/DiagnosticL/Sys_Diag_Detect/SysDiagDetect.c
@@ -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
diff --git a/firmware/src/RTE/RTE.c b/firmware/src/RTE/RTE.c
index 4328b0d..45e47e0 100644
--- a/firmware/src/RTE/RTE.c
+++ b/firmware/src/RTE/RTE.c
@@ -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)