diff --git a/firmware/p417_SWTR.X/nbproject/private/private.xml b/firmware/p417_SWTR.X/nbproject/private/private.xml
index 4ef4f3f..7698751 100644
--- a/firmware/p417_SWTR.X/nbproject/private/private.xml
+++ b/firmware/p417_SWTR.X/nbproject/private/private.xml
@@ -3,7 +3,7 @@
- file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.h
+ file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/main.c
diff --git a/firmware/src/config/mcal/touch/touch.h b/firmware/src/config/mcal/touch/touch.h
index ae6f43b..9c6c327 100644
--- a/firmware/src/config/mcal/touch/touch.h
+++ b/firmware/src/config/mcal/touch/touch.h
@@ -64,7 +64,7 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
* Range: 1 to 255.
* Default value: 20.
*/
-#define DEF_TOUCH_MEASUREMENT_PERIOD_MS 4u
+#define DEF_TOUCH_MEASUREMENT_PERIOD_MS 18u
/* Defines the Type of sensor
* Default value: NODE_MUTUAL.
@@ -192,91 +192,91 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
#define KEY_0_PARAMS \
{ \
- 70u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_2 \
+ 70u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \
}
#define KEY_1_PARAMS \
{ \
- 72u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_2 \
+ 72u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \
}
#define KEY_2_PARAMS \
{ \
- 70u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_2 \
+ 70u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \
}
#define KEY_3_PARAMS \
{ \
- 71u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_2 \
+ 71u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \
}
#define KEY_4_PARAMS \
{ \
- 71u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_2 \
+ 71u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_2 \
}
#define KEY_5_PARAMS \
{ \
- 74u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
+ 74u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
}
#define KEY_6_PARAMS \
{ \
- 64u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
+ 64u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
}
#define KEY_7_PARAMS \
{ \
- 57u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
+ 57u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
}
#define KEY_8_PARAMS \
{ \
- 62u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
+ 62u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
}
#define KEY_9_PARAMS \
{ \
- 59u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
+ 59u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
}
#define KEY_10_PARAMS \
{ \
- 60u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
+ 60u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
}
#define KEY_11_PARAMS \
{ \
- 55u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
+ 55u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
}
#define KEY_12_PARAMS \
{ \
- 50u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
+ 50u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
}
#define KEY_13_PARAMS \
{ \
- 52u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
+ 52u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
}
#define KEY_14_PARAMS \
{ \
- 58u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
+ 58u, (uint8_t)RECAL_50, (uint8_t)AKS_GROUP_1 \
}
@@ -291,13 +291,13 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
* Range: 0 to 255.
* Default value: 5.
*/
-#define DEF_ANTI_TCH_DET_INT 3u
+#define DEF_ANTI_TCH_DET_INT 50u
/* Threshold beyond with automatic sensor recalibration is initiated.
* Range: RECAL_100/ RECAL_50 / RECAL_25 / RECAL_12_5 / RECAL_6_25 / MAX_RECAL
* Default value: RECAL_100.
*/
-#define DEF_ANTI_TCH_RECAL_THRSHLD (uint8_t)RECAL_50
+#define DEF_ANTI_TCH_RECAL_THRSHLD (uint8_t)RECAL_100
/* Rate at which sensor reference value is adjusted towards sensor signal value
* when signal value is greater than reference.
@@ -408,7 +408,7 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
* The minimum contact size measurement for persistent contact tracking.
* Contact size is the sum of neighbouring keys' touch deltas forming the touch contact.
*/
-#define SURFACE_CS_MIN_CONTACT 140u
+#define SURFACE_CS_MIN_CONTACT 120u
/**********************************************************/