switch to 5-point calibration to make it work on some newer Zaurii

this goes hand in hand with the integration of the RMK tslib calibration
algorithm into Qt/Embedded 2.3.x. Patch courtesy Richard Purdie.

2 files changed, 4 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 38b65c0..1c713ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,2 +67,3 @@
 	* Fix / Optimize number of scanned directories (ljp)
+	* Use five point mouse calibration to make calibrated mouse drivers work on newer Zaurii (rp,mickeyl)
 	
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp
index 5f52bdc..53388f1 100644
--- a/core/apps/calibrate/calibrate.cpp
+++ b/core/apps/calibrate/calibrate.cpp
@@ -126,3 +126,3 @@ bool Calibrate::sanityCheck()
 	// not needed anywhere .. just calculate it, so it's there
-	cd.devPoints[QWSPointerCalibrationData::Center] = QRect( tl, br ).normalize().center();
+	//cd.devPoints[QWSPointerCalibrationData::Center] = QRect( tl, br ).normalize().center();
 
@@ -177,3 +177,3 @@ void Calibrate::paintEvent( QPaintEvent * )
 	QPainter p( this );
-	int y = height() / 3;
+	int y = height() / 2;
 
@@ -225,3 +225,3 @@ void Calibrate::mouseReleaseEvent( QMouseEvent * )
 	cd.devPoints[ location ] = penPos;
-	if ( location < QWSPointerCalibrationData::TopRight ) {
+	if ( location < QWSPointerCalibrationData::Center ) {
 		location = (QWSPointerCalibrationData::Location) ( int( location ) + 1 );