Added Plustek OpticSlim 1200 to gt68xx backend.

ChangeLog

@@ -1,10 +1,18 @@
+2003-09-30  Gerhard Jaeger <gerhard@gjaeger.de>
+
+	* doc/descriptions/unsupported.desc: removed OpticSlim entry
+	* doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES
+	  doc/sane-gt68xx.man backend/gt68xx.conf: added Plustek OpticSlim entry
+	* backend/gt68xx_devices.c: added settings for Plustek OpticSlim 1200
+
 2003-09-29  Gerhard Jaeger <gerhard@gjaeger.de>
 
 	* doc/sane-plustek.man: minor update
 	* backend/plustek.c: changed version number, cleanup
 	* backend/plustek-usb*.c: cleanup
 	* backend/plustek-pp.*: cleanup
-	* backend/plustek-share.h backend/Makefile.in: removed, no longer needed
+	* backend/plustek-share.h: removed, no longer needed
+	* backend/Makefile.in: removed reference to plustek-share.h
 
 2003-09-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
 

backend/gt68xx.conf

@@ -131,6 +131,10 @@ usb 0x07b3 0x0403
 # Plustek OpticPro UT16B
 #model "UT16B"
 
+##############################################################################
+# Autodetect Plustek OpticSlim 1200
+usb 0x07b3 0x0413
+
 ##############################################################################
 # Autodetect Genius Colorpage Vivid3x
 usb 0x0458 0x2011

backend/gt68xx_devices.c

@@ -955,6 +955,54 @@ static GT68xx_Model genius_vivid3xe_model  = {
   /* mostly untested, based on the Genius Vivid3x */
 };
 
+static GT68xx_Model plustek_opticslim1200 = {
+  "plustek-opticslim-1200",	/* Name */
+  "Plustek",				/* Device vendor string */
+  "OpticSlim 1200",			/* Device model name */
+  "cism216.fw",				/* Name of the firmware file */
+  SANE_FALSE,				/* Dynamic allocation flag */
+
+  &mustek_gt6816_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 */
+  1200,					/* if ydpi is equal or higher, use linemode */
+  SANE_FALSE,			/* Use base_ydpi for all resolutions */
+
+  {600, 300, 150, 75, 50, 0},	/* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 50, 0},	/* possible y-resolutions */
+  {16, 8, 0},			/* possible depths in gray mode */
+  {16, 8, 0},			/* possible depths in color mode */
+
+  SANE_FIX (1.0),		/* Start of scan area in mm  (x) */
+  SANE_FIX (9.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 (140.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, 0, 0,				/* RGB CCD Line-distance correction in pixel */
+  0,					/* CCD distcance for CCD with 6 lines) */
+
+  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  {0x15, 0x09, 0x18, 0x11, 0x16, 0x0c},	/* Default offset/gain */
+  {0x157, 0x157, 0x157},	/* Default exposure parameters */
+  SANE_FIX (2.0),			/* Default gamma value */
+
+  SANE_TRUE,				/* Is this a CIS scanner? */
+  0
+};
+
 static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = {
   {0x055f, 0x0218, &mustek_2400ta_model},
   {0x055f, 0x0219, &mustek_2400taplus_model},
@@ -971,6 +1019,7 @@ static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = {
   {0x07b3, 0x0400, &plustek_op1248u_model},
   {0x07b3, 0x0401, &plustek_op1248u_model}, /* Same scanner, different id? */
   {0x07b3, 0x0403, &plustek_u16b_model},
+  {0x07b3, 0x0413, &plustek_opticslim1200},
   {0x0458, 0x2011, &genius_vivid3x_model},
   {0x0458, 0x2017, &genius_vivid3xe_model},
   {0, 0, NULL}

doc/descriptions/gt68xx.desc

@@ -1,5 +1,5 @@
 :backend "gt68xx"
-:version "1.0-48"
+:version "1.0-49"
 :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."
@@ -194,6 +194,10 @@
 :status :basic
 :comment "Works up to 600 dpi, but calibration is slow"
 
+:model "OpticSlim 1200"
+:interface "USB"
+:status :good
+
 :model "OpticPro U16B"
 :interface "USB"
 :status :untested

doc/descriptions/unsupported.desc

@@ -701,13 +701,13 @@
 :status :unsupported
 :comment "Uses RealTek chipset (RTL8801D)"
 
-:model "OpticPro S12"
+:model "OpticPro S12/ST12"
 :url "http://www.genesyslogic.com/GL646.htm"
 :interface "USB"
 :status :unsupported
 :comment "Uses the Genesys Logic GL646 chipset."
 
-:model "OpticPro S24"
+:model "OpticPro S24/ST24"
 :url "http://www.genesyslogic.com/GL646.htm"
 :interface "USB"
 :status :unsupported
@@ -718,11 +718,6 @@
 :status :unsupported
 :comment "All devices using product ID 0x0001 are not supported, for others see Plustek backend. The older models seem to use a P98003 parallel port ASIC and a GenesysLogic parport-over USB brigde. The P98003 is also used by the P12 and PT12 models."
 
-:model "OpticSlim 1200"
-:interface "USB"
-:status :unsupported
-:comment "Unsupported. No details yet."
-
 :model "OpticPro S28"
 :interface "USB"
 :status :unsupported

doc/gt68xx/gt68xx.CHANGES

@@ -2,6 +2,7 @@ gt68xx.CHANGES -*-text-*-
 
 V 1.0-49 (2003-0?-??)
 
+* Added Settings for Plustek OpticSlim 1200
 * Fixed wrong test for allocation in gt68xx.c.
 * Added ScanMagic 1200 UB Plus to man page and .desc.
 

doc/sane-gt68xx.man

@@ -1,4 +1,4 @@
-.TH sane-gt68xx 5 "22 Jul 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane-gt68xx 5 "30 Sept 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane-gt68xx
 .SH NAME
 sane-gt68xx \- SANE backend for GT-68XX based USB flatbed scanners
@@ -59,6 +59,8 @@ Packard Bell Diamond 1200 (Plus)
 .br
 Plustek OpticPro 1248U
 .br
+Plustek OpticSlim 1200
+.br
 RevScan 19200i
 .br
 Trust Compact Scan USB 19200
@@ -66,7 +68,7 @@ Trust Compact Scan USB 19200
 Trust Flat Scan USB 19200
 .RE
 .PP
-More details can be found on the gt68xx backend homepage 
+More details can be found on the gt68xx backend homepage
 .IR http://www.meier-geinitz.de/sane/gt68xx/ .
 .PP
 The Artec E+ 48U and its clones are supported by the artec_eplus48u backend, see