Added support for CanoScan LiDE25.

backend/plustek-usb.c

@@ -39,6 +39,7 @@
  *        - cleanup
  * - 0.48 - added function usb_CheckAndCopyAdjs()
  * - 0.49 - changed autodetection
+ *        - added support for LiDE25 (pid 0x2220)
  * .
  * <hr>
  * This file is part of the SANE package.
@@ -1094,7 +1095,8 @@ static int usbDev_Prepare( Plustek_Device *dev, SANE_Byte *buf )
 	/* the CanoScan CIS devices need special handling... */
 	if((dev->usbDev.vendor == 0x04A9) &&    
 		(dev->usbDev.product==0x2206 || dev->usbDev.product==0x2207 ||
-		 dev->usbDev.product==0x220D || dev->usbDev.product==0x220E)) {
+		 dev->usbDev.product==0x220D || dev->usbDev.product==0x220E ||
+		 dev->usbDev.product==0x2220)) {
 		use_alt_cal = SANE_TRUE;
 		
 	} else {

backend/plustek-usbdevs.c

@@ -50,6 +50,7 @@
  *        - parameter tuning for CanoScan D660U
  *        - cleanup
  * - 0.49 - tweaked motor settings for EPSON and CANON1200
+ *        - added support for CanoScan LiDE25
  * .
  * <hr>
  * This file is part of the SANE package.
@@ -702,6 +703,24 @@ static DCapsDef Cap0x04A9_0x220E =
 	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
 };
 
+/* Canon LiDE25
+ */
+static DCapsDef Cap0x04A9_0x2220 =
+{
+	{{ 0, 100}, 50, 10, {2550, 3508}, {75, 75}, COLOR_BW },
+	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
+	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
+	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
+	{1200, 1200},
+	0,
+	SENSORORDER_rgb,
+	16,                 /* sensor distance                         */
+	3,                  /* number of buttons                       */
+	kCIS1240,           /* use default settings during calibration */
+	0,                  /* not used here...                        */
+	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
+};
+
 /******************* additional Hardware descriptions ************************/
 
 /** U24, UT12 and UT16
@@ -1443,8 +1462,8 @@ static HWDef Hw0x03F0_0x0605 =
 	0x04,	/* bReg_0x0c                                */
 	0x2F,	/* bReg_0x0d                                */
 	0x1F,	/* bReg_0x0e                                */
-		    /* bReg_0x0f_Mono[10] (0x0f to 0x18)        */
 
+	/* bReg_0x0f_Mono[10] (0x0f to 0x18)        */
 	{ 0x02, 0x07, 0x01, 0x02, 0x02, 0x03, 0x00, 0x00, 0x04, 0x07 },
 
 	/* bReg_0x0f_Color[10] (0x0f to 0x18)       */
@@ -1894,14 +1913,16 @@ static HWDef Hw0x1606_0x0160 =
 	0x77,   /* sensor control settings (reg 0x0d)        */
 	0x25,   /* sensor control settings (reg 0x0e)        */
 
-    {0x00, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x07, 0x03},
 	/* mono (reg 0x0f to 0x18) */
+	{0x00, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x07, 0x03},
 
-    {0x01, 0x0c, 0x0e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x0c},
 	/* color (reg 0x0f to 0x18)              */
+	{0x01, 0x0c, 0x0e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x0c},
+
 	_GREEN_CH,	/* bReg_0x26 color mode - bits 4 and 5   */
 	0x40,       /* bReg 0x27 color mode                  */
 	1,          /* bReg 0x29 illumination mode           */
+	
 	/* illumination mode settings (not used for CCD devices) */
 	{ 0, 0, 0, 0, 0, 0, 0 },
 	{ 0, 0, 0, 0, 0, 0, 0 },
@@ -2279,6 +2300,75 @@ static HWDef Hw0x04A9_0x220E =
 	2.0
 };
 
+/** Canon LiDE25 */
+static HWDef Hw0x04A9_0x2220 =
+{
+	0.72,   /* dMaxMotorSpeed (Max_Speed)                     */
+	0.30,   /* dMaxMoveSpeed (Max_Speed)                      */
+	0.0,    /* dHighSpeed                                     */
+	100,    /* wIntegrationTimeLowLamp                        */
+	100,    /* wIntegrationTimeHighLamp                       */
+	1200,   /* wMotorDpi (Full step DPI)                      */
+	512,    /* wRAMSize (KB)                                  */
+	3.75,   /* dMinIntegrationTimeLowres (ms)                 */
+	5.75,   /* dMinIntegrationTimeHighres (ms)                */
+	   0,   /* wGreenPWMDutyCycleLow (reg 0x2a + 0x2b)        */
+	   0,   /* wGreenPWMDutyCycleHigh (reg 0x2a + 0x2b)       */
+
+	0x11,   /* bSensorConfiguration (0x0b)                    */
+	0x4d,   /* sensor control settings (reg 0x0c)             */
+	0x2f,   /* sensor control settings (reg 0x0d)             */
+	0x00,   /* sensor control settings (reg 0x0e)             */
+
+	{0x00, 0x00, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x07},
+	       /* mono (reg 0x0f to 0x18)                        */
+
+	{0x00, 0x00, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x07},
+	      /* color (reg 0x0f to 0x18)                       */
+
+	(_BLUE_CH | _ONE_CH_COLOR), /* bReg_0x26 color mode       */
+
+	0x00,   /* bReg 0x27 color mode                           */
+	2,      /* bReg 0x29 illumination mode                    */
+
+	{ 3,  0,    0,  50,  3000,  0,     0 },
+	{ 2, 50, 16383, 50, 16383, 50, 16383 },
+
+	1,      /* StepperPhaseCorrection (reg 0x1a + 0x1b)       */
+	0,      /* bOpticBlackStart (reg 0x1c)                    */
+	0,      /* bOpticBlackEnd (reg 0x1d)                      */
+	0x7f,   /* wActivePixelsStart (reg 0x1e + 0x1f)           */
+	10559,  /* wLineEnd (reg 0x20 + 0x21)                     */
+
+	50,     /* red lamp on    (reg 0x2c + 0x2d)               */
+	16383,  /* red lamp off   (reg 0x2e + 0x2f)               */
+	50,     /* green lamp on  (reg 0x30 + 0x31)               */
+	16383,  /* green lamp off (reg 0x32 + 0x33)               */
+	50,     /* blue lamp on   (reg 0x34 + 0x35)               */
+	16383,  /* blue lamp off  (reg 0x36 + 0x37)               */
+
+	3,      /* stepper motor control (reg 0x45)               */
+	0,      /* wStepsAfterPaperSensor2 (reg 0x4c + 0x4d)      */
+	0x20,   /* steps to reverse when buffer is full reg 0x50) */
+	0xfc,   /* acceleration profile (reg 0x51)                */
+	0,      /* lines to process (reg 0x54)                    */
+	0x0f,   /* kickstart (reg 0x55)                           */
+	0x08,   /* pwm freq (reg 0x56)                            */
+	0x1f,   /* pwm duty cycle (reg 0x57)                      */
+
+	0x04,   /* Paper sense (reg 0x58)                         */
+
+	0x66,   /* misc io12 (reg 0x59)                           */
+	0x16,   /* misc io34 (reg 0x5a)                           */
+	0x91,   /* misc io56 (reg 0x5b)                           */
+	0x01,   /* test mode ADC Output CODE MSB (reg 0x5c)       */
+	0,      /* test mode ADC Output CODE LSB (reg 0x5d)       */
+	0,      /* test mode (reg 0x5e)                           */
+	_LM9833,
+	MODEL_CANON1200,
+	2.0
+};
+
 /******************** all available combinations *****************************/
 
 /** here we have all supported devices and their settings...
@@ -2348,6 +2438,7 @@ static SetDef Settings[] =
 	{"0x04A9-0x2208",   &Cap0x04A9_0x2208, &Hw0x04A9_0x2208, "D660U"       },
 	{"0x04A9-0x220D",   &Cap0x04A9_0x220D, &Hw0x04A9_0x220D, "N670U/N676U/LiDE20" },
 	{"0x04A9-0x220E",   &Cap0x04A9_0x220E, &Hw0x04A9_0x220E, "N1240U/LiDE30"      },
+	{"0x04A9-0x2220",   &Cap0x04A9_0x2220, &Hw0x04A9_0x2220, "LiDE25"      },
 
 	/* Please add other devices here...
 	 * The first entry is a string, composed out of the vendor and product id,