From f115d43753c5bf6d6d0cf13e543125d1f2622682 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Mon, 17 Dec 2012 22:33:00 +0100
Subject: [PATCH] SSD1289 calibration clear fix

---
 drivers/gdisp/SSD1289/gdisp_lld.c                  |  1 +
 drivers/gdisp/SSD1289/gdisp_lld_config.h           |  1 -
 drivers/ginput/touch/MCU/ginput_lld_mouse_config.h | 10 +++++-----
 src/ginput/mouse.c                                 |  5 -----
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c
index 0f000637..8e9cee34 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld.c
@@ -292,6 +292,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	void GDISP_LLD(clear)(color_t color) {
 	    unsigned i;
 
+		reset_viewport();
 		acquire_bus();
 	    set_cursor(0, 0);
 	    stream_start();
diff --git a/drivers/gdisp/SSD1289/gdisp_lld_config.h b/drivers/gdisp/SSD1289/gdisp_lld_config.h
index 1863ce04..dafbc90f 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_config.h
@@ -36,7 +36,6 @@
 /*===========================================================================*/
 
 #define GDISP_DRIVER_NAME				"SSD1289"
-#define IS_THIS_SSD1289 134038	/* very dirty fix until reset_viewport works */
 #define GDISP_LLD(x)					gdisp_lld_##x##_SSD1289
 
 #define GDISP_HARDWARE_CLEARS			TRUE
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h
index 4711625b..b1d754f0 100644
--- a/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h
@@ -30,12 +30,12 @@
 #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		10
+#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		12
 #define GINPUT_MOUSE_READ_CYCLES				4
-#define GINPUT_MOUSE_POLL_PERIOD				100
-#define GINPUT_MOUSE_MAX_CLICK_JITTER			4
-#define GINPUT_MOUSE_MAX_MOVE_JITTER			4
-#define GINPUT_MOUSE_CLICK_TIME					700
+#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/src/ginput/mouse.c b/src/ginput/mouse.c
index a6ebd98e..5f1fec4d 100644
--- a/src/ginput/mouse.c
+++ b/src/ginput/mouse.c
@@ -528,11 +528,6 @@ bool_t ginputCalibrateMouse(uint16_t instance) {
 			MouseConfig.flags |= FLG_CAL_SAVED;
 		}
 	
-		/* FIX THIS PROPERLY!!! */
-		#if IS_THIS_SSD1289 == 134038
-		reset_viewport();	
-		#endif 
-		
 		return TRUE;
 	#endif
 }