Added Genius 3x as working scanner, removed testing flag. Added Artec 2000 e+

to manpage. Added detection for the Plustek OpticPro U16B.

ChangeLog

@@ -3,10 +3,11 @@
 	* backend/hp5400_internal.c backend/canon630u-common.c
 	  backend/epson_scsi.c: Minor compilation fixes for MacOS X and
 	  OS/2.
-	* backend/gt68xx.conf backend/gt68xx_devices.c doc/sane-gt68xx.man
+	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Added
+	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  Genius 3x as working scanner, removed testing flag. Added Artec
+	  doc/gt68xx/gt68xx.CHANGES: Added Genius 3x as working scanner,
-	  2000 e+ to manpage. Added detection for the Plustek OpticPro U16B.
+	  removed testing flag. Added Artec 2000 e+ to manpage. Added
+	  detection for the Plustek OpticPro U16B.
 
 2003-04-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
 

backend/gt68xx.c

@@ -48,7 +48,7 @@
 
 #include "../include/sane/config.h"
 
-#define BUILD 45
+#define BUILD 46
 #define MAX_DEBUG
 #define WARMUP_TIME 30
 #define CALIBRATION_HEIGHT 2.5

backend/gt68xx.conf

@@ -72,6 +72,10 @@ usb 0x043d 0x002d
 usb 0x07b3 0x0401
 usb 0x07b3 0x0400
 
+##############################################################################
+# Autodetect Plustek OpticPro U16B
+usb 0x07b3 0x0403
+
 ##############################################################################
 # Autodetect Genius Colorpage Vivid3x
 usb 0x0458 0x2011

backend/gt68xx_devices.c

@@ -808,6 +808,55 @@ static GT68xx_Model plustek_op1248u_model = {
   /* tested */
 };
 
+static GT68xx_Model plustek_u16b_model = {
+  "plustek-u16b",		/* Name */
+  "Plustek",			/* Device vendor string */
+  "OpticPro U16B",		/* Device model name */
+  "ccd68861.fw",		/* Name of the firmware file */
+  SANE_FALSE,			/* Dynamic allocation flag */
+
+  &plustek_gt6801_command_set,	/* Command set used by this scanner */
+
+  600,				/* maximum optical sensor resolution */
+  1200,				/* maximum motor resolution */
+  600,				/* base x-res used to calculate geometry */
+  600,				/* base y-res used to calculate geometry */
+  50,				/* if ydpi is equal or higher, use linemode */
+  SANE_TRUE,			/* Use base_ydpi for all resolutions */
+
+  {600, 300, 150, 75, 0},	/* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
+  {12, 8, 0},			/* possible depths in gray mode */
+  {12, 8, 0},			/* possible depths in color mode */
+
+  SANE_FIX (3.5),		/* Start of scan area in mm  (x) */
+  SANE_FIX (7.5),		/* Start of scan area in mm (y) */
+  SANE_FIX (218.0),		/* Size of scan area in mm (x) */
+  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+
+  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
+  SANE_FIX (1.0),		/* Start of black mark in mm (x) */
+
+  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+
+  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+
+  0, 8, 16,			/* RGB CCD Line-distance correction in pixel */
+  0,				/* CCD distcance for CCD with 6 lines) */
+
+  COLOR_ORDER_BGR,		/* Order of the CCD/CIS colors */
+  {0x1c, 0x29, 0x1c, 0x2c, 0x1c, 0x2b},	/* Default offset/gain */
+  {0x157, 0x157, 0x157},	/* Default exposure parameters */
+  SANE_FIX (2.0),		/* Default gamma value */
+
+  SANE_FALSE,			/* Is this a CIS scanner? */
+  GT68XX_FLAG_UNTESTED | GT68XX_FLAG_OFFSET_INV	/* Which flags are needed for this scanner? */
+  /* completely untested */
+};
+
 static GT68xx_Model genius_vivid3x_model  = {
   "genius-colorpage-vivid3x",	/* Name */
   "Genius",			/* Device vendor string */
@@ -853,8 +902,8 @@ static GT68xx_Model genius_vivid3x_model  = {
   SANE_FIX (2.0),		/* Default gamma value */
 
   SANE_FALSE,			/* Is this a CIS scanner? */
-  GT68XX_FLAG_OFFSET_INV |  GT68XX_FLAG_UNTESTED /* Which flags are needed for this scanner? */
+  GT68XX_FLAG_OFFSET_INV 	/* Which flags are needed for this scanner? */
-  /* completely untested, based on the Plustek OpticPro 1248U*/
+  /* Tested zo some degree, based on the Plustek OpticPro 1248U*/
 };
 
 static GT68xx_Model genius_vivid3xe_model  = {
@@ -921,6 +970,7 @@ static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = {
   {0x043d, 0x002d, &lexmark_x73_model},
   {0x07b3, 0x0400, &plustek_op1248u_model},
   {0x07b3, 0x0401, &plustek_op1248u_model}, /* Same scanner, different id? */
+  {0x07b3, 0x0403, &plustek_u16b_model},
   {0x0458, 0x2011, &genius_vivid3x_model},
   {0x0458, 0x2017, &genius_vivid3xe_model},
   {0, 0, NULL}

doc/descriptions/gt68xx.desc

@@ -1,6 +1,6 @@
 :backend "gt68xx"
 :status :beta
-:version "1.0-45"
+:version "1.0-46"
 :manpage "sane-gt68xx"
 :url "http://www.meier-geinitz.de/sane/gt68xx-backend/"
 :comment "Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend."

doc/gt68xx/gt68xx.CHANGES

@@ -1,5 +1,11 @@
 gt68xx.CHANGES -*-text-*-
 
+V 1.0-46 (2003-04-27)
+
+- Added Genius 3x as working scanner, removed testing flag.
+- Added Artec 2000 e+ to manpage.
+- Added detection for the Plustek OpticPro U16B.
+
 V 1.0-45 (2003-04-11)
 
 - Updated Mustek BearPaw 1200 CU Plus white strip value.

doc/sane-gt68xx.man

@@ -1,4 +1,4 @@
-.TH sane-gt68xx 5 "9 Mar 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane-gt68xx 5 "13 Apr 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane-gt68xx
 .SH NAME
 sane-gt68xx \- SANE backend for GT-68XX based USB flatbed scanners
@@ -13,11 +13,13 @@ backend:
 .RS
 Artec Ultima 2000 (only product 0x4002)
 .br
+Artec Ultima 2000 e+
+.br
 Boeder SmartScan Slim Edition
 .br
 Genius Colorpage Vivid3x
 .br
-Genius Colorpage Vivid3x
+Genius Colorpage Vivid3xe
 .br
 Lexmark X70
 .br