Convert FT5x06 mouse driver to newmouse (untested)

3 files changed, 93 insertions, 143 deletions

diff --git a/boards/base/Marlin/ginput_lld_mouse_board.h b/boards/base/Marlin/ginput_lld_mouse_board.h
deleted file mode 100644
index d787d224..00000000
--- a/boards/base/Marlin/ginput_lld_mouse_board.h
+++ /dev/null
@@ -1,111 +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
- */
-
-/**
- * @file    drivers/ginput/touch/FT5x06/ginput_lld_mouse_board_marlin.h
- * @brief   GINPUT Touch low level driver source for the FT5x06.
- *
- * @defgroup Mouse Mouse
- * @ingroup GINPUT
- * @{
- */
-
-#ifndef _GINPUT_LLD_MOUSE_BOARD_H
-#define _GINPUT_LLD_MOUSE_BOARD_H
-
-/* I2C interface #2 - Touchscreen controller */
-static const I2CConfig i2ccfg2 = {
-    OPMODE_I2C,
-    400000,
-    FAST_DUTY_CYCLE_2,
-};
-
-/**
- * @brief   Initialise the board for the touch.
- *
- * @notapi
- */
-static void init_board(void) {
-
-}
-
-
-/**
- * @brief	Write a value into a certain register
- *
- * @param[in] reg	The register address
- * @param[in] n		The amount of bytes (one or two)
- * @param[in] val	The value
- *
- * @notapi
- */
-static void write_reg(uint8_t reg, uint8_t n, uint16_t val) {
-	uint8_t txbuf[3];
-
-	i2cAcquireBus(&I2CD2);
-
-	txbuf[0] = reg;
-
-	if (n == 1) {
-		txbuf[1] = val;
-		i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, txbuf, 2, 0, 0, MS2ST(FT5x06_TIMEOUT));
-	} else if (n == 2) {
-		txbuf[1] = ((val & 0xFF00) >> 8);
-		txbuf[2] = (val & 0x00FF);
-		i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, txbuf, 3, 0, 0, MS2ST(FT5x06_TIMEOUT));
-	}
-	
-	i2cReleaseBus(&I2CD2);
-}
- 
-/**
- * @brief	Read the value of a certain register
- *
- * @param[in] reg	The register address
- * @param[in] n		The amount of bytes (one or two)
- *
- * @return Data read from device (one byte or two depending on n param)
- *
- * @notapi
- */
-static uint16_t read_reg(uint8_t reg, uint8_t n) {
-	uint8_t txbuf[1], rxbuf[2];
-	uint16_t ret;
-
-	rxbuf[0] = 0;
-	rxbuf[1] = 0;
-
-	i2cAcquireBus(&I2CD2);
-
-	txbuf[0] = reg;
-	i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, txbuf, 1, rxbuf, n, MS2ST(FT5x06_TIMEOUT));
-
-	if (n == 1) {
-		ret = rxbuf[0];
-	} else if (n == 2) {
-		ret = ((rxbuf[0] << 8) | (rxbuf[1] & 0xFF));
-	}
-
-	i2cReleaseBus(&I2CD2);
-
-	return ret;
-}
-
-static void read_reg_n(uint8_t reg, uint8_t n, uint8_t *rxbuf) {
-	uint8_t txbuf[1];
-
-	i2cAcquireBus(&I2CD2);
-
-	txbuf[0] = reg;
-	i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, txbuf, 1, rxbuf, n, MS2ST(FT5x06_TIMEOUT));
-
-	i2cReleaseBus(&I2CD2);
-}
-
-#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
-/** @} */
-
diff --git a/boards/base/Marlin/ginput_lld_mouse_config.h b/boards/base/Marlin/ginput_lld_mouse_config.h
deleted file mode 100644
index 57d3f135..00000000
--- a/boards/base/Marlin/ginput_lld_mouse_config.h
+++ /dev/null
@@ -1,32 +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
- */
-
-/**
- * @file    drivers/ginput/touch/STMPE811/ginput_lld_mouse_config.h
- * @brief   GINPUT LLD header file for mouse/touch driver.
- *
- * @defgroup Mouse Mouse
- * @ingroup GINPUT 
- *
- * @{
- */
-
-#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		15
-#define GINPUT_MOUSE_READ_CYCLES				1
-#define GINPUT_MOUSE_POLL_PERIOD				25
-#define GINPUT_MOUSE_MAX_CLICK_JITTER			10
-#define GINPUT_MOUSE_MAX_MOVE_JITTER			5
-#define GINPUT_MOUSE_CLICK_TIME					450
-
-#endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
-/** @} */
diff --git a/boards/base/Marlin/gmouse_lld_FT5x06_board.h b/boards/base/Marlin/gmouse_lld_FT5x06_board.h
new file mode 100644
index 00000000..ac961d0e
--- /dev/null
+++ b/boards/base/Marlin/gmouse_lld_FT5x06_board.h
@@ -0,0 +1,93 @@
+/*
+ * 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
+
+// Resolution and Accuracy Settings
+#define GMOUSE_FT5x06_PEN_CALIBRATE_ERROR		8
+#define GMOUSE_FT5x06_PEN_CLICK_ERROR			6
+#define GMOUSE_FT5x06_PEN_MOVE_ERROR			4
+#define GMOUSE_FT5x06_FINGER_CALIBRATE_ERROR	14
+#define GMOUSE_FT5x06_FINGER_CLICK_ERROR		18
+#define GMOUSE_FT5x06_FINGER_MOVE_ERROR			14
+
+// How much extra data to allocate at the end of the GMouse structure for the board's use
+#define GMOUSE_FT5x06_BOARD_DATA_SIZE			0
+
+// Set this to TRUE if you want self-calibration.
+//	NOTE:	This is not as accurate as real calibration.
+//			It requires the orientation of the touch panel to match the display.
+//			It requires the active area of the touch panel to exactly match the display size.
+#define GMOUSE_FT5x06_SELF_CALIBRATE			FALSE
+
+/* I2C interface #2 - Touchscreen controller */
+static const I2CConfig i2ccfg2 = {
+    OPMODE_I2C,
+    400000,
+    FAST_DUTY_CYCLE_2,
+};
+
+static bool_t init_board(GMouse* m, unsigned driverinstance) {
+	(void)		m;
+
+	// We only support one of these on this board
+	if (driverinstance)
+		return FALSE;
+	return TRUE;
+}
+
+static inline void aquire_bus(GMouse* m) {
+	(void)		m;
+
+}
+
+static inline void release_bus(GMouse* m) {
+	(void)		m;
+
+}
+
+static void write_reg(GMouse* m, uint8_t reg, uint8_t val) {
+	uint8_t txbuf[2];
+	(void)		m;
+
+	txbuf[0] = reg;
+	txbuf[1] = val;
+
+	i2cAcquireBus(&I2CD2);
+	i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, txbuf, 2, 0, 0, MS2ST(FT5x06_TIMEOUT));
+	i2cReleaseBus(&I2CD2);
+}
+
+static uint8_t read_byte(GMouse* m, uint8_t reg) {
+	uint8_t		rxbuf[1];
+	(void)		m;
+
+	rxbuf[0] = 0;
+
+	i2cAcquireBus(&I2CD2);
+	i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, &reg, 1, rxbuf, 1, MS2ST(FT5x06_TIMEOUT));
+	i2cReleaseBus(&I2CD2);
+
+	return rxbuf[0];
+}
+
+static uint16_t read_word(GMouse* m, uint8_t reg) {
+	uint8_t		rxbuf[2];
+	(void)		m;
+
+	rxbuf[0] = 0;
+	rxbuf[1] = 0;
+
+	i2cAcquireBus(&I2CD2);
+	i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, &reg, 1, rxbuf, 2, MS2ST(FT5x06_TIMEOUT));
+	i2cReleaseBus(&I2CD2);
+
+	return (((uint16_t)rxbuf[0]) << 8) | rxbuf[1];
+}
+
+#endif /* _GINPUT_LLD_MOUSE_BOARD_H */