diff --git a/ChangeLog b/ChangeLog index 61f05c160..3128b239a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-07-25 Henning Meier-Geinitz + + * backend/gt68xx.c backend/gt68xx.conf doc/sane-gt68xx.man + doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Added + Fujitsu 1200CUS to man page, .conf and .desc. Changed .conf file + to be more readable. Added RevScan 19200i to .conf file. Added + Plustek U16B to .desc and .conf, updated UT16B. + 2003-07-24 Peter Kirchgessner * backend/hp.c, backend/hp-option.h, backend/hp-option.c diff --git a/backend/gt68xx.c b/backend/gt68xx.c index 2f601b876..aeead34a4 100644 --- a/backend/gt68xx.c +++ b/backend/gt68xx.c @@ -48,7 +48,7 @@ #include "../include/sane/config.h" -#define BUILD 47 +#define BUILD 48 #define MAX_DEBUG #define WARMUP_TIME 30 #define CALIBRATION_HEIGHT 2.5 diff --git a/backend/gt68xx.conf b/backend/gt68xx.conf index 1ac2fbc1f..91b455a08 100644 --- a/backend/gt68xx.conf +++ b/backend/gt68xx.conf @@ -1,48 +1,82 @@ # gt68xx.conf: Configuration file for GT68XX based scanners # Read man sane-gt68xx for documentation +# Manual configuration is necessary for some scanners. Please uncomment the +# override line and optinally the vendor and product lines that apply to your +# scanner. For some scanners it's also necessary to change the name of the +# firmware file. + ############################################################################## # Autodetect Mustek BearPaw 1200 CU, 2400 CU, Mustek ScanExpress 1200 UB Plus, # Artec Ultima 2000, and several other GT-6801-based scanners usb 0x05d8 0x4002 -# Mustek BearPaw 1200 CU doesn't need any override +# Mustek BearPaw 1200 CU doesn't need any manual override -# Mustek ScanExpress 1200 UB Plus, Medion/Lifetec/Tevion LT 9452, Trust -# Compact Scan USB 19200 use that one: +# Mustek ScanExpress 1200 UB Plus: +#override "mustek-scanexpress-1200-ub-plus" + +# Medion/Lifetec/Tevion LT 9452: #override "mustek-scanexpress-1200-ub-plus" #vendor "Lifetec" #model "LT 9452" + +# Trust Compact Scan USB 19200: +#override "mustek-scanexpress-1200-ub-plus" #vendor "Trust" #model "Compact Scan USB 19200" # Mustek ScanExpress 2400 USB #override "mustek-scanexpress-2400-usb" -# Artec Ultima 2000, Boeder SmartScan Slim Edition, -# Medion/Lifetec/Tevion/Cytron MD/LT 9385 and MD 9458, -# Trust Flat Scan USB 19200 +# Artec Ultima 2000: #override "artec-ultima-2000" #firmware "ePlus2k.usb" + +# Boeder SmartScan Slim Edition: +#override "artec-ultima-2000" #vendor "Boeder" #model "SmartScan Slim Edition" + +# Medion/Lifetec/Tevion/Cytron MD/LT 9385: +#override "artec-ultima-2000" #vendor "Medion" #model "MD/LT 9385" + +# Medion/Lifetec/Tevion/Cytron MD 9458: +#override "artec-ultima-2000" +#vendor "Medion" #model "MD 9458" + +# Trust Flat Scan USB 19200: +#override "artec-ultima-2000" #vendor "Trust" #model "Flat Scan USB 19200" -# Mustek BearPaw 2400 CU +# Mustek BearPaw 2400 CU: #override "mustek-bearpaw-2400-cu" +# Fujitsu 1200CUS: +#override "mustek-bearpaw-2400-cu" +#vendor "Fujitsu" +#model "1200CUS" + ############################################################################## # Autodetect Mustek BearPaw 1200 TA and Mustek BearPaw 1200 CS usb 0x055f 0x021e + +# Mustek BearPaw 1200 TA doesn't need any manual settings + +# Mustek BearPaw 1200 CS: #model "Bearpaw 1200 CS" ############################################################################## # Autodetect Mustek BearPaw 2400 TA and Mustek BearPaw 2400 CS usb 0x055f 0x0218 + +# Mustek BearPaw 2400 TA doesn't need any manual settings + +# Mustek BearPaw 2400 CS: #model "Bearpaw 2400 CS" ############################################################################## @@ -53,9 +87,15 @@ usb 0x055f 0x0219 # Autodetect Mustek BearPaw 2400 CU Plus usb 0x055f 0x021d +# Mustek BearPaw 2400 CU Plus doesn't need any manual settings + ############################################################################## # Autodetect Mustek Bearpaw 1200 CU Plus and Packard Bell Diamond 1200 usb 0x055f 0x021c + +# Mustek BearPaw 1200 CU Plus doesn't need any manual settings + +# Packard Bell Diamond 1200: #vendor "Packard Bell" #model "Diamond 1200" @@ -63,23 +103,44 @@ usb 0x055f 0x021c # Autodetect Mustek ScanExpress A3 USB usb 0x055f 0x0210 +# Mustek ScanExpress A3 USB doesn't need any manual settings + ############################################################################## # Autodetect Lexmark X70/X73 usb 0x043d 0x002d +# Lexmark X70/X73 don't need any manual settings + ############################################################################## -# Autodetect Plustek OpticPro 1248U +# Autodetect Plustek OpticPro 1248U and Revscan 19200i usb 0x07b3 0x0401 usb 0x07b3 0x0400 +# Plustek OpticPro 1248U doesn't need any manual settings + +# RevScan 19200i +#vendor "RevScan" +#model "19200i" + ############################################################################## -# Autodetect Plustek OpticPro U16B +# Autodetect Plustek OpticPro U16B and UT16B usb 0x07b3 0x0403 +# Plustek OpticPro U16B doesn't need any manual settings + +# Plustek OpticPro UT16B +#model "UT16B" + ############################################################################## # Autodetect Genius Colorpage Vivid3x usb 0x0458 0x2011 +# Genius Colorpage Vivid3x doesn't need any manual settings + ############################################################################## # Autodetect Genius Colorpage Vivid3xe usb 0x0458 0x2017 + +# Genius Colorpage Vivid3xe doesn't need any manual settings + +############################################################################## diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc index 26e44cc2e..fb8c25c98 100644 --- a/doc/descriptions/gt68xx.desc +++ b/doc/descriptions/gt68xx.desc @@ -1,10 +1,104 @@ :backend "gt68xx" -:version "1.0-47" +:version "1.0-48" :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." :devicetype :scanner +; ----------------------------------------------------------------------------- + +:mfg "Artec/Ultima" +:url "http://www.artecusa.com/" + +:model "Ultima 2000" +:status :good +:interface "USB" +:comment "Works, only product id 0x4002 is supported" + +:model "Ultima 2000 e+" +:status :good +:interface "USB" +:comment "Works, only limited testing until now" + +; ----------------------------------------------------------------------------- + +:mfg "Boeder" +:model "Sm@rtScan Slim Edition" +:status :good +:interface "USB" +:comment "Similar to Artec Ultima 2000" + +; ----------------------------------------------------------------------------- + +:mfg "Fujitsu" +:url "http://www.fujitsu.com/" + +:model "1200CUS" +:status :basic +:interface "USB" +:comment "Works, but is slow. Maybe a Mustek BearPaw 2400 CU clone?" + +; ----------------------------------------------------------------------------- + +:mfg "Genius" +:url "http://www.genius-kye.com/" + +:model "Colorpage Vivid3x" +:status :good +:interface "USB" +:comment "Works but has limited testing" + +:model "Colorpage Vivid3xe" +:status :basic +:interface "USB" +:comment "Works but has limited testing. Color problems? Reports are welcome." + +; ----------------------------------------------------------------------------- + +:mfg "Lexmark" +:url "http://www.lexmark.com/" +:model "X70" +:status :good +:interface "USB" +:comment "Works, some resolutions fail at 16 bit" + +:model "X73" +:status :good +:interface "USB" +:comment "Works, some resolutions fail at 16 bit, same as X70" + +; ----------------------------------------------------------------------------- + +:mfg "Medion/Lifetec/Tevion/Cytron" +:url "http://www.medion.com" +:comment "Sold by Aldi and Tchibo." + +:model "MD 4394" +:status :good +:interface "USB" +:comment "Product id 0x4002. If you have 0x4003, use artec_eplus48u backend." + +:model "MD/LT 9375" +:status :untested +:interface "USB" +:comment "Untested, but is reported to have the same ids as the Artec Ultima 2000. Please test." + +:model "MD/LT 9385" +:status :good +:interface "USB" +:comment "Similar to Artec Ultima 2000" + +:model "LT 9452" +:status :good +:interface "USB" +:comment "Similar to Mustek ScanExpress 1200 UB Plus" + +:model "MD 9458" +:status :good +:interface "USB" +:comment "Similar to Artec Ultima 2000 (e+?)" + +; ----------------------------------------------------------------------------- :mfg "Mustek" :url "http://www.mustek.com/" @@ -41,7 +135,7 @@ :model "BearPaw 2400 CU" :interface "USB" :status :basic -:comment "Works, but is slow"" +:comment "Works, but is slow" :model "BearPaw 2400 CU Plus" :interface "USB" @@ -71,42 +165,7 @@ :status :minimal :comment "Should be detected but may need some more work in the code. Testers welcome." - -:mfg "Plustek" -:url "http://www.plustek.de/" -:url "http://www.plustek.com/" - -:model "OpticPro 1248U" -:interface "USB" -:status :basic -:comment "Works up to 600 dpi, but calibration is slow" - -:model "OpticPro UT16B" -:interface "USB" -:status :untested -:comment "Isn't detected yet but may work some time in future. Testers welcome." - - -:mfg "Artec/Ultima" -:url "http://www.artecusa.com/" - -:model "Ultima 2000" -:status :good -:interface "USB" -:comment "Works, only product id 0x4002 is supported" - -:model "Ultima 2000 e+" -:status :good -:interface "USB" -:comment "Works, only limited testing until now" - - -:mfg "Boeder" -:model "Sm@rtScan Slim Edition" -:status :good -:interface "USB" -:comment "Similar to Artec Ultima 2000" - +; ----------------------------------------------------------------------------- :mfg "Packard Bell" :model "Diamond 1200" @@ -119,35 +178,38 @@ :interface "USB" :comment "Similar to Mustek BearPaw 1200 Plus" -:mfg "Medion/Lifetec/Tevion/Cytron" -:url "http://www.medion.com" -:comment "Sold by Aldi and Tchibo." - -:model "MD 4394" -:status :good -:interface "USB" -:comment "Product id 0x4002. If you have 0x4003, use artec_eplus48u backend." +; ----------------------------------------------------------------------------- -:model "MD/LT 9375" +:mfg "Plustek" +:url "http://www.plustek.de/" +:url "http://www.plustek.com/" + +:model "OpticPro 1248U" +:interface "USB" +:status :basic +:comment "Works up to 600 dpi, but calibration is slow" + +:model "OpticPro U16B" +:interface "USB" :status :untested -:interface "USB" -:comment "Untested, but is reported to have the same ids as the Artec Ultima 2000. Please test." +:comment "Should be detected but may not work. Please contact me if you own such a device." -:model "MD/LT 9385" +:model "OpticPro UT16B" +:interface "USB" +:status :untested +:comment "Should be detected but may not work. Please contact me if you own such a device. Same as U16B but with a transparency adapter?" + +; ----------------------------------------------------------------------------- + +:mfg "RevScan" +;:url "" + +:model "19200i" :status :good :interface "USB" -:comment "Similar to Artec Ultima 2000" - -:model "LT 9452" -:status :good -:interface "USB" -:comment "Similar to Mustek ScanExpress 1200 UB Plus" - -:model "MD 9458" -:status :good -:interface "USB" -:comment "Similar to Artec Ultima 2000 (e+?)" +:comment "Similar to Plustek OpticPro 1248U" +; ----------------------------------------------------------------------------- :mfg "Trust" :url "http://www.trust-site.com" @@ -162,38 +224,4 @@ :interface "USB" :comment "Works, if you have vendor id 0x055f and product id 0x0006, use the mustek_usb backend instead, similar to Mustek ScanExpress 1200 UB (Plus)" - -:mfg "Lexmark" -:url "http://www.lexmark.com/" -:model "X70" -:status :good -:interface "USB" -:comment "Works, some resolutions fail at 16 bit" - -:model "X73" -:status :good -:interface "USB" -:comment "Works, some resolutions fail at 16 bit, same as X70" - - -:mfg "Genius" -:url "http://www.genius-kye.com/" - -:model "Colorpage Vivid3x" -:status :good -:interface "USB" -:comment "Works but has limited testing" - -:model "Colorpage Vivid3xe" -:status :basic -:interface "USB" -:comment "Works but has limited testing. Color problems? Reports are welcome." - -:mfg "RevScan" -;:url "" - -:model "19200i" -:status :good -:interface "USB" -:comment "Similar to Plustek OpticPro 1248U" - +; ----------------------------------------------------------------------------- diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES index 95dc7d51d..d08050142 100644 --- a/doc/gt68xx/gt68xx.CHANGES +++ b/doc/gt68xx/gt68xx.CHANGES @@ -1,7 +1,13 @@ gt68xx.CHANGES -*-text-*- +V 1.0-48 (2003-07-25) + * Added RevScan 19200i to manpage and .desc file. * Updated .desc file to new :status system. +* Added Fujitsu 1200CUS to man page, .conf and .desc. +* Changed .conf file to be more readable. +* Added RevScan 19200i to .conf file. +* Added Plustek U16B to .desc and .conf, updated UT16B. V 1.0-47 (2003-06-05) diff --git a/doc/sane-gt68xx.man b/doc/sane-gt68xx.man index f486c78d1..4231b52ae 100644 --- a/doc/sane-gt68xx.man +++ b/doc/sane-gt68xx.man @@ -1,4 +1,4 @@ -.TH sane-gt68xx 5 "19 Jun 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH sane-gt68xx 5 "22 Jul 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane-gt68xx .SH NAME sane-gt68xx \- SANE backend for GT-68XX based USB flatbed scanners @@ -17,6 +17,8 @@ Artec Ultima 2000 e+ .br Boeder SmartScan Slim Edition .br +Fujitsu 1200CUS +.br Genius Colorpage Vivid3x .br Genius Colorpage Vivid3xe @@ -150,7 +152,7 @@ is used for the Artec Ultima 2000, the Boeder SmartScan Slim Edition, the Medion/ Lifetec/ Tevion/ Cytron MD/LT 9385, the Medion/ Lifetec/ Tevion MD 9458, and the Trust Flat Scan USB 19200. .B override "mustek-bearpaw-2400-cu" -is necessary for the Mustek BearPaw 2400 CU. The +is necessary for the Mustek BearPaw 2400 CU and the Fujitsu 1200CUS. The .B override option must be the first one after the .B usb