huahua/P417_SWTR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://ikuai.hua-hua.cn:3000/huahua/P417_SWTR

Browse Source
This commit is contained in:
sunbeam 2024-08-16 08:41:23 +08:00
commit c8834c5f0a
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/src/FunctionState/FunctionState.c
View File

@ -21,6 +21,9 @@ void FunctionState_Task(void)
if (adcResetFlag == 0) if (adcResetFlag == 0)
{ {
ADC1_Initialize(); ADC1_Initialize();
ADC1_Enable();
ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
ADC1_ConversionStart();
return; return;
} }

9
firmware/src/RTE/RTE.c
View File

@ -538,10 +538,12 @@ uint8_t RTE_Get_X_SNS(void)
X_Update_Flg=1; X_Update_Flg=1;
rtn_X= (X_Buf[X_Length/2]+X_Buf[X_Length/2-1])/2; rtn_X= (X_Buf[X_Length/2]+X_Buf[X_Length/2-1])/2;
} }
/*
if(Allow_Touch_flag==0) if(Allow_Touch_flag==0)
{ {
rtn_X = 0; rtn_X = 0;
} }
*/
if(x_pos==0) if(x_pos==0)
{ {
rtn_X=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; rtn_Y=(Y_Buf[Y_Length/2]+Y_Buf[Y_Length/2-1])/2;
} }
/*
if(Allow_Touch_flag==0) if(Allow_Touch_flag==0)
{ {
rtn_Y = 0; rtn_Y = 0;
} }
*/
if(y_pos==0) if(y_pos==0)
{ {
rtn_Y=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((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(Allow_Touch_flag == 1)
{ {
//Allow_Touch_flag=1; //Allow_Touch_flag=1;
if(g_XY_Touch_And_Below_1N == TRUE || g_VOICE_Touch_And_Below_1N == TRUE || 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 baseline_error_repeat_counter = 55000;//110S
ADC0_Initialize(); ADC0_Initialize();
ADC0_Enable();
} }
} }
break; break;

6
firmware/src/main.c
View File

@ -96,10 +96,12 @@ void ADC1_ConversionCallback (ADC_STATUS status, uintptr_t context)
case ADC1_CH_AD_LDO_SNS: case ADC1_CH_AD_LDO_SNS:
ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND); ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
adc_ch_sel= ADC1_CH_LD_OUT_SNS; adc_ch_sel= ADC1_CH_LD_OUT_SNS;
ADC1_ConversionStart();
break; break;
case ADC1_CH_LD_OUT_SNS: case ADC1_CH_LD_OUT_SNS:
ADC1_ChannelSelect(ADC_POSINPUT_AIN7, ADC_NEGINPUT_GND); ADC1_ChannelSelect(ADC_POSINPUT_AIN7, ADC_NEGINPUT_GND);
adc_ch_sel= ADC1_CH_AD_LDO_SNS; adc_ch_sel= ADC1_CH_AD_LDO_SNS;
ADC1_Disable();
break; break;
default: default:
break; break;
@ -276,9 +278,9 @@ int main ( void )
{ {
/* Maintain state machines of all polled MPLAB Harmony modules. */ /* Maintain state machines of all polled MPLAB Harmony modules. */
SYS_Tasks ( ); SYS_Tasks ( );
ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND); //ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
ADC1_ConversionStart(); //ADC1_ConversionStart();