uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

touchscreen MCU driver fix

Browse source
This commit is contained in:
Joel Bodenmann 2012-11-26 00:33:56 +01:00
parent 9c74a08131
commit 0ab8da8c78
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/touchscreen/MCU/touchscreen_lld.c
View file

@ -109,13 +109,13 @@ uint16_t ts_lld_read_x(void) {
palSetPad(ts->xl_port, ts->xl_pin); palSetPad(ts->xl_port, ts->xl_pin);
palClearPad(ts->xr_port, ts->xr_pin); palClearPad(ts->xr_port, ts->xr_pin);
chThdSleepMilliseconds(1); 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); val1 = ((samples[0] + samples[1])/2);
palClearPad(ts->xr_port, ts->xr_pin); palClearPad(ts->xl_port, ts->xl_pin);
palSetPad(ts->xl_port, ts->xl_pin); palSetPad(ts->xr_port, ts->xr_pin);
chThdSleepMilliseconds(1); 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); val2 = ((samples[0] + samples[1])/2);
return ((val1+((1<<12)-val2))/4); return ((val1+((1<<12)-val2))/4);
@ -138,13 +138,13 @@ uint16_t ts_lld_read_y(void) {
palSetPad(ts->yu_port, ts->yu_pin); palSetPad(ts->yu_port, ts->yu_pin);
palClearPad(ts->yd_port, ts->yd_pin); palClearPad(ts->yd_port, ts->yd_pin);
chThdSleepMilliseconds(1); chThdSleepMilliseconds(1);
adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH); adcConvert(ts->adc_driver, &adc_y_config, samples, ADC_BUF_DEPTH);
val1 = ((samples[0] + samples[1])/2); val1 = ((samples[0] + samples[1])/2);
palClearPad(ts->yu_port, ts->yu_pin); palClearPad(ts->yu_port, ts->yu_pin);
palSetPad(ts->yd_port, ts->yd_pin); palSetPad(ts->yd_port, ts->yd_pin);
chThdSleepMilliseconds(1); chThdSleepMilliseconds(1);
adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH); adcConvert(ts->adc_driver, &adc_y_config, samples, ADC_BUF_DEPTH);
val2 = ((samples[0] + samples[1])/2); val2 = ((samples[0] + samples[1])/2);
return ((val1+((1<<12)-val2))/4); return ((val1+((1<<12)-val2))/4);