ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move ADC channel touch definition to nanovna.h

Browse source
This commit is contained in:
DiSlord 2020-05-17 23:47:15 +03:00
parent 4444e94e3d
commit 881e46e122
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nanovna.h
View file

@ -504,6 +504,8 @@ void enter_dfu(void);
/* /*
* adc.c * adc.c
*/ */
#define ADC_TOUCH_X ADC_CHSELR_CHSEL6
#define ADC_TOUCH_Y ADC_CHSELR_CHSEL7
void adc_init(void); void adc_init(void);
uint16_t adc_single_read(uint32_t chsel); uint16_t adc_single_read(uint32_t chsel);

12
ui.c
View file

@ -200,9 +200,9 @@ touch_measure_y(void)
palSetPad(GPIOA, 6); palSetPad(GPIOA, 6);
chThdSleepMilliseconds(2); chThdSleepMilliseconds(2);
v = adc_single_read(ADC_CHSELR_CHSEL7); v = adc_single_read(ADC_TOUCH_Y);
//chThdSleepMilliseconds(2); //chThdSleepMilliseconds(2);
//v += adc_single_read(ADC1, ADC_CHSELR_CHSEL7); //v += adc_single_read(ADC1, ADC_TOUCH_Y);
return v; return v;
} }
@ -220,9 +220,9 @@ touch_measure_x(void)
palClearPad(GPIOA, 7); palClearPad(GPIOA, 7);
chThdSleepMilliseconds(2); chThdSleepMilliseconds(2);
v = adc_single_read(ADC_CHSELR_CHSEL6); v = adc_single_read(ADC_TOUCH_X);
//chThdSleepMilliseconds(2); //chThdSleepMilliseconds(2);
//v += adc_single_read(ADC1, ADC_CHSELR_CHSEL6); //v += adc_single_read(ADC1, ADC_TOUCH_X);
return v; return v;
} }
@ -243,14 +243,14 @@ void
touch_start_watchdog(void) touch_start_watchdog(void)
{ {
touch_prepare_sense(); touch_prepare_sense();
adc_start_analog_watchdogd(ADC_CHSELR_CHSEL7); adc_start_analog_watchdogd(ADC_TOUCH_Y);
} }
static int static int
touch_status(void) touch_status(void)
{ {
touch_prepare_sense(); touch_prepare_sense();
return adc_single_read(ADC_CHSELR_CHSEL7) > TOUCH_THRESHOLD; return adc_single_read(ADC_TOUCH_Y) > TOUCH_THRESHOLD;
} }
static int static int