diff --git a/ChangeLog b/ChangeLog index 895495146..f66109ed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-03-02 Henning Meier-Geinitz + + * backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_gt6801.c + doc/sane-gt68xx.man doc/descriptions/gt68xx.desc + doc/gt68xx/gt68xx.CHANGES: Make sure that the firmware for + plustek-like scanners is loaded. Didn't work for Genius vivid3xe. + Added both Genius scanners to man page. Removed warning from Genius + Vivid3xe. + 2003-03-02 Michael Herder * doc/descriptions/artec_eplus48u.desc: diff --git a/backend/gt68xx.c b/backend/gt68xx.c index 99e7d3117..d1b68a203 100644 --- a/backend/gt68xx.c +++ b/backend/gt68xx.c @@ -1,7 +1,7 @@ /* sane - Scanner Access Now Easy. Copyright (C) 2002 Sergey Vlasov - Copyright (C) 2002 Henning Meier-Geinitz + Copyright (C) 2002, 2003 Henning Meier-Geinitz This file is part of the SANE package. @@ -48,7 +48,7 @@ #include "../include/sane/config.h" -#define BUILD 41 +#define BUILD 42 #define MAX_DEBUG #define WARMUP_TIME 30 #define CALIBRATION_HEIGHT 2.5 diff --git a/backend/gt68xx_devices.c b/backend/gt68xx_devices.c index b62df4b32..995205180 100644 --- a/backend/gt68xx_devices.c +++ b/backend/gt68xx_devices.c @@ -1,7 +1,7 @@ /* sane - Scanner Access Now Easy. Copyright (C) 2002 Sergey Vlasov - Copyright (C) 2002 Henning Meier-Geinitz + Copyright (C) 2002, 2003 Henning Meier-Geinitz This file is part of the SANE package. @@ -901,8 +901,8 @@ static GT68xx_Model genius_vivid3xe_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? */ - /* completely untested, based on the Genius Vivid3x*/ + GT68XX_FLAG_OFFSET_INV /* Which flags are needed for this scanner? */ + /* mostly untested, based on the Genius Vivid3x */ }; static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = { diff --git a/backend/gt68xx_gt6801.c b/backend/gt68xx_gt6801.c index 95e7a0c99..3c8b8099a 100644 --- a/backend/gt68xx_gt6801.c +++ b/backend/gt68xx_gt6801.c @@ -2,7 +2,7 @@ Copyright (C) 2002 Sergey Vlasov GT6801 support by Andreas Nowack - Copyright (C) 2002 Henning Meier-Geinitz + Copyright (C) 2002, 2003 Henning Meier-Geinitz This file is part of the SANE package. @@ -113,14 +113,20 @@ gt6801_check_plustek_firmware (GT68xx_Device * dev, SANE_Bool * loaded) RIE (gt68xx_device_small_req (dev, req, req)); /* check for correct answer */ - if ((req[0] == 0) && (req[1] == 0x12) && (req[3] != 0)) + if ((req[0] == 0) && (req[1] == 0x12) && (req[3] == 0x80)) /* req[3] is 0 if fw is not loaded, if loaded it's 0x80 * at least on my 1284u (gerhard@gjaeger.de) + * + * With the Genius scanners req[3] is 0x02/0x82. (hmg) */ *loaded = SANE_TRUE; else *loaded = SANE_FALSE; + /* Until I find out if testing for req[3] & 0x80 is save, load the firmware + everytime */ + *loaded = SANE_FALSE; + return SANE_STATUS_GOOD; } diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc index cb6d46393..8018e1386 100644 --- a/doc/descriptions/gt68xx.desc +++ b/doc/descriptions/gt68xx.desc @@ -1,6 +1,6 @@ :backend "gt68xx" :status :beta -:version "1.0-41" +:version "1.0-42" :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." @@ -178,10 +178,10 @@ :model "Colorpage Vivid3x" :status :untested :interface "USB" -:comment "Should be detected but most probably doesn't work yet. Testers welcome." +:comment "Similar to Vivid3xe. Untested but should work. Testers welcome." :model "Colorpage Vivid3xe" -:status :untested +:status :alpha :interface "USB" -:comment "Should be detected but is untested. Testers welcome." +:comment "Should work, limited testing only. Testers welcome." diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES index 514e65603..594b8628e 100644 --- a/doc/gt68xx/gt68xx.CHANGES +++ b/doc/gt68xx/gt68xx.CHANGES @@ -1,5 +1,12 @@ gt68xx.CHANGES -*-text-*- +V 1.0-42 (2003-03-02) + +- Make sure that the firmware for plustek-like scanners is loaded. Didn't work for + Genius vivid3xe. +- Added both Genius scanners to man page. +- Removed warning from Genius Vivid3xe. + V 1.0-41 (2003-02-27) - Added Genius Colorpage Vivid3xe. diff --git a/doc/sane-gt68xx.man b/doc/sane-gt68xx.man index f178204a0..3dfc0a784 100644 --- a/doc/sane-gt68xx.man +++ b/doc/sane-gt68xx.man @@ -1,4 +1,4 @@ -.TH sane-gt68xx 5 "22 Feb 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH sane-gt68xx 5 "1 Mar 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane-gt68xx .SH NAME sane-gt68xx \- SANE backend for GT-68XX based USB flatbed scanners @@ -15,6 +15,10 @@ Artec Ultima 2000 (only product 0x4002) .br Boeder SmartScan Slim Edition .br +Genius Colorpage Vivid3x +.br +Genius Colorpage Vivid3x +.br Lexmark X70 .br Lexmark X73 @@ -260,9 +264,6 @@ GT-6816 based scanners don't work at all for yet unknown reasons. The first few lines of the image are garbage for the 2400 TA Plus. .PP -The images are too dark for some scanners, especially in TA mode. Maybe -add a gamma option? -.PP Interpolation should be used instead of just copying data, when the X- and Y-resolution differ. .PP @@ -271,4 +272,5 @@ Support for buttons is missing. More detailed bug information is available at the gt68xx backend homepage .IR http://www.meier-geinitz.de/sane/gt68xx . Please contact me if you find a bug or missing feature: - +. Please send a debug log if your scanner isn't +detected correctly (see SANE_DEBUG_GT68XX above).