diff options
| author | Joel Bodenmann <joel@unormal.org> | 2012-12-02 15:36:55 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2012-12-02 15:36:55 +0100 |
| commit | 2d449b1f7c2efbbd7e1c3ea4478eaa21fe4ccb84 (patch) | |
| tree | 3a9cce047a334b3911acc8597a1ea068c0cf553c | |
| parent | ae7da0770bb60c4add9c06d9dda93045a003281c (diff) | |
| download | uGFX-2d449b1f7c2efbbd7e1c3ea4478eaa21fe4ccb84.tar.gz uGFX-2d449b1f7c2efbbd7e1c3ea4478eaa21fe4ccb84.tar.bz2 uGFX-2d449b1f7c2efbbd7e1c3ea4478eaa21fe4ccb84.zip | |
fix
| -rw-r--r-- | drivers/touchscreen/MCU/touchscreen_lld.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/touchscreen/MCU/touchscreen_lld.c b/drivers/touchscreen/MCU/touchscreen_lld.c index 2e3c9aea..d34228a6 100644 --- a/drivers/touchscreen/MCU/touchscreen_lld.c +++ b/drivers/touchscreen/MCU/touchscreen_lld.c @@ -98,27 +98,27 @@ static void ts_lld_filter(void) { * @notapi
*/
uint16_t ts_lld_read_x(void) {
- uint16_t val1, val2;
- adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
+ uint16_t val1, val2;
+ adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
- palSetPadMode(GPIOC, 0, PAL_MODE_INPUT_ANALOG);
- palSetPadMode(GPIOC, 1, PAL_MODE_INPUT_ANALOG);
- palSetPadMode(GPIOC, 2, PAL_MODE_OUTPUT_PUSHPULL);
- palSetPadMode(GPIOC, 3, PAL_MODE_OUTPUT_PUSHPULL);
+ palSetPadMode(ts->yd_port, ts->yd_pin, PAL_MODE_INPUT_ANALOG);
+ palSetPadMode(ts->yu_port, ts->yu_pin, PAL_MODE_INPUT_ANALOG);
+ palSetPadMode(ts->xl_port, ts->xl_pin, PAL_MODE_OUTPUT_PUSHPULL);
+ palSetPadMode(ts->xr_port, ts->xr_pin, PAL_MODE_OUTPUT_PUSHPULL);
- palSetPad(GPIOC, 2);
- palClearPad(GPIOC, 3);
+ palSetPad(ts->xl_port, ts->xl_pin);
+ palClearPad(ts->xr_port, ts->xr_pin);
chThdSleepMilliseconds(1);
- adcConvert(&ADCD1, &adc_x_config, samples, ADC_BUF_DEPTH);
+ adcConvert(ts->adc_driver, &adc_x_config, samples, ADC_BUF_DEPTH);
val1 = ((samples[0] + samples[1])/2);
-
- palClearPad(GPIOC, 2);
- palSetPad(GPIOC, 3);
+
+ palClearPad(ts->xl_port, ts->xl_pin);
+ palSetPad(ts->xr_port, ts->xr_pin);
chThdSleepMilliseconds(1);
- adcConvert(&ADCD1, &adc_x_config, samples, ADC_BUF_DEPTH);
+ adcConvert(ts->adc_driver, &adc_x_config, samples, ADC_BUF_DEPTH);
val2 = ((samples[0] + samples[1])/2);
- return ((val1+((1<<12)-val2))/4);
+ return ((val1+((1<<12)-val2))/4);
}
/**
|