From a4edddf523f10fdc60da3a820244546cdd52bcf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
Date: Mon, 7 Jun 2010 06:31:26 +0200
Subject: [PATCH] Canon LiDE 100 motor tuning

---
 ChangeLog                 | 4 ++++
 backend/genesys_devices.c | 8 ++++----
 backend/genesys_gl847.c   | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 27c5110b0..db98853bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-07 Stéphane Voltz <stef.dev@free.fr>
+	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
+	LiDE 100 motor fine tuning
+
 2010-06-03 Stéphane Voltz <stef.dev@free.fr>
 	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
 	doc/descriptions/genesys.desc:
diff --git a/backend/genesys_devices.c b/backend/genesys_devices.c
index f58ac29f1..896470bb4 100644
--- a/backend/genesys_devices.c
+++ b/backend/genesys_devices.c
@@ -786,8 +786,8 @@ static Genesys_Motor Motor[] = {
    1,   /* maximum power modes count */
    { /* motor slopes */
 	   { /* power mode 0 */
-		   {   2034,    800, 80, 0.50}, /* full step */
-    		   {   8136,   3200, 80, 0.50}, /* half step */
+		   {   2034,    900, 80, 0.50}, /* full step */
+    		   {   8136,   1800, 80, 0.30}, /* half step */
     		   { 3*2712, 3*2712, 16, 0.80}, /* quarter step 0.75*2712 */
 	   },
     },
@@ -927,8 +927,8 @@ static Genesys_Model canon_lide_100_model = {
   GENESYS_GL847,
   NULL,
 
-  {1200, 600, 300, 150, 100, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 100, 75, 0},	/* possible y-resolutions */
+  {1200, 600, 300, 200, 100, 75, 0},	/* possible x-resolutions */
+  {1200, 600, 300, 200, 100, 75, 0},	/* possible y-resolutions */
   {16, 8, 0},			/* possible depths in gray mode */
   {16, 8, 0},			/* possible depths in color mode */
 
diff --git a/backend/genesys_gl847.c b/backend/genesys_gl847.c
index 0af710d84..1e95d6a5e 100644
--- a/backend/genesys_gl847.c
+++ b/backend/genesys_gl847.c
@@ -1830,9 +1830,9 @@ independent of our calculated values:
   slope_dpi = slope_dpi * (1 + dummy);
 
   /* scan_step_type */
-  if (yres * 4 < dev->motor.base_ydpi || dev->motor.max_step_type <= 0)
+  if (slope_dpi * 4 <= dev->motor.base_ydpi || dev->motor.max_step_type <= 0)
     scan_step_type = 0;
-  else if (yres * 4 < dev->motor.base_ydpi * 2
+  else if (slope_dpi * 4 <= dev->motor.base_ydpi * 2
 	   || dev->motor.max_step_type <= 1)
     scan_step_type = 1;
   else
@@ -3442,7 +3442,7 @@ gl847_init_regs_for_scan (Genesys_Device * dev)
   DBG (DBG_info, "gl847_init_regs_for_scan: move=%f steps\n", move);
 
   /* at high res we do fast move to scan area */
-  if(dev->settings.xres>=300)
+  if(dev->settings.xres>200)
     {
       status = gl847_feed (dev, move);
       if (status != SANE_STATUS_GOOD)