ADC通道好像有问题

This commit is contained in:
2021-11-05 00:26:34 +08:00
parent 1b84ff76e5
commit 44deedff4b
8 changed files with 1536 additions and 1313 deletions
+37 -5
View File
@@ -295,19 +295,21 @@ void my_code()
long countdown=1000;
long countdown_set=15000;
char moto_in1,moto_in2;
uint16_t moto_in1_pp=0,moto_in2_pp=0;
HT1621_Init();
r480_init();
config.begin=0;
AT24CXX_Read(16,(char *)&config,sizeof(config_setting));
AT24CXX_Read(32,(char *)&config,sizeof(config_setting));
if(config.begin!=0xab||check_need_reset())
{
mode=0;
r480.key=0;
}
mode=6;
while(1)
{
@@ -359,7 +361,7 @@ void my_code()
r480.add[0]=0;
r480.add[1]=0;
mode=1;
AT24CXX_Write(16,(char *)&config,sizeof(config_setting));
AT24CXX_Write(32,(char *)&config,sizeof(config_setting));
}
break;
@@ -450,7 +452,7 @@ void my_code()
moto.moto2a=0;
moto.moto2b=10;
}
if(key4.code!=0)
if(key4.code!=0||(moto_in1==1&&READ_MOT_IN1==0))
{
mode=1;
}
@@ -505,7 +507,7 @@ void my_code()
moto.moto2a=10;
moto.moto2b=0;
}
if(key4.code!=0)
if(key4.code!=0||(moto_in2==1&&READ_MOT_IN2==0))
{
mode=1;
}
@@ -564,6 +566,17 @@ void my_code()
dis_buff.d_num[1]=dis_buff.d_num[1]==0?16:dis_buff.d_num[1];
break;
case 6:
moto.moto1a=10;
moto.moto1b=0;
moto.moto2a=10;
moto.moto2b=0;
dis_buff.d_num[3]=(ADCC.adc_value[1])%10;
dis_buff.d_num[2]=(ADCC.adc_value[1]/10)%10;
dis_buff.d_num[1]=((ADCC.adc_value[1]/100)%10);
dis_buff.d_num[0]=((ADCC.adc_value[1]/1000)%10);
break;
// case 5:
// //overload
@@ -658,6 +671,25 @@ void my_code()
dis_buff.button_flag[2]=0;
dis_buff.button_flag[3]=0;
if(moto_in1!=READ_MOT_IN1)
{
moto_in1_pp++;
if(moto_in1_pp==100)
{
moto_in1_pp=0;
moto_in1=READ_MOT_IN1;
}
}
if(moto_in2!=READ_MOT_IN2)
{
moto_in2_pp++;
if(moto_in2_pp==100)
{
moto_in2_pp=0;
moto_in2=READ_MOT_IN2;
}
}
HT1621_Display_GetButton();
hc2_sever();