From 6753c133bd55c7ce8e0b2b8cf2b51116e1688a5b Mon Sep 17 00:00:00 2001
From: sunbeam <fcb1995@163.com>
Date: Sat, 27 Jul 2024 11:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAD=E8=A2=AB=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firmware/src/FunctionState/FunctionState.c | 3 +++
 firmware/src/RTE/RTE.c                     | 9 +++++++--
 firmware/src/main.c                        | 6 ++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/firmware/src/FunctionState/FunctionState.c b/firmware/src/FunctionState/FunctionState.c
index 28f2c3b..2742ff1 100644
--- a/firmware/src/FunctionState/FunctionState.c
+++ b/firmware/src/FunctionState/FunctionState.c
@@ -21,6 +21,9 @@ void FunctionState_Task(void)
         if (adcResetFlag == 0)
         {
             ADC1_Initialize();
+            ADC1_Enable();
+            ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
+            ADC1_ConversionStart();
             return;
         }
         
diff --git a/firmware/src/RTE/RTE.c b/firmware/src/RTE/RTE.c
index b39da32..83ee50a 100644
--- a/firmware/src/RTE/RTE.c
+++ b/firmware/src/RTE/RTE.c
@@ -538,10 +538,12 @@ uint8_t RTE_Get_X_SNS(void)
         X_Update_Flg=1;  
         rtn_X= (X_Buf[X_Length/2]+X_Buf[X_Length/2-1])/2;
     }
+    /*
     if(Allow_Touch_flag==0)
     {
       rtn_X = 0;
     }
+    */
     if(x_pos==0)
     {
        rtn_X=0;
@@ -644,10 +646,12 @@ uint8_t RTE_Get_Y_SNS(void)
       rtn_Y=(Y_Buf[Y_Length/2]+Y_Buf[Y_Length/2-1])/2;
         
     }
+    /*
     if(Allow_Touch_flag==0)
     {
       rtn_Y = 0;
     }
+    */
     if(y_pos==0)
     {
        rtn_Y=0;
@@ -772,8 +776,8 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void)   // 0 false   1 true
     }
 
 
-    //if((Two_Finger_Y_count<=4 && Y_count == Two_Finger_Y_count)&&(Two_Finger_X_count<=4 && X_count == Two_Finger_X_count))
-    if(Allow_Touch_flag == 1)
+    if((Two_Finger_Y_count<=4 && Y_count == Two_Finger_Y_count)&&(Two_Finger_X_count<=4 && X_count == Two_Finger_X_count))
+    //if(Allow_Touch_flag == 1)
     {
         //Allow_Touch_flag=1;
         if(g_XY_Touch_And_Below_1N == TRUE || g_VOICE_Touch_And_Below_1N == TRUE || 
@@ -1410,6 +1414,7 @@ void RTE_Set_All_Test_Value(void)//2ms
                 {
                     baseline_error_repeat_counter = 55000;//110S
                     ADC0_Initialize();
+                    ADC0_Enable();
                 }
             }
             break;
diff --git a/firmware/src/main.c b/firmware/src/main.c
index f49a5b5..41b4b45 100644
--- a/firmware/src/main.c
+++ b/firmware/src/main.c
@@ -96,10 +96,12 @@ void ADC1_ConversionCallback (ADC_STATUS status, uintptr_t context)
             case ADC1_CH_AD_LDO_SNS:
                 ADC1_ChannelSelect(ADC_POSINPUT_AIN6,  ADC_NEGINPUT_GND);
                 adc_ch_sel= ADC1_CH_LD_OUT_SNS;
+                ADC1_ConversionStart();
                 break;
             case ADC1_CH_LD_OUT_SNS:
                 ADC1_ChannelSelect(ADC_POSINPUT_AIN7, ADC_NEGINPUT_GND);
                 adc_ch_sel= ADC1_CH_AD_LDO_SNS;
+                ADC1_Disable();
                 break;
             default:
                 break;
@@ -263,9 +265,9 @@ int main ( void )
     {
         /* Maintain state machines of all polled MPLAB Harmony modules. */
         SYS_Tasks ( );
-        ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
+        //ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
     
-        ADC1_ConversionStart();
+        //ADC1_ConversionStart();