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

修复马达噪声，修复触摸BUG

Browse Source
This commit is contained in:
sunbeam 2024-08-24 11:54:08 +08:00
parent 9c1f7d86dc
commit e6bd2998c6
6 changed files with 1092 additions and 1284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/p417_SWTL.X/nbproject/Makefile-genesis.properties
View File

@ -1,9 +1,9 @@
#
#Tue Aug 20 14:39:42 CST 2024
#Sat Aug 24 10:49:00 CST 2024
mcal.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=1eaf555a844840d91945cb14109201c3
conf.ids=mcal
mcal.languagetoolchain.version=4.10
host.id=10k5-yicy-7x
host.id=124p-5vo2-40
configurations-xml=82d12c4bf5f229226e945ddd8fae0eb3
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

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

@ -685,7 +685,7 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false 1 true
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)
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++;
@ -1395,6 +1395,7 @@ void RTE_Set_All_Test_Value(void)
{
baseline_error_repeat_counter = 55000; // 110S
ADC0_Initialize();
ADC0_Enable();
}
}
break;

10
firmware/src/Speaker/Speaker.c
View File

@ -167,6 +167,8 @@ void speaker_MainTask(void)
//SA51024_Set_State(SA51024_STOP,speaker_ctrl_buf_str.strenght);
PORT_PinWrite(PORT_PIN_PA13,0);/*SHUTDOWN = 1，turn on chip*/
PORT_PinWrite(PORT_PIN_PA25,0);
PORT_PinPeripheralFunctionConfig(PORT_PIN_PA02,PERIPHERAL_FUNCTION_B);
DAC_REGS->DAC_CTRLA |= DAC_CTRLA_ENABLE_Msk;
speaker_set_strenght(SA51024_STRENGTH_LEVEL0);
speaker_main_state_str = SPEAKER_INIT_CYCLE;
speaker_cycle_u16 = 0;
@ -179,7 +181,7 @@ void speaker_MainTask(void)
if(speaker_cycle_u16++ >= ((SPEAKER_INTERVAL_CYCLE_TIMES)/(SPEAKER_TASK_PERIOD)))
{
DAC_REGS->DAC_CTRLA &= ~DAC_CTRLA_ENABLE_Msk;
//DAC_REGS->DAC_CTRLA &= ~DAC_CTRLA_ENABLE_Msk;
PORT_PinGPIOConfig(PORT_PIN_PA02);
speaker_main_state_str = SPEAKER_IDLE;
}
@ -212,9 +214,9 @@ void speaker_MainTask(void)
case SPEAKER_START:
{
PORT_PinPeripheralFunctionConfig(PORT_PIN_PA02,PERIPHERAL_FUNCTION_B);
PORT_PinWrite(PORT_PIN_PA25,0);
DAC_REGS->DAC_CTRLA |= DAC_CTRLA_ENABLE_Msk;
SA51024_Set_State(SA51024_WORKING,speaker_ctrl_buf_str.strenght);
speaker_cycle_u16 = 0;
speaker_main_state_str = SPEAKER_UPDATE_CYCLE;
@ -248,7 +250,7 @@ void speaker_MainTask(void)
/* Disable DAC */
// DAC_REGS->DAC_CTRLA &= ~DAC_CTRLA_ENABLE_Msk;
PORT_PinGPIOConfig(PORT_PIN_PA02);
//PORT_PinGPIOConfig(PORT_PIN_PA02);
}
break;

2292
firmware/src/TouchPanel/TouchPanel.c
View File

File diff suppressed because it is too large Load Diff

32
firmware/src/config/mcal/touch/touch.h
View File

@ -196,97 +196,97 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
#define KEY_0_PARAMS \
{ \
48u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
#define KEY_1_PARAMS \
{ \
48u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
#define KEY_2_PARAMS \
{ \
54u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
#define KEY_3_PARAMS \
{ \
61u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_4_PARAMS \
{ \
60u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_5_PARAMS \
{ \
57u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_6_PARAMS \
{ \
63u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_7_PARAMS \
{ \
72u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_8_PARAMS \
{ \
49u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_9_PARAMS \
{ \
54u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_10_PARAMS \
{ \
47u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_11_PARAMS \
{ \
55u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_12_PARAMS \
{ \
59u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_13_PARAMS \
{ \
48u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
#define KEY_14_PARAMS \
{ \
48u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
#define KEY_15_PARAMS \
{ \
60u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}

35
firmware/src/main.c
View File

@ -93,22 +93,25 @@ void ADC1_ConversionCallback(ADC_STATUS status, uintptr_t context)
switch (adc_ch_sel)
{
case ADC1_CH_AD_LDO_SNS:
ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
adc_ch_sel = ADC1_CH_LD_OUT_SNS;
break;
case ADC1_CH_LD_OUT_SNS:
ADC1_ChannelSelect(ADC_POSINPUT_AIN7, ADC_NEGINPUT_GND);
adc_ch_sel = ADC1_CH_AD_LDO_SNS;
break;
default:
break;
}
// adc_ch_sel++;
// if (adc_ch_sel > ADC1_CH_MAX) {
// adc_ch_sel = ADC1_CH_AD_LDO_SNS + 1;
// }
ADC1_ConversionStart();
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();
ADC1_ConversionStart();
break;
default:
break;
}
//adc_ch_sel++;
//if (adc_ch_sel > ADC1_CH_MAX) {
// adc_ch_sel = ADC1_CH_AD_LDO_SNS + 1;
//}
}
}