From 91a186bce0c2acafa1af28cd68c2786bc4fdc0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Voltz?= Date: Sun, 5 Jun 2011 22:15:32 +0200 Subject: [PATCH] move ok at all resolution --- backend/genesys_gl847.c | 5 +++-- backend/genesys_gl847.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/genesys_gl847.c b/backend/genesys_gl847.c index 20642ee5b..66a982235 100644 --- a/backend/genesys_gl847.c +++ b/backend/genesys_gl847.c @@ -885,7 +885,7 @@ gl847_init_motor_regs_scan (Genesys_Device * dev, factor = gl847_get_step_multiplier (reg); use_fast_fed=0; - if(dev->settings.yres==1200 && feed_steps>100) + if(dev->settings.yres>=1200 && feed_steps>100) { use_fast_fed=1; } @@ -2581,7 +2581,8 @@ gl847_init_regs_for_scan (Genesys_Device * dev) move = (move * move_dpi) / MM_PER_INCH; DBG (DBG_info, "%s: move=%f steps\n",__FUNCTION__, move); - if(dev->settings.yres>1200) + /* unused for now */ + if(dev->settings.yres>31200) { status = gl847_feed (dev, move); if (status != SANE_STATUS_GOOD) diff --git a/backend/genesys_gl847.h b/backend/genesys_gl847.h index 3114d921d..3d5579072 100644 --- a/backend/genesys_gl847.h +++ b/backend/genesys_gl847.h @@ -573,7 +573,7 @@ static Motor_Profile gl847_motors[]={ {MOTOR_CANONLIDE200, 1432, 0, lide200_base}, {MOTOR_CANONLIDE200, 2712, 2, lide200_medium}, {MOTOR_CANONLIDE200, 5280, 3, lide200_high}, - {MOTOR_CANONLIDE200, 10416, 3, lide200_max}, + {MOTOR_CANONLIDE200, 10416, 3, lide200_high}, /* end of database entry */ {0, 0, 0, NULL}, };