diff --git a/firmware/p417_SWTR.X/nbproject/Makefile-genesis.properties b/firmware/p417_SWTR.X/nbproject/Makefile-genesis.properties
index eb279c4..caee351 100644
--- a/firmware/p417_SWTR.X/nbproject/Makefile-genesis.properties
+++ b/firmware/p417_SWTR.X/nbproject/Makefile-genesis.properties
@@ -1,10 +1,10 @@
 #
-#Sat Oct 19 09:22:25 CST 2024
+#Fri Nov 15 15:26:57 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=7fdab7bbeb77e28da32352067380d4c4
+configurations-xml=3c603a65e149702643d6cf2071da16f0
 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_SWTR\\firmware\\p417_SWTR.X
diff --git a/firmware/p417_SWTR.X/nbproject/configurations.xml b/firmware/p417_SWTR.X/nbproject/configurations.xml
index eb8d695..4253bb7 100644
--- a/firmware/p417_SWTR.X/nbproject/configurations.xml
+++ b/firmware/p417_SWTR.X/nbproject/configurations.xml
@@ -480,7 +480,7 @@
         <targetPluginBoard></targetPluginBoard>
         <platformTool>noID</platformTool>
         <languageToolchain>XC32</languageToolchain>
-        <languageToolchainVersion>4.40</languageToolchainVersion>
+        <languageToolchainVersion>4.10</languageToolchainVersion>
         <platform>3</platform>
       </toolsSet>
       <packs>
diff --git a/firmware/p417_SWTR.X/nbproject/private/configurations.xml b/firmware/p417_SWTR.X/nbproject/private/configurations.xml
index 2a4afe5..38270a8 100644
--- a/firmware/p417_SWTR.X/nbproject/private/configurations.xml
+++ b/firmware/p417_SWTR.X/nbproject/private/configurations.xml
@@ -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>
diff --git a/firmware/p417_SWTR.X/nbproject/private/private.xml b/firmware/p417_SWTR.X/nbproject/private/private.xml
index b293abf..361468e 100644
--- a/firmware/p417_SWTR.X/nbproject/private/private.xml
+++ b/firmware/p417_SWTR.X/nbproject/private/private.xml
@@ -3,9 +3,9 @@
     <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_SWTR/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.c</file>
-            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/TouchPanel/TouchPanel.c</file>
             <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/main.c</file>
+            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/TouchPanel/TouchPanel.c</file>
+            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.c</file>
         </group>
     </open-files>
 </project-private>
diff --git a/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.c b/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.c
index 47457b3..46644d6 100644
--- a/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.c
+++ b/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.c
@@ -92,8 +92,9 @@ static void Touch_Sensor_Diag_Task(void)//5ms
         if (fault_count1 > 40)
         {
             fault_count1 = 40;
+            Touch_Sensor_Fault_key = Touch_Out_Range;
         }
-        Touch_Sensor_Fault_key = Touch_Out_Range;
+        
     }
     if (Touch_Sensor_delta05 < 300 && Touch_Sensor_delta06 < 300 && Touch_Sensor_delta07 < 300 && Touch_Sensor_delta08 < 300 && Touch_Sensor_delta09 < 300 &&
         Touch_Sensor_delta10 < 250 && Touch_Sensor_delta11 < 250 && Touch_Sensor_delta12 < 250 && Touch_Sensor_delta13 < 250 && Touch_Sensor_delta14 < 250)
@@ -107,8 +108,9 @@ static void Touch_Sensor_Diag_Task(void)//5ms
         if (fault_count2 > 40)
         {
             fault_count2 = 40;
+            Touch_Sensor_Fault_pad = Touch_Out_Range;
         }
-        Touch_Sensor_Fault_pad = Touch_Out_Range;
+        
     }
     
     if ( Touch_Sensor_Fault_pad == Touch_NoFault && Touch_Sensor_Fault_key == Touch_NoFault)
diff --git a/firmware/src/RTE/RTE.c b/firmware/src/RTE/RTE.c
index 48793ae..803e7eb 100644
--- a/firmware/src/RTE/RTE.c
+++ b/firmware/src/RTE/RTE.c
@@ -975,6 +975,10 @@ void RTE_Set_CAN_RiMFctActSgCe(uint8_t Value)
     {
         Value = 0;
     }
+    if (Touch_Sensor_Fault_pad != Touch_NoFault)
+    {
+        Value = 0x03;
+    }
     InitMessage(SIG_RIMFCTACTSGCE, &Value);
 }
 
@@ -984,6 +988,10 @@ void RTE_Set_CAN_RiMFctActSgDn(uint8_t Value)
     {
         Value = 0;
     }
+    if (Touch_Sensor_Fault_pad != Touch_NoFault)
+    {
+        Value = 0x03;
+    }
     InitMessage(SIG_RIMFCTACTSGDN, &Value);
 }
 
@@ -993,6 +1001,10 @@ void RTE_Set_CAN_RiMFctActSgLe(uint8_t Value)
     {
         Value = 0;
     }
+    if (Touch_Sensor_Fault_pad != Touch_NoFault)
+    {
+        Value = 0x03;
+    }
     InitMessage(SIG_RIMFCTACTSGLE, &Value);
 }
 
@@ -1002,6 +1014,10 @@ void RTE_Set_CAN_RiMFctActSgRi(uint8_t Value)
     {
         Value = 0;
     }
+    if (Touch_Sensor_Fault_pad != Touch_NoFault)
+    {
+        Value = 0x03;
+    }
     InitMessage(SIG_RIMFCTACTSGRI, &Value);
 }
 
@@ -1011,6 +1027,10 @@ void RTE_Set_CAN_RiMFctActSgUp(uint8_t Value)
     {
         Value = 0;
     }
+    if (Touch_Sensor_Fault_pad != Touch_NoFault)
+    {
+        Value = 0x03;
+    }
     InitMessage(SIG_RIMFCTACTSGUP, &Value);
 }
 
@@ -1020,6 +1040,10 @@ void RTE_Set_CAN_SteerWhlTouchBdVoice(uint8_t Value)
     {
         Value = 0;
     }
+    if (Touch_Sensor_Fault_key != Touch_NoFault)
+    {
+        Value = 0x03;
+    }
     InitMessage(SIG_STEERWHLTOUCHBDVOICE, &Value);
 }
 
@@ -1064,6 +1088,10 @@ void RTE_Set_CAN_SteerWhlTouchBdMenu(uint8_t Value)
     {
         Value = 0;
     }
+    if (Touch_Sensor_Fault_key != Touch_NoFault)
+    {
+        Value = 0x03;
+    }
     InitMessage(SIG_STEERWHLTOUCHBDMENU, &Value);
 }
 
@@ -1073,6 +1101,10 @@ void RTE_Set_CAN_SteerWhlTouchBdDn(uint8_t Value)
     {
         Value = 0;
     }
+    if (Touch_Sensor_Fault_key != Touch_NoFault)
+    {
+        Value = 0x03;
+    }
     InitMessage(SIG_STEERWHLTOUCHBDDN, &Value);
 }
 
@@ -1094,7 +1126,7 @@ void RTE_Set_CAN_SteerWhlTouchBdRiSteerWhlTouchBdSts(uint8_t Value)
     {
         Value = 0;
     }
-    if (Value != 0 && Touch_Sensor_Fault != Touch_NoFault)
+    if (Touch_Sensor_Fault != Touch_NoFault)
     {
         Value = 0x03;
     }
@@ -1229,8 +1261,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,
+    56,51,64,54,56,59,63,60,
+    60,53,58,56,54,57,55,40,
 };
 #if 1
 void RTE_Set_All_Test_Value(void) // 2ms