diff --git a/firmware/p417_SWTR.X/nbproject/private/private.xml b/firmware/p417_SWTR.X/nbproject/private/private.xml index 6807a2b..4ef4f3f 100644 --- a/firmware/p417_SWTR.X/nbproject/private/private.xml +++ b/firmware/p417_SWTR.X/nbproject/private/private.xml @@ -2,6 +2,8 @@ - + + file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/DiagnosticR/Sys_Diag_Detect/SysDiagDetect.h + diff --git a/firmware/src/RTE/RTE.c b/firmware/src/RTE/RTE.c index b3d5b19..066755e 100644 --- a/firmware/src/RTE/RTE.c +++ b/firmware/src/RTE/RTE.c @@ -658,7 +658,7 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false 1 true } // 触发的通道数量 //连续触发的通道数量 - if ((Two_Finger_Y_count > 4 && Two_Finger_X_data[0]>th_x[0]) || Y_count != Two_Finger_Y_count || Two_Finger_X_count > 4 || X_count == Two_Finger_X_count) + if ((Two_Finger_Y_count > 4 && Two_Finger_X_data[0]>th_x[0]) || Y_count != Two_Finger_Y_count || Two_Finger_X_count > 4 || X_count != Two_Finger_X_count) { //满足防误触 Allow_Touch_counter++;