diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-12-06 00:36:11 -0800 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-12-06 00:36:11 -0800 |
| commit | e236a0a6b79ccd4446df72256740913392cf12f7 (patch) | |
| tree | 3ddf6ab5df736bbea7ea814e3cc86b49587fa187 /drivers/ginput | |
| parent | 74e94d39b9b66adeaf8bcbb8789d79110102bb15 (diff) | |
| parent | 09fc35864aa695cc46dcb95ed3951a365622b709 (diff) | |
| download | uGFX-e236a0a6b79ccd4446df72256740913392cf12f7.tar.gz uGFX-e236a0a6b79ccd4446df72256740913392cf12f7.tar.bz2 uGFX-e236a0a6b79ccd4446df72256740913392cf12f7.zip | |
Merge pull request #11 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'drivers/ginput')
| -rw-r--r-- | drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h | 10 | ||||
| -rw-r--r-- | drivers/ginput/touch/MCU/ginput_lld_mouse_config.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h index 84f3416c..fa3dca7e 100644 --- a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h +++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h @@ -105,7 +105,7 @@ static __inline void release_bus(void) { *
* @notapi
*/
-static __inline uint16_t read_x_value(void) {
+static uint16_t read_x_value(void) {
uint16_t val1, val2;
adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
@@ -113,7 +113,7 @@ static __inline uint16_t read_x_value(void) { palSetPadMode(GPIOC, 1, PAL_MODE_INPUT_ANALOG);
palSetPadMode(GPIOC, 2, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 3, PAL_MODE_OUTPUT_PUSHPULL);
-
+
palSetPad(GPIOC, 2);
palClearPad(GPIOC, 3);
chThdSleepMilliseconds(1);
@@ -135,7 +135,7 @@ static __inline uint16_t read_x_value(void) { *
* @notapi
*/
-static __inline uint16_t read_y_value(void) {
+static uint16_t read_y_value(void) {
uint16_t val1, val2;
adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
@@ -143,8 +143,8 @@ static __inline uint16_t read_y_value(void) { palSetPadMode(GPIOC, 3, PAL_MODE_INPUT_ANALOG);
palSetPadMode(GPIOC, 0, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 1, PAL_MODE_OUTPUT_PUSHPULL);
- return 42;
- palSetPad(GPIOC, 1);
+
+ palSetPad(GPIOC, 1);
palClearPad(GPIOC, 0);
chThdSleepMilliseconds(1);
adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h index e1aa15f3..4711625b 100644 --- a/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h +++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h @@ -28,9 +28,9 @@ #define _LLD_GINPUT_MOUSE_CONFIG_H
#define GINPUT_MOUSE_EVENT_TYPE GEVENT_TOUCH
-#define GINPUT_MOUSE_NEED_CALIBRATION FALSE
+#define GINPUT_MOUSE_NEED_CALIBRATION TRUE
#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE FALSE
-#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR -1
+#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR 10
#define GINPUT_MOUSE_READ_CYCLES 4
#define GINPUT_MOUSE_POLL_PERIOD 100
#define GINPUT_MOUSE_MAX_CLICK_JITTER 4
|