ADS7843 porting - not tested yet!

2 files changed, 21 insertions, 24 deletions

diff --git a/boards/base/FireBull-STM32F103-FB/ginput_lld_mouse_config.h b/boards/base/FireBull-STM32F103-FB/ginput_lld_mouse_config.h
deleted file mode 100644
index f3a89208..00000000
--- a/boards/base/FireBull-STM32F103-FB/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				4
-#define GINPUT_MOUSE_POLL_PERIOD				3
-#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/FireBull-STM32F103-FB/ginput_lld_mouse_board.h b/boards/base/FireBull-STM32F103-FB/gmouse_lld_ADS7843_board.h
index 6ca1a897..aa3a41e7 100644
--- a/boards/base/FireBull-STM32F103-FB/ginput_lld_mouse_board.h
+++ b/boards/base/FireBull-STM32F103-FB/gmouse_lld_ADS7843_board.h
@@ -8,6 +8,13 @@
 #ifndef _GINPUT_LLD_MOUSE_BOARD_H
 #define _GINPUT_LLD_MOUSE_BOARD_H
 
+#define GMOUSE_ADS7843_PEN_CALIBRATE_ERROR		2
+#define GMOUSE_ADS7843_PEN_CLICK_ERROR			2
+#define GMOUSE_ADS7843_PEN_MOVE_ERROR			2
+#define GMOUSE_ADS7843_FINGER_CALIBRATE_ERROR	4
+#define GMOUSE_ADS7843_FINGER_CLICK_ERROR		4
+#define GMOUSE_ADS7843_FINGER_MOVE_ERROR		4
+
 static const SPIConfig spicfg = { 
     0,
 	GPIOC, 
@@ -15,13 +22,25 @@ static const SPIConfig spicfg = {
     /* SPI_CR1_BR_2 |*/ SPI_CR1_BR_1 | SPI_CR1_BR_0,
 };
 
-static inline void init_board(void)
+static bool_t init_board(GMouse* m, unsigned driverinstance)
 {
+	(void)m;
+
+	// Only one touch interface on this board
+	if (driverinstance)
+		return FALSE;
+	
+	// Set the GPIO modes
+	palSetPadMode(GPIOC, 4, PAL_MODE_INPUT);
+
+	// Start the SPI peripheral
 	spiStart(&SPID1, &spicfg);
+
+	return TRUE;
 }
 
 static inline bool_t getpin_pressed(void)
-{
+{	
 	return (!palReadPad(GPIOC, 4));
 }