From 8758d7de00b0ddcca5073bb1ea03f15ec2ab7486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Voltz?= Date: Tue, 26 Jan 2010 21:20:49 +0100 Subject: [PATCH] more hp3670 experiments --- backend/genesys_gl646.c | 13 ++++--------- backend/genesys_gl646.h | 24 +++++++++++------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c index ffc9c259c..2927d0305 100644 --- a/backend/genesys_gl646.c +++ b/backend/genesys_gl646.c @@ -814,10 +814,9 @@ gl646_setup_registers (Genesys_Device * dev, regs[reg_0x01].value &= ~REG01_DVDSET; } + regs[reg_0x01].value &= ~REG01_FASTMOD; if (motor->fastmod) regs[reg_0x01].value |= REG01_FASTMOD; - else - regs[reg_0x01].value &= ~REG01_FASTMOD; /* R02 */ /* allow moving when buffer full by default */ @@ -902,10 +901,6 @@ gl646_setup_registers (Genesys_Device * dev, regs[reg_0x05].value |= REG05_GMMENB; else regs[reg_0x05].value &= ~REG05_GMMENB; - if (dev->model->flags & GENESYS_FLAG_NO_CALIBRATION) - { - regs[reg_0x05].value &= ~REG05_GMMENB; - } /* true CIS gray if needed */ if (dev->model->is_cis == SANE_TRUE && color == SANE_TRUE @@ -1617,8 +1612,8 @@ gl646_send_slope_table (Genesys_Device * dev, int table_nr, int i; #endif - DBG (DBG_proc, "gl646_send_slope_table (table_nr = %d, steps = %d)\n", - table_nr, steps); + DBG (DBG_proc, "gl646_send_slope_table (table_nr = %d, steps = %d)=%d .. %d\n", + table_nr, steps, slope_table[0],slope_table[steps-1]); dpihw = dev->reg[reg_0x05].value >> 6; @@ -4486,7 +4481,7 @@ gl646_init (Genesys_Device * dev) sanei_genesys_write_register (dev, 0x66, 0x00); sanei_genesys_write_register (dev, 0x66, 0x10); } - if (dev->model->ccd_type == CCD_HP3670) + if (dev->model->ccd_type == CCD_HP3670+12345) /* XXX STEF XXX */ { sanei_genesys_write_register (dev, 0x68, dev->gpo.enable[0]); sanei_genesys_write_register (dev, 0x69, dev->gpo.enable[1]); diff --git a/backend/genesys_gl646.h b/backend/genesys_gl646.h index bb2f80559..61b0924d3 100644 --- a/backend/genesys_gl646.h +++ b/backend/genesys_gl646.h @@ -58,8 +58,6 @@ #undef BACKEND_NAME #define BACKEND_NAME genesys_gl646 -#define UNIT_TESTING 1 - #include "../include/sane/sanei_backend.h" #include "../include/sane/sanei_config.h" #include "../include/sane/sanei_usb.h" @@ -511,18 +509,18 @@ static Sensor_Master sensor_master[] = { */ static Motor_Master motor_master[] = { /* HP3670 motor settings */ - {MOTOR_HP3670, 50, SANE_TRUE , 50, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 229, 2329, 120, 192, 3399, 341, 0.3, 0.4, 192}, - {MOTOR_HP3670, 100, SANE_TRUE , 100, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 143, 2905, 187, 192, 3399, 341, 0.3, 0.4, 96}, - {MOTOR_HP3670, 150, SANE_TRUE , 150, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 73, 3429, 305, 192, 3399, 341, 0.3, 0.4, 96}, - {MOTOR_HP3670, 300, SANE_TRUE , 300, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 11, 1055, 563, 192, 3399, 341, 0.3, 0.4, 96}, - {MOTOR_HP3670, 600, SANE_TRUE , 600, FULL_STEP, SANE_FALSE, SANE_TRUE , 0, 3, 10687, 5126, 192, 3399, 341, 0.3, 0.4, 96}, - {MOTOR_HP3670,1200, SANE_TRUE ,1200, HALF_STEP, SANE_FALSE, SANE_TRUE , 0, 3, 12751,12751, 192, 3399, 341, 0.3, 0.4, 96}, + {MOTOR_HP3670, 50, SANE_TRUE , 50, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 229, 2329, 120, 200, 3399, 337, 0.3, 0.5, 192}, + {MOTOR_HP3670, 100, SANE_TRUE , 100, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 143, 2905, 374, 192, 3399, 426, 0.3, 0.4, 192}, + {MOTOR_HP3670, 150, SANE_TRUE , 150, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 73, 3429, 305, 192, 3399, 341, 0.3, 0.4, 192}, + {MOTOR_HP3670, 300, SANE_TRUE , 300, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 11, 1055, 563, 192, 3399, 341, 0.3, 0.4, 192}, + {MOTOR_HP3670, 600, SANE_TRUE , 600, FULL_STEP, SANE_FALSE, SANE_TRUE , 0, 3, 10687, 5126, 192, 3399, 341, 0.3, 0.4, 192}, + {MOTOR_HP3670,1200, SANE_TRUE ,1200, HALF_STEP, SANE_FALSE, SANE_TRUE , 0, 3, 12751,12751, 192, 3399, 341, 0.3, 0.4, 192}, {MOTOR_HP3670, 50, SANE_FALSE, 50, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 229, 2329, 120, 192, 3399, 341, 0.3, 0.4, 192}, - {MOTOR_HP3670, 100, SANE_FALSE, 100, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 143, 2905, 187, 192, 3399, 341, 0.3, 0.4, 96}, - {MOTOR_HP3670, 150, SANE_FALSE, 150, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 73, 3429, 305, 192, 3399, 341, 0.3, 0.4, 96}, - {MOTOR_HP3670, 300, SANE_FALSE, 300, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 11, 1055, 563, 192, 3399, 341, 0.3, 0.4, 96}, - {MOTOR_HP3670, 600, SANE_FALSE, 600, FULL_STEP, SANE_FALSE, SANE_TRUE , 0, 3, 10687, 5126, 192, 3399, 341, 0.3, 0.4, 96}, - {MOTOR_HP3670,1200, SANE_FALSE,1200, HALF_STEP, SANE_FALSE, SANE_TRUE , 0, 3, 12751,12751, 192, 3399, 341, 0.3, 0.4, 96}, + {MOTOR_HP3670, 100, SANE_FALSE, 100, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 143, 2905, 187, 192, 3399, 341, 0.3, 0.4, 192}, + {MOTOR_HP3670, 150, SANE_FALSE, 150, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 73, 3429, 305, 192, 3399, 341, 0.3, 0.4, 192}, + {MOTOR_HP3670, 300, SANE_FALSE, 300, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 11, 1055, 563, 192, 3399, 341, 0.3, 0.4, 192}, + {MOTOR_HP3670, 600, SANE_FALSE, 600, FULL_STEP, SANE_FALSE, SANE_TRUE , 0, 3, 10687, 5126, 192, 3399, 341, 0.3, 0.4, 192}, + {MOTOR_HP3670,1200, SANE_FALSE,1200, HALF_STEP, SANE_FALSE, SANE_TRUE , 0, 3, 12751,12751, 192, 3399, 341, 0.3, 0.4, 192}, /* HP2400/G2410 motor settings base motor dpi = 600 */ {MOTOR_HP2400, 50, SANE_TRUE, 50, HALF_STEP, SANE_FALSE, SANE_FALSE, 63, 4, 1382, 800, 2, 5400, 5400, 0.25, 0.5, 16},