diff --git a/ChangeLog b/ChangeLog index a58fb06f9..9e9fcfe35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,11 @@ 2004-10-02 Henning Meier-Geinitz * doc/descriptions/unsupported.desc: Added several - scanners. Removed Genius Vivid 1200 XE (actually supported by - gt68xx backend). + scanners. Removed Genius Vivid 1200 XE (actually supported by + gt68xx backend). + * backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c + doc/sane-gt68xx.man doc/descriptions/gt68xx.desc + doc/gt68xx/gt68xx.CHANGES: Updates of supported scanners. 2004-10-01 Oliver Rauch diff --git a/backend/gt68xx.c b/backend/gt68xx.c index 9c44296c7..662ca3175 100644 --- a/backend/gt68xx.c +++ b/backend/gt68xx.c @@ -48,7 +48,7 @@ #include "../include/sane/config.h" -#define BUILD 63 +#define BUILD 64 #define MAX_DEBUG #define WARMUP_TIME 60 #define CALIBRATION_HEIGHT 2.5 diff --git a/backend/gt68xx.conf b/backend/gt68xx.conf index a540d3098..cba6a5aac 100644 --- a/backend/gt68xx.conf +++ b/backend/gt68xx.conf @@ -91,9 +91,15 @@ usb 0x055f 0x0218 #model "Bearpaw 2400 CS" ############################################################################## -# Autodetect Mustek BearPaw 2400 TA Plus +# Autodetect Mustek BearPaw 2400 TA Plus and Trust 240TH Easy Webscan Gold usb 0x055f 0x0219 +# Mustek BearPaw 2400 TA doesn't need any manual settings + +# Trust 240TH Easy Webscan Gold: +#vendor "Trust" +#model "240TH Easy Webscan Gold" + ############################################################################## # Autodetect Mustek BearPaw 2448 TA Plus and Mustek BearPaw 2448 CS Plus usb 0x055f 0x021a diff --git a/backend/gt68xx_devices.c b/backend/gt68xx_devices.c index 8efdc067b..4f642aae1 100644 --- a/backend/gt68xx_devices.c +++ b/backend/gt68xx_devices.c @@ -1279,11 +1279,11 @@ static GT68xx_Model genius_vivid3xe_model = { /* mostly untested, based on the Genius Vivid3x */ }; -static GT68xx_Model genius_vivid1200ex_model = { - "genius-colorpage-vivid-1200-ex", /* Name */ +static GT68xx_Model genius_vivid1200xe_model = { + "genius-colorpage-vivid-1200-xe", /* Name */ "Genius", /* Device vendor string */ - "Colorpage Vivid 1200 EX", /* Device model name */ - "ccd548.fw", /* Name of the firmware file */ + "Colorpage Vivid 1200 XE", /* Device model name */ + "ccd569.fw", /* Name of the firmware file */ SANE_FALSE, /* Dynamic allocation flag */ &mustek_gt6816_command_set, /* Command set used by this scanner */ @@ -1507,7 +1507,7 @@ static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = { {0x0458, 0x2017, &genius_vivid3xe_model}, {0x0458, 0x201a, &genius_vivid4xe_model}, {0x0458, 0x201b, &genius_vivid4x_model}, - {0x0458, 0x201f, &genius_vivid1200ex_model}, + {0x0458, 0x201f, &genius_vivid1200xe_model}, {0x04a7, 0x0444, &visioneer_onetouch_7300_model}, {0, 0, NULL} }; diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc index 44c1fd100..439844bc3 100644 --- a/doc/descriptions/gt68xx.desc +++ b/doc/descriptions/gt68xx.desc @@ -1,5 +1,5 @@ :backend "gt68xx" -:version "1.0-63" +:version "1.0-64" :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." @@ -73,10 +73,10 @@ :interface "USB" :comment "Should work but has limited testing. Please contact me if you own such a device." -:model "Colorpage Vivid 1200 EX" -:status :untested +:model "Colorpage Vivid 1200 XE" +:status :minimal :interface "USB" -:comment "Should be detected but may not work." +:comment "Gray and lineart works. Preview doesn't work." ; ----------------------------------------------------------------------------- @@ -309,6 +309,11 @@ :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)" +:model "240TH Easy Webscan Gold" +:status :good +:interface "USB" +:comment "Same as Mustek Bearpaw 2400 TA plus." + ; ----------------------------------------------------------------------------- :mfg "Visioneer" @@ -316,7 +321,7 @@ :model "OneTouch 7300" :interface "USB" -:status :untested -:comment "Should be detected but may not work. Please tell me if you own such a device." +:status :basic +:comment "Works but may need some fine tuning concerning calibration." ; ----------------------------------------------------------------------------- diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES index f3eabc12a..d6e646ba0 100644 --- a/doc/gt68xx/gt68xx.CHANGES +++ b/doc/gt68xx/gt68xx.CHANGES @@ -1,5 +1,12 @@ gt68xx.CHANGES -*-text-*- +V 1.0.64 (2004-10-02) + +* Added Trust 240TH easy Webscan Gold to list of supported devices. +* Changed status of Visioneer 7300 to basic. +* Changed name of Genius 1200 EX to "XE". That seems to be the real name. Fixed + firmware name. Changed status to "minimal." + V 1.0.63 (2004-09-03) * Fixed firmware name for Mustek 1248 UB. Changed status to basic. Removed diff --git a/doc/sane-gt68xx.man b/doc/sane-gt68xx.man index ef7d0c369..1e67d443c 100644 --- a/doc/sane-gt68xx.man +++ b/doc/sane-gt68xx.man @@ -1,4 +1,4 @@ -.TH sane-gt68xx 5 "3 Sep 2004" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH sane-gt68xx 5 "2 Oct 2004" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane-gt68xx .SH NAME sane-gt68xx \- SANE backend for GT-68XX based USB flatbed scanners @@ -31,6 +31,8 @@ Genius Colorpage Vivid4x .br Genius Colorpage Vivid4xe .br +Genius Colorpage Vivid 1200 xe +.br Googlegear 2000 .br Lexmark X70 @@ -94,6 +96,8 @@ RevScan 19200i Trust Compact Scan USB 19200 .br Trust Flat Scan USB 19200 +.br +Trust 240TH Easy Webscan Gold .RE .PP More details can be found on the gt68xx backend homepage