Added basic support for Plustek OpticPro 1248U (from Gerhard Jaeger

<gerhard@gjaeger.de>). Removed 50 and 1200 dpi from Lexmark X73.  Backend
status is BETA now.

ChangeLog

@@ -3,6 +3,12 @@
 	* configure configure.in acinclude.m4 aclocal.m4 
 	  include/sane/config.h.in: Fix compilation on Tru64 by readding
 	  the sys/bitypes.h work-around. Minimum autoconf version is 2.50 now.
+	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
+	  backend/gt68xx_gt6801.c backend/gt68xx_gt6801.h doc/sane-gt68xx.man
+	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES po/gt68xx.de.po:
+	  Added basic support for Plustek OpticPro 1248U (from Gerhard Jaeger
+	  <gerhard@gjaeger.de>). Removed 50 and 1200 dpi from Lexmark X73.
+	  Backend status is BETA now.
 
 2002-11-13  Ulrich Deiters <ukd@xenon.pc.uni-koeln.de>
 

backend/gt68xx.c

@@ -48,7 +48,7 @@
 
 #include "../include/sane/config.h"
 
-#define BUILD 29
+#define BUILD 30
 #define MAX_DEBUG
 #define WARMUP_TIME 30
 

backend/gt68xx.conf

@@ -63,3 +63,7 @@ usb 0x055f 0x0210
 ##############################################################################
 # Autodetect Lexmark X70/X73
 usb 0x043d 0x002d
+
+##############################################################################
+# Autodetect Plustek OpticPro 1248U
+usb 0x07b3 0x0401

backend/gt68xx_devices.c

@@ -101,6 +101,32 @@ static GT68xx_Command_Set mustek_gt6801_command_set = {
   gt68xx_generic_get_id
 };
 
+static GT68xx_Command_Set plustek_gt6801_command_set = {
+  "plustek-gt6801",
+
+  0x200a, 0x2009,
+  0x2010, 0x3f40, 0x2011, 0x3f00,
+  0x2012, 0x3f40, 0x2013, 0x3f00,
+
+  /* activate */ NULL,
+  /* deactivate */ NULL,
+  gt6801_check_plustek_firmware,
+  gt6801_download_firmware,
+  gt6801_get_power_status,
+  /* get_ta_status (FIXME: implement this) */ NULL,
+  gt6801_lamp_control,
+  gt6801_is_moving,
+  /*gt68xx_generic_move_relative *** to be tested */ NULL,
+  gt6801_carriage_home,
+  gt68xx_generic_start_scan,
+  gt68xx_generic_read_scanned_data,
+  gt6801_stop_scan,
+  gt6801_setup_scan,
+  gt68xx_generic_set_afe,
+  NULL,
+  gt68xx_generic_get_id
+};
+
 static GT68xx_Model mustek_2400ta_model = {
   "mustek-bearpaw-2400-ta",
   "Mustek",
@@ -227,7 +253,7 @@ static GT68xx_Model mustek_1200ta_model = {
   {0x2a, 0x0c, 0x2e, 0x06, 0x2d, 0x07},
   {0x157, 0x157, 0x157},
   SANE_FALSE,
-  GT68XX_FLAG_UNTESTED
+  0
   /* Setup for 1200 TA */
 };
 
@@ -550,14 +576,14 @@ static GT68xx_Model lexmark_x73_model = {
   1200,				/* ??? */
   SANE_TRUE,
 
-  {600, 300, 150, 75, 50, 0},
+  {600, 300, 150, 75, 0},
-  {1200, 600, 300, 150, 75, 50, 0},
+  {600, 300, 150, 75, 0},
   {16, 12, 8, 0},
   {16, 12, 8, 0},
   SANE_FIX (6.519),
   SANE_FIX (12.615),
   SANE_FIX (220.0),		/* physical windowsize: 220 mm  */
-  SANE_FIX (300.0),		/* physical windowsize: 300 mm  */
+  SANE_FIX (297.0),		/* physical windowsize: 300 mm  */
   SANE_FIX (1.0),
   SANE_FIX (0.0),
 
@@ -583,6 +609,50 @@ static GT68xx_Model lexmark_x73_model = {
      the sledge and the scanner may be damaged!  */
 };
 
+static GT68xx_Model plustek_op1248u_model = {
+  "plustek-op1248u",
+  "Plustek",
+  "OpticPro 1248U",
+  "ccd548.fw",
+  SANE_FALSE,
+
+  &plustek_gt6801_command_set,
+
+  600,	/* Optic X DPI           */
+  600,  /* Optic Y DPI           */
+  600,  /* Base X DPI            */
+  600,  /* Base Y DPI            */
+  600,  /* Y DPI force line mode */
+
+  SANE_TRUE,
+  {600, 300, 150, 75, 0},
+  {600, 300, 150, 75, 0},
+
+  {12, 8, 0},
+  {12, 8, 0},
+  SANE_FIX (5.6),    	/* scanarea start X */
+  SANE_FIX (8.0),       /* scanarea start Y */
+  SANE_FIX (218.0),
+  SANE_FIX (299.0),
+  SANE_FIX (0.0),       /* shading start  */
+  SANE_FIX (0.0),		/* no black mark  */
+  SANE_FIX (0.0),		/* no TA */
+  SANE_FIX (0.0),
+  SANE_FIX (100.0),
+  SANE_FIX (100.0),
+  SANE_FIX (0.0),
+
+  /* line distance correction */
+  0, 0, 0,
+  0,
+
+  COLOR_ORDER_BGR,
+  {31, 25, 31, 25, 31, 25},
+  {0x157, 0x157, 0x157},
+  SANE_FALSE,			/* is a CCD device */
+  0
+};
+
 static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = {
   {0x055f, 0x0218, &mustek_2400ta_model},
   {0x055f, 0x0219, &mustek_2400taplus_model},
@@ -595,6 +665,7 @@ static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = {
   {0x05d8, 0x4002, &mustek_2400cu_model},	/* manual override */
   {0x055f, 0x0210, &mustek_a3usb_model},
   {0x043d, 0x002d, &lexmark_x73_model},
+  {0x07b3, 0x0401, &plustek_op1248u_model},
   {0, 0, NULL}
 };
 

backend/gt68xx_gt6801.c

@@ -98,10 +98,9 @@ gt6801_check_firmware (GT68xx_Device * dev, SANE_Bool * loaded)
 }
 #endif
 
-#if 0
 /* doesn't work with at least cytron scanner */
 SANE_Status
-gt6801_check_firmware (GT68xx_Device * dev, SANE_Bool * loaded)
+gt6801_check_plustek_firmware (GT68xx_Device * dev, SANE_Bool * loaded)
 {
   SANE_Status status;
   GT68xx_Packet req;
@@ -124,8 +123,6 @@ gt6801_check_firmware (GT68xx_Device * dev, SANE_Bool * loaded)
 
   return SANE_STATUS_GOOD;
 }
-#endif
-
 
 #define MAX_DOWNLOAD_BLOCK_SIZE 64
 

backend/gt68xx_gt6801.h

@@ -48,6 +48,9 @@
 static SANE_Status
 gt6801_check_firmware (GT68xx_Device * dev, SANE_Bool * loaded);
 
+static SANE_Status
+gt6801_check_plustek_firmware (GT68xx_Device * dev, SANE_Bool * loaded);
+
 static SANE_Status
 gt6801_download_firmware (GT68xx_Device * dev,
 			  SANE_Byte * data, SANE_Word size);

doc/descriptions/gt68xx.desc

@@ -1,6 +1,6 @@
 :backend "gt68xx"
-:status :alpha
+:status :beta
-:version "1.0-29"
+:version "1.0-30"
 :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 backend."
@@ -73,8 +73,8 @@
 
 :model "OpticPro 1248U"
 :interface "USB"
-:status :untested
+:status :alpha
-:comment "currently working on supporting this scanner"
+:comment "Works up to 600 dpi in gray mode, try disabling calibration"
 
 :mfg "Artec"
 :url "http://www.artecusa.com/"
@@ -138,9 +138,9 @@
 :model "X70"
 :status :alpha
 :interface "USB"
-:comment "works in all resolutions but 50 and 1200 dpi"
+:comment "works, but sometimes the image brightness changes with resolution"
 
 :model "X73"
-:status :untested
+:status :alpha
 :interface "USB"
-:comment "maybe works like the X70, contact author if you own such a model"
+:comment "should work like the X70, but was reported to fail, more reports welcome"

doc/gt68xx/gt68xx.CHANGES

@@ -1,4 +1,13 @@
-V 1.0-29 (2002-11-??)
+V 1.0-30 (2002-11-13)
+
+- Added basic support for Plustek OpticPro 1248U (from Gerhard Jaeger
+  <gerhard@gjaeger.de>). Only gray mode without calib seems to work until
+   now.
+- Removed 50 and 1200 dpi from Lexmark X73 (doesn't seem to work). Decreased
+  height.
+- Backend status is BETA now.
+
+V 1.0-29 (2002-11-07)
 
 - Changed option titles and descriptions to make them better readable.
 - Added translation markers for all options.

doc/sane-gt68xx.man

@@ -1,4 +1,4 @@
-.TH sane-gt68xx 5 "5 Nov 2002"
+.TH sane-gt68xx 5 "13 Nov 2002"
 .IX sane-gt68xx
 .SH NAME
 sane-gt68xx - SANE backend for GT-68XX based USB flatbed scanners
@@ -37,6 +37,8 @@ Mustek ScanExpress 1200 UB Plus
 .br
 Packard Bell Diamond 1200
 .br
+Plustek OpticPro 1248U
+.br
 Trust Compact Scan USB 19200
 .br
 Trust Flat Scan USB 19200
@@ -45,8 +47,9 @@ Trust Flat Scan USB 19200
 More details can be found on the gt68xx backend homepage 
 .IR http://www.meier-geinitz.de/sane/gt68xx/ .
 .PP
-This is ALPHA software. Keep your hand at the scanner's plug and unplug it, if
+This is BETA software. Especially if you test new or untested scanners, keep
-the head bumps at the end of the scan area.
+your hand at the scanner's plug and unplug it, if the head bumps at the end of
+the scan area.
 .PP
 If you own a scanner other than the ones listed above that works with this
 backend, please let me know this by sending the scanner's exact model name and
@@ -202,10 +205,6 @@ Currently scanning seems to only work under Linux. With the BSDs, either the
 first command after the firmware boot or the reading of the scanned data times
 out.
 .PP
-Automatic gain is slow (especially 2400 CU). Maybe use the existing default
-values. Also, default values could be added to gt68xx.conf. Check if auto-gain
-for CCD scanners should use the max/min values, too.
-.PP
 The first few lines of the image are garbage for the 2400 TA
 Plus.
 .PP

po/gt68xx.de.po

@@ -4,12 +4,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.9\n"
-"POT-Creation-Date: 2002-11-03 18:16+0100\n"
+"POT-Creation-Date: 2002-11-10 15:02+0100\n"
 "PO-Revision-Date: 2002-11-03 17:55+0100\n"
 "Last-Translator: Henning Meier-Geinitz <henning@meier-geinitz.de>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: .tmp/gt68xx.c:114
@@ -82,7 +82,11 @@ msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
 "disabled, options for setting the analog frontend parameters manually are "
 "provided. This option is enabled by default. For testing only."
-msgstr "Stelle Verstärkung und Versatz automatisch ein. Wenn dies Option ausgeschaltet ist, können die Parameter des AFE (\"Analog Frontend\") manuell eingestellt werden. Diese Option is standardmäßig an. Nur für Testzwecke."
+msgstr ""
+"Stelle Verstärkung und Versatz automatisch ein. Wenn dies Option "
+"ausgeschaltet ist, können die Parameter des AFE (\"Analog Frontend\") "
+"manuell eingestellt werden. Diese Option is standardmäßig an. Nur für "
+"Testzwecke."
 
 #: .tmp/gt68xx.c:482
 msgid "Coarse calibration for first scan only"
@@ -93,7 +97,11 @@ msgid ""
 "Coarse calibration is only done for the first scan. Works with most scanners "
 "and can save scanning time. If the image brightness is different with each "
 "scan, disable this option. For testing only."
-msgstr "Die Grobkalibrierung wird nur für den ersten Scan durchgeführt. Das funktioniert mit den meisten Scannern und kann einiges an Scanzeit sparen. Wenn die Helligkeit der Bilder von Scan zu Scan schwankt, sollte diese Option ausgeschaltet werden. Nur für Testzwecke."
+msgstr ""
+"Die Grobkalibrierung wird nur für den ersten Scan durchgeführt. Das "
+"funktioniert mit den meisten Scannern und kann einiges an Scanzeit sparen. "
+"Wenn die Helligkeit der Bilder von Scan zu Scan schwankt, sollte diese "
+"Option ausgeschaltet werden. Nur für Testzwecke."
 
 #: .tmp/gt68xx.c:537
 msgid "Offset red"