Update Olimex-STM32-LCD mouse board file for newmouse MCU driver.

Still to be tested and tuned on real hardware.

3 files changed, 137 insertions, 148 deletions

diff --git a/boards/base/Olimex-STM32-LCD/ginput_lld_mouse_board.h b/boards/base/Olimex-STM32-LCD/ginput_lld_mouse_board.h
deleted file mode 100644
index 91575527..00000000
--- a/boards/base/Olimex-STM32-LCD/ginput_lld_mouse_board.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- *              http://ugfx.org/license.html
- */
-
-#ifndef _GINPUT_LLD_MOUSE_BOARD_H
-#define _GINPUT_LLD_MOUSE_BOARD_H
-
-#define ADC_NUM_CHANNELS   2
-#define ADC_BUF_DEPTH      1
-
-static const ADCConversionGroup adc_y_config = { 
-    FALSE,
-    ADC_NUM_CHANNELS,
-    0,
-    0,
-    0, 0,    
-    0, 0,    
-    ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS),
-    0,    
-    ADC_SQR3_SQ2_N(ADC_CHANNEL_IN12) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN13)
-};
-
-static const ADCConversionGroup adc_x_config = { 
-    FALSE,
-    ADC_NUM_CHANNELS,
-    0,
-    0,
-    0, 0,
-    0, 0,
-    ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS),
-    0,  
-    ADC_SQR3_SQ2_N(ADC_CHANNEL_IN10) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN11)
-};
-
-static inline void init_board(void) {
-	adcStart(&ADCD1, 0);
-}
-
-static inline void aquire_bus(void) {
-
-}
-
-static inline void release_bus(void) {
-
-}
-
-static inline void setup_x(void) {
-	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);
-
-	palSetPad(GPIOC, 2);
-	palClearPad(GPIOC, 3); 
-	gfxSleepMilliseconds(1);
-}
-
-static inline void setup_y(void) {
-	palSetPadMode(GPIOC, 2, PAL_MODE_INPUT_ANALOG);
-	palSetPadMode(GPIOC, 3, PAL_MODE_INPUT_ANALOG);
-	palSetPadMode(GPIOC, 0, PAL_MODE_OUTPUT_PUSHPULL);
-	palSetPadMode(GPIOC, 1, PAL_MODE_OUTPUT_PUSHPULL);
-
-	palSetPad(GPIOC, 1);
-	palClearPad(GPIOC, 0);
-	gfxSleepMilliseconds(1);
-}
-
-static inline void setup_z(void) {
-	palSetPadMode(GPIOC, 0, PAL_MODE_INPUT_PULLDOWN);
-	palSetPadMode(GPIOC, 1, PAL_MODE_INPUT);
-	palSetPadMode(GPIOC, 2, PAL_MODE_INPUT);
-	palSetPadMode(GPIOC, 3, PAL_MODE_OUTPUT_PUSHPULL);
-	palSetPad(GPIOC, 3);
-}
-
-static inline uint16_t read_x(void) {
-	uint16_t val1, val2;
-    adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
-
-	palSetPad(GPIOC, 2);
-    palClearPad(GPIOC, 3); 
-    gfxSleepMilliseconds(1);
-    adcConvert(&ADCD1, &adc_x_config, samples, ADC_BUF_DEPTH);  
-    val1 = ((samples[0] + samples[1])/2);
-    
-	palClearPad(GPIOC, 2);
-    palSetPad(GPIOC, 3);
-    gfxSleepMilliseconds(1);
-    adcConvert(&ADCD1, &adc_x_config, samples, ADC_BUF_DEPTH);
-    val2 = ((samples[0] + samples[1])/2);
-    
-	return ((val1+((1<<12)-val2))/4);
-}
-
-static inline uint16_t read_y(void) {
-	uint16_t val1, val2;
-    adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
-
-    palSetPad(GPIOC, 1);
-    palClearPad(GPIOC, 0);
-    gfxSleepMilliseconds(1);
-    adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);
-    val1 = ((samples[0] + samples[1])/2);
-
-    palClearPad(GPIOC, 1);
-    palSetPad(GPIOC, 0);
-    gfxSleepMilliseconds(1);
-    adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);
-    val2 = ((samples[0] + samples[1])/2);
-    
-	return ((val1+((1<<12)-val2))/4);
-}
-
-static inline uint16_t read_z(void) {
-	if (palReadPad(GPIOC, 0))
-		return 100;
-	else
-		return 0;
-}
-
-#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
-
diff --git a/boards/base/Olimex-STM32-LCD/ginput_lld_mouse_config.h b/boards/base/Olimex-STM32-LCD/ginput_lld_mouse_config.h
deleted file mode 100644
index e8362219..00000000
--- a/boards/base/Olimex-STM32-LCD/ginput_lld_mouse_config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- *              http://ugfx.org/license.html
- */
-
-#ifndef _LLD_GINPUT_MOUSE_CONFIG_H
-#define _LLD_GINPUT_MOUSE_CONFIG_H
-
-#define GINPUT_MOUSE_EVENT_TYPE					GEVENT_TOUCH
-#define GINPUT_MOUSE_NEED_CALIBRATION			TRUE
-#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	FALSE
-#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		12
-#define GINPUT_MOUSE_READ_CYCLES				1
-#define GINPUT_MOUSE_POLL_PERIOD				25
-#define GINPUT_MOUSE_MAX_CLICK_JITTER			2
-#define GINPUT_MOUSE_MAX_MOVE_JITTER			2
-#define GINPUT_MOUSE_CLICK_TIME					500
-
-#endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
-
diff --git a/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h b/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h
new file mode 100644
index 00000000..8f085f84
--- /dev/null
+++ b/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h
@@ -0,0 +1,137 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+#ifndef _LLD_GMOUSE_MCU_BOARD_H
+#define _LLD_GMOUSE_MCU_BOARD_H
+
+// We directly define the jitter settings
+#define GMOUSE_MCU_PEN_CALIBRATE_ERROR		8
+#define GMOUSE_MCU_PEN_CLICK_ERROR			6
+#define GMOUSE_MCU_PEN_MOVE_ERROR			4
+#define GMOUSE_MCU_FINGER_CALIBRATE_ERROR	14
+#define GMOUSE_MCU_FINGER_CLICK_ERROR		18
+#define GMOUSE_MCU_FINGER_MOVE_ERROR		14
+
+// Now board specific settings...
+
+#define ADC_NUM_CHANNELS   2
+#define ADC_BUF_DEPTH      1
+
+static const ADCConversionGroup adc_y_config = {
+    FALSE,
+    ADC_NUM_CHANNELS,
+    0,
+    0,
+    0, 0,
+    0, 0,
+    ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS),
+    0,
+    ADC_SQR3_SQ2_N(ADC_CHANNEL_IN12) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN13)
+};
+
+static const ADCConversionGroup adc_x_config = {
+    FALSE,
+    ADC_NUM_CHANNELS,
+    0,
+    0,
+    0, 0,
+    0, 0,
+    ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS),
+    0,
+    ADC_SQR3_SQ2_N(ADC_CHANNEL_IN10) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN11)
+};
+
+#define BOARD_DATA_SIZE		0			// How many extra bytes to add on the end of the mouse structure for the board's use
+
+#define Z_MIN				0			// The minimum Z reading
+#define Z_MAX				1			// The maximum Z reading
+#define Z_TOUCHON			1			// Values between this and Z_MAX are definitely pressed
+#define Z_TOUCHOFF			0			// Values between this and Z_MIN are definitely not pressed
+
+static inline void setup_z(void) {
+	palSetPadMode(GPIOC, 0, PAL_MODE_INPUT_PULLDOWN);
+	palSetPadMode(GPIOC, 1, PAL_MODE_INPUT);
+	palSetPadMode(GPIOC, 2, PAL_MODE_INPUT);
+	palSetPadMode(GPIOC, 3, PAL_MODE_OUTPUT_PUSHPULL);
+	palSetPad(GPIOC, 3);
+}
+
+static bool_t init_board(GMouse *m, unsigned driverinstance) {
+	(void)	m;
+
+	// Only one touch interface on this board
+	if (driverinstance)
+		return FALSE;
+
+	adcStart(&ADCD1, 0);
+
+	// Set up for reading Z
+	setup_z();
+    chThdSleepMilliseconds(1);				// Settling time
+	return TRUE;
+}
+
+static void read_xyz(GMouse *m, GMouseReading *prd) {
+	adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
+	uint16_t val1, val2;
+	(void)		m;
+
+	// No buttons and assume touch off
+	prd->buttons = 0;
+	prd->z = 0;
+
+	// Get the z reading (assumes we are ready to read z)
+    // Take a shortcut and don't read x, y if we know we are definitely not touched.
+	if (palReadPad(GPIOC, 0)) {
+		prd->z = 1;
+
+		// Get the x reading - Weird but it works. Optimize later.
+		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);
+
+		palSetPad(GPIOC, 2);
+	    palClearPad(GPIOC, 3);
+	    gfxSleepMilliseconds(1);
+	    adcConvert(&ADCD1, &adc_x_config, samples, ADC_BUF_DEPTH);
+	    val1 = ((samples[0] + samples[1])/2);
+
+		palClearPad(GPIOC, 2);
+	    palSetPad(GPIOC, 3);
+	    gfxSleepMilliseconds(1);
+	    adcConvert(&ADCD1, &adc_x_config, samples, ADC_BUF_DEPTH);
+	    val2 = ((samples[0] + samples[1])/2);
+
+	    prd->x = ((val1+((1<<12)-val2))/4);
+
+		// Get the y reading - Weird but it works. Optimize later.
+		palSetPadMode(GPIOC, 2, PAL_MODE_INPUT_ANALOG);
+		palSetPadMode(GPIOC, 3, PAL_MODE_INPUT_ANALOG);
+		palSetPadMode(GPIOC, 0, PAL_MODE_OUTPUT_PUSHPULL);
+		palSetPadMode(GPIOC, 1, PAL_MODE_OUTPUT_PUSHPULL);
+
+	    palSetPad(GPIOC, 1);
+	    palClearPad(GPIOC, 0);
+	    gfxSleepMilliseconds(1);
+	    adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);
+	    val1 = ((samples[0] + samples[1])/2);
+
+	    palClearPad(GPIOC, 1);
+	    palSetPad(GPIOC, 0);
+	    gfxSleepMilliseconds(1);
+	    adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);
+	    val2 = ((samples[0] + samples[1])/2);
+
+	    prd->y = ((val1+((1<<12)-val2))/4);
+
+		// Set up for reading z again. We know it will be 20ms before we get called again so don't worry about settling time
+	    setup_z();
+    }
+}
+
+#endif /* _LLD_GMOUSE_MCU_BOARD_H */