mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed calibration cache issues (coarse calibration for all modes, 

correct fine calibration for sheetfed devices).
merge-requests/1/head
Gerhard Jaeger 2006-06-08 07:49:38 +00:00
rodzic 15a6e464e2
commit 08ecce430c
6 zmienionych plików z 186 dodań i 142 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

248
ChangeLog
Wyświetl plik

@ -1,3 +1,11 @@
2006-06-08 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Pluste-USB.changes: Update
* backend/plustek.c backend/plustek-usbcal.c
backend/plustek-usbcalfile.c backend/plustek-usbhw.c:
Fixed calibration cache issues (coarse calibration for all modes,
correct fine calibration for sheetfed devices).
2006-06-08 Mattias Ellert <mattias.ellert@tsl.uu.se> 2006-06-08 Mattias Ellert <mattias.ellert@tsl.uu.se>
* po/sane-backends.*.po: updated with new translation keys from * po/sane-backends.*.po: updated with new translation keys from
@ -54,11 +62,11 @@
* backend/stv680.c backend/stv680.h backend/stv680.conf.in added * backend/stv680.c backend/stv680.h backend/stv680.conf.in added
* doc/sane-stv680.man doc/descriptions/stv680.desc added * doc/sane-stv680.man doc/descriptions/stv680.desc added
* AUTHORS: added stv680 Gerard Klaver * AUTHORS: added stv680 Gerard Klaver
* configure configure.in doc/Makefile.in doc/sane.man * configure configure.in doc/Makefile.in doc/sane.man
backend/Makefile.in backend/dll.conf.in: added stv680 backend backend/Makefile.in backend/dll.conf.in: added stv680 backend
* doc/descriptions-external/stv680.desc: removed because the backend * doc/descriptions-external/stv680.desc: removed because the backend
is now a part of sane-backends. is now a part of sane-backends.
2006-06-04 m. allan noah <anoah AT pfeiffer DOT edu> 2006-06-04 m. allan noah <anoah AT pfeiffer DOT edu>
@ -182,7 +190,7 @@
do_cmd() - simplify timeout handling do_cmd() - simplify timeout handling
* backend/fujitsu-scsi.h: increase default timeoutes * backend/fujitsu-scsi.h: increase default timeoutes
2006-05-15 St<EFBFBD>hane Voltz <stefdev@modulonet.fr> 2006-05-15 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_devices.c backend/genesys_gl646.c: tuned HP 2300 * backend/genesys_devices.c backend/genesys_gl646.c: tuned HP 2300
geometry description and added a safeguard against failed origin geometry description and added a safeguard against failed origin
@ -226,10 +234,10 @@
* backend/genesys_devices.c: Increase length of acceleration * backend/genesys_devices.c: Increase length of acceleration
slopes for Canon LiDE 35/40/50/60 slopes for Canon LiDE 35/40/50/60
2006-04-21 St<EFBFBD>hane Voltz <stefdev@modulonet.fr> 2006-04-21 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys.c: add workraound with issue related * backend/genesys.c: add workraound with issue related
to asic reset and data scan amount to asic reset and data scan amount
2006-04-20 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-04-20 Henning Meier-Geinitz <henning@meier-geinitz.de>
@ -362,19 +370,19 @@
* doc/descriptions/unsupported.desc: Added Microtek ScanMaker 4850 * doc/descriptions/unsupported.desc: Added Microtek ScanMaker 4850
II and Plustek OpticPro ST 64+. II and Plustek OpticPro ST 64+.
2006-03-12 St<EFBFBD>hane Voltz <stefdev@modulonet.fr> 2006-03-12 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_gl646.c: removed now unneeded #ifdef in * backend/genesys_gl646.c: removed now unneeded #ifdef in
gl646_send_gamma_table. gl646_send_gamma_table.
2006-03-12 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> 2006-03-12 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl646.c: fixed silly thinko in * backend/genesys_gl646.c: fixed silly thinko in
gl646_send_gamma_table. gl646_send_gamma_table.
2006-03-12 St<EFBFBD>hane Voltz <stefdev@modulonet.fr> 2006-03-12 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_gl646.c: fixed gl646_send_gamma_table after * backend/genesys_gl646.c: fixed gl646_send_gamma_table after
endianess changes. Put again a little fix for power saving endianess changes. Put again a little fix for power saving
2006-03-11 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-03-11 Henning Meier-Geinitz <henning@meier-geinitz.de>
@ -384,20 +392,20 @@
2006-03-09 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> 2006-03-09 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c backend/genesys_low.h: Removed little endian * backend/genesys.c backend/genesys_low.h: Removed little endian
conversions in slope table creation functions conversions in slope table creation functions
* backend/genesys_gl646.c backend/genesys_gl841.c: Added little * backend/genesys_gl646.c backend/genesys_gl841.c: Added little
endian conversions to gl*_send_slope_table functions endian conversions to gl*_send_slope_table functions
2006-03-09 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> 2006-03-09 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c: Some annotations about endianess of scanned * backend/genesys.c: Some annotations about endianess of scanned
data data
* backend/genesys_gl646.c: Convert gamma tables to little endian * backend/genesys_gl646.c: Convert gamma tables to little endian
2006-03-06 St<EFBFBD>hane Voltz <stefdev@modulonet.fr> 2006-03-06 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_gl646.c: power saving fixes * backend/genesys_gl646.c: power saving fixes
2006-03-05 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-03-05 Henning Meier-Geinitz <henning@meier-geinitz.de>
@ -408,124 +416,124 @@
2006-02-16 Gerhard Jaeger <gerhard@gjaeger.de> 2006-02-16 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-PARPORT.changes: Update. * doc/plustek/Plustek-PARPORT.changes: Update.
* backend/plustek_pp.c: Bumped build number. * backend/plustek_pp.c: Bumped build number.
* backend/plustek-pp_ptdrv.c backend/plustek-pp_detec.c: * backend/plustek-pp_ptdrv.c backend/plustek-pp_detec.c:
Fixed bug, that prevents backend from working, when the device Fixed bug, that prevents backend from working, when the device
is another parport than parport0 - spotted by Christoph Steinbruchel. is another parport than parport0 - spotted by Christoph Steinbruchel.
2006-02-14 Gerhard Jaeger <gerhard@gjaeger.de> 2006-02-14 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/u12/U12.changes: Update. * doc/u12/U12.changes: Update.
* backend/u12.c: Bumped build number. * backend/u12.c: Bumped build number.
* backend/u12-hw.c: SoftwareReset is now disabled in * backend/u12-hw.c: SoftwareReset is now disabled in
cancelSequence when the device is a Genius scanner. cancelSequence when the device is a Genius scanner.
2006-02-13 St<EFBFBD>hane Voltz <stefdev@modulonet.fr> 2006-02-13 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_gl646.c: disabled power saving for gl646. * backend/genesys_gl646.c: disabled power saving for gl646.
2006-02-12 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-02-12 Henning Meier-Geinitz <henning@meier-geinitz.de>
* README.solaris: Added link to installation report. * README.solaris: Added link to installation report.
* doc/descriptions/unsupported.desc: Removed HP ScanJet 8200 * doc/descriptions/unsupported.desc: Removed HP ScanJet 8200
(supported by Avision backend). Minor updates. (supported by Avision backend). Minor updates.
2006-02-04 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-02-04 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Removed Trust Office Scan USB * doc/descriptions/unsupported.desc: Removed Trust Office Scan USB
19200 (now in niash.desc), added Xerox 4800 One Touch. 19200 (now in niash.desc), added Xerox 4800 One Touch.
* include/sane/sanei_usb.h sanei/sanei_usb.c: Workaround for * include/sane/sanei_usb.h sanei/sanei_usb.c: Workaround for
compilation problem on Windows/cygwin. compilation problem on Windows/cygwin.
* backend/dll.c: With cygwin, use ":" as DIR_SEP (patch from * backend/dll.c: With cygwin, use ":" as DIR_SEP (patch from
Philip Aston <paston@bea.com>). Philip Aston <paston@bea.com>).
2006-02-04 Ullrich Sigwanz <usigwanz@freesurf.ch> 2006-02-04 Ullrich Sigwanz <usigwanz@freesurf.ch>
* backend/niash_xfer.c: Added Trust OfficeScan 19200 * backend/niash_xfer.c: Added Trust OfficeScan 19200
* doc/descriptions/niash.desc: Added Trust OfficeScan 19200 * doc/descriptions/niash.desc: Added Trust OfficeScan 19200
* backend/niash.c: Removed Reload on X,Y settings * backend/niash.c: Removed Reload on X,Y settings
2006-02-02 Oliver Schwartz <Oliver.Schwartz@gmx.de> 2006-02-02 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.h: Corrected USB ID for Benq 310 * backend/snapscan.h: Corrected USB ID for Benq 310
2006-01-31 Gerhard Jaeger <gerhard@gjaeger.de> 2006-01-31 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: Update. * doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c: Bumped build number. * backend/plustek.c: Bumped build number.
* backend/plustek-usbdevs.c: Fixed CanoScan N1220U settings. * backend/plustek-usbdevs.c: Fixed CanoScan N1220U settings.
2006-01-29 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/brother2.desc: Changed status of * doc/descriptions-external/brother2.desc: Changed status of
Brother MFC-410CN to "basic" (bug #302961). Brother MFC-410CN to "basic" (bug #302961).
* doc/descriptions/unsupported.desc: Added Benq 7400UT and Genius * doc/descriptions/unsupported.desc: Added Benq 7400UT and Genius
Colorpage CS. Colorpage CS.
2006-01-26 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-26 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/snapscan-usb.c: Added #defines for SHM_R/W for cygwin * backend/snapscan-usb.c: Added #defines for SHM_R/W for cygwin
(patch from Philip Aston <philipa@mail.com>). (patch from Philip Aston <philipa@mail.com>).
* AUTHORS: Troy Rollo is now active. * AUTHORS: Troy Rollo is now active.
2006-01-22 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/epkowa.desc: Updated to match * doc/descriptions-external/epkowa.desc: Updated to match
iscan-1.18.0. Added usb ids (patch from Olaf Meeuwissen iscan-1.18.0. Added usb ids (patch from Olaf Meeuwissen
<olaf@member.fsf.org>). <olaf@member.fsf.org>).
* doc/descriptions/unsupported.desc: Added Scanshell 800N and * doc/descriptions/unsupported.desc: Added Scanshell 800N and
Canon Smartbase MP360. Canon Smartbase MP360.
* sanei/sanei_usb.c tools/sane-find-scanner.c: Added checks for * sanei/sanei_usb.c tools/sane-find-scanner.c: Added checks for
altsetting =! 0. altsetting =! 0.
2006-01-22 Mattias Ellert <mattias.ellert@tsl.uu.se> 2006-01-22 Mattias Ellert <mattias.ellert@tsl.uu.se>
* backend/dll.c, backend/plustek-usbhw.c, backend/plustek-usbscan.c, * backend/dll.c, backend/plustek-usbhw.c, backend/plustek-usbscan.c,
sanei/sanei_pio.c: Fixed warnings about C++ style comments. sanei/sanei_pio.c: Fixed warnings about C++ style comments.
* backend/hp5400_xfer.h: Fixed compilation warnings. * backend/hp5400_xfer.h: Fixed compilation warnings.
2006-01-21 Mattias Ellert <mattias.ellert@tsl.uu.se> 2006-01-21 Mattias Ellert <mattias.ellert@tsl.uu.se>
* backend/canon-sane.c: Fixed variable redeclaration. * backend/canon-sane.c: Fixed variable redeclaration.
2006-01-05 St<EFBFBD>hane Voltz <stefdev@modulonet.fr> 2006-01-05 Stephane Voltz <stefdev@modulonet.fr>
* tools/hotplug/libsane.usermap: Added Dell A920 (rebranded X1100) * tools/hotplug/libsane.usermap: Added Dell A920 (rebranded X1100)
2006-01-19 Gerhard Jaeger <gerhard@gjaeger.de> 2006-01-19 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: Update. * doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c: Bumped build number. Fixed constraint_type for * backend/plustek.c: Bumped build number. Fixed constraint_type for
OPT_BUTTON. OPT_BUTTON.
* backend/plustek-usbdevs.c: Added high-speed setting for HP2200. * backend/plustek-usbdevs.c: Added high-speed setting for HP2200.
Cleanup. Cleanup.
2006-01-18 Gerhard Jaeger <gerhard@gjaeger.de> 2006-01-18 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: Update. * doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c: Bumped build number. * backend/plustek.c: Bumped build number.
* backend/plustek-usbdevs.c: Fixed CanoScan N670U settings, * backend/plustek-usbdevs.c: Fixed CanoScan N670U settings,
see (bugreport #302738). see (bugreport #302738).
2006-01-15 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-15 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/canon630u.desc doc/descriptions/coolscan2.desc * doc/descriptions/canon630u.desc doc/descriptions/coolscan2.desc
doc/descriptions/hp5400.desc doc/descriptions/niash.desc doc/descriptions/hp5400.desc doc/descriptions/niash.desc
doc/descriptions/unsupported.desc: Added USB vendor and product doc/descriptions/unsupported.desc: Added USB vendor and product
ids. Minor cleanup. ids. Minor cleanup.
* backend/artec_eplus48u.conf.in doc/sane-artec_eplus48u.man * backend/artec_eplus48u.conf.in doc/sane-artec_eplus48u.man
doc/descriptions/artec_eplus48u.desc: Added Yakumo Scan50. Minor doc/descriptions/artec_eplus48u.desc: Added Yakumo Scan50. Minor
cleanup. cleanup.
* doc/descriptions/gt68xx.desc: Added Mustek BearPaw 1248 CU. * doc/descriptions/gt68xx.desc: Added Mustek BearPaw 1248 CU.
* doc/descriptions/lexmark.desc: Added USB vendor and product * doc/descriptions/lexmark.desc: Added USB vendor and product
ids. Changed status of X1150 and X1170 according to reports on ids. Changed status of X1150 and X1170 according to reports on
sane-devel. sane-devel.
2006-01-15 Ulrich Deiters <ulrich.deiters@uni-koeln.de> 2006-01-15 Ulrich Deiters <ulrich.deiters@uni-koeln.de>
* backend/canon-sane.c: fixed byte-swapping problem for little-endian * backend/canon-sane.c: fixed byte-swapping problem for little-endian
platforms (affects raw-mode scanning with FS2710 slide scanner) platforms (affects raw-mode scanning with FS2710 slide scanner)
2006-01-14 Henning Meier-Geinitz <henning@meier-geinitz.de> 2006-01-14 Henning Meier-Geinitz <henning@meier-geinitz.de>
@ -630,7 +638,7 @@
* backend/snapscan-scsi.c backend/snapscan-options.c backend/snapscan.c: * backend/snapscan-scsi.c backend/snapscan-options.c backend/snapscan.c:
Some fixes for the Epson Stylus CX1500 Some fixes for the Epson Stylus CX1500
2006-01-05 St<EFBFBD>hane Voltz <stefdev@modulonet.fr> 2006-01-05 Stephane Voltz <stefdev@modulonet.fr>
* backend/umax_pp_low.c: removed unused local variable * backend/umax_pp_low.c: removed unused local variable
@ -761,45 +769,45 @@
2005-12-27 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-27 Henning Meier-Geinitz <henning@meier-geinitz.de>
* README.linux: Mention ld.so.conf issue. * README.linux: Mention ld.so.conf issue.
* doc/descriptions/unsupported.desc * doc/descriptions/unsupported.desc
doc/descriptions-external/hp3900.desc: Added external hp3900 doc/descriptions-external/hp3900.desc: Added external hp3900
backend. Moved (possibly) supported scanners from backend. Moved (possibly) supported scanners from
unsupported.desc. unsupported.desc.
* doc/backend-writing.c: Added some hints about what to do to add * doc/backend-writing.c: Added some hints about what to do to add
a new backend to the existing sane-backends code. a new backend to the existing sane-backends code.
2005-12-24 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-24 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Lexmark X2330. * doc/descriptions/unsupported.desc: Added Lexmark X2330.
2005-12-23 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-23 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Canon Pixma MP500. * doc/descriptions/unsupported.desc: Added Canon Pixma MP500.
* README.openbsd: Added hint about CPPFLAGS. * README.openbsd: Added hint about CPPFLAGS.
* doc/descriptions/artec.desc: Changed status of Artec AT6 to * doc/descriptions/artec.desc: Changed status of Artec AT6 to
"good" as reported in bug #302749. "good" as reported in bug #302749.
* tools/hotplug/libsane.usermap: Added Brother MFC-7420. * tools/hotplug/libsane.usermap: Added Brother MFC-7420.
2005-12-20 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-20 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/dll.c doc/descriptions/dll.desc: Fixed dynamic loading * backend/dll.c doc/descriptions/dll.desc: Fixed dynamic loading
on current HP/UX systems (bug #302732). on current HP/UX systems (bug #302732).
* AUTHORS ChangeLog configure configure.in backend/Makefile.in * AUTHORS ChangeLog configure configure.in backend/Makefile.in
backend/dll.conf backend/hp3500.c doc/Makefile.in backend/dll.conf backend/hp3500.c doc/Makefile.in
doc/sane-hp3500.man doc/sane.man doc/descriptions/hp3500.desc: doc/sane-hp3500.man doc/sane.man doc/descriptions/hp3500.desc:
Added hp3500 backend which supports the HP ScanJet 3500 series, Added hp3500 backend which supports the HP ScanJet 3500 series,
including the 3500C, 3530C and 3570C (patch from Troy Rollo including the 3500C, 3530C and 3570C (patch from Troy Rollo
<sane@troy.rollo.name>) (bug #302687). <sane@troy.rollo.name>) (bug #302687).
* doc/descriptions-external/hp3500.desc: Deleted. * doc/descriptions-external/hp3500.desc: Deleted.
* doc/descriptions/hp4200.desc doc/descriptions/lexmark.desc * doc/descriptions/hp4200.desc doc/descriptions/lexmark.desc
doc/descriptions/mustek_usb2.desc: Removed "NEW!" markers. doc/descriptions/mustek_usb2.desc: Removed "NEW!" markers.
2005-12-18 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-12-18 Henning Meier-Geinitz <henning@meier-geinitz.de>
* Makefile.in: List ChangeLog-1.0.17 in DISTFILES. * Makefile.in: List ChangeLog-1.0.17 in DISTFILES.
* configure configure.in: Changed version to 1.0.17-cvs. Enabled * configure configure.in: Changed version to 1.0.17-cvs. Enabled
compilation warnings. compilation warnings.
* doc/descriptions-external/brother2.desc: Added Brother MFC-215C. * doc/descriptions-external/brother2.desc: Added Brother MFC-215C.
Older entries can be found in ChangeLog-1.0.17. Older entries can be found in ChangeLog-1.0.17.

8
backend/plustek-usbcal.c
Wyświetl plik

@ -1137,7 +1137,7 @@ cano_DoCalibration( Plustek_Device *dev )
scaps->workaroundFlag &= ~_WAF_SKIP_FINE; scaps->workaroundFlag &= ~_WAF_SKIP_FINE;
scaps->workaroundFlag &= ~_WAF_BYPASS_CALIBRATION; scaps->workaroundFlag &= ~_WAF_BYPASS_CALIBRATION;
if( !dev->adj.cacheCalData ) if( !dev->adj.cacheCalData && !usb_IsSheetFedDevice(dev))
usb_SpeedTest( dev ); usb_SpeedTest( dev );
/* here we handle that warmup stuff for CCD devices */ /* here we handle that warmup stuff for CCD devices */
@ -1198,6 +1198,12 @@ cano_DoCalibration( Plustek_Device *dev )
skip_fine = SANE_FALSE; skip_fine = SANE_FALSE;
idx_end = DIVIDER+1; idx_end = DIVIDER+1;
/* did I say any case? */
if (scan->sParam.bBitDepth != 8) {
skip_fine = SANE_TRUE;
DBG( _DBG_INFO2, "No fine calibration for non-8bit modes!\n" );
}
} else if( usb_IsSheetFedDevice(dev)) { } else if( usb_IsSheetFedDevice(dev)) {
/* we only to the calibration upon request !*/ /* we only to the calibration upon request !*/

6
backend/plustek-usbcalfile.c
Wyświetl plik

@ -433,7 +433,13 @@ usb_ReadAndSetCalData( Plustek_Device *dev )
if( 13 == res ) { if( 13 == res ) {
usb_RestoreCalData( dev, &cal ); usb_RestoreCalData( dev, &cal );
ret = SANE_TRUE; ret = SANE_TRUE;
} else {
DBG( _DBG_ERROR, "Error reading coarse-calibration data, only "
"%d elements available!\n", res );
} }
} else {
DBG( _DBG_ERROR, "Error reading coarse-calibration data for "
"PFX: >%s<!\n", pfx );
} }
fclose( fp ); fclose( fp );

19
backend/plustek-usbhw.c
Wyświetl plik

@ -48,6 +48,8 @@
* - added special misc I/O setup for CIS devices (usb_ResetRegisters) * - added special misc I/O setup for CIS devices (usb_ResetRegisters)
* - 0.51 - change usb_AdjustLamps() and use it now in usb_switchLamp() * - 0.51 - change usb_AdjustLamps() and use it now in usb_switchLamp()
* - added usb_Wait4ScanSample() and usb_InCalibrationMode() * - added usb_Wait4ScanSample() and usb_InCalibrationMode()
* - tweaked EjectPaper to work correctly with the supported sheetfed
* devices
* . * .
* <hr> * <hr>
* This file is part of the SANE package. * This file is part of the SANE package.
@ -438,7 +440,7 @@ usb_WaitPos( Plustek_Device *dev, u_long to, SANE_Bool stay )
static SANE_Bool static SANE_Bool
usb_ModuleMove( Plustek_Device *dev, u_char action, u_long dwStep ) usb_ModuleMove( Plustek_Device *dev, u_char action, u_long dwStep )
{ {
SANE_Bool retval; SANE_Bool retval, ejected;
u_char bReg2, reg7, mclk_div; u_char bReg2, reg7, mclk_div;
u_short wFastFeedStepSize; u_short wFastFeedStepSize;
double dMaxMoveSpeed; double dMaxMoveSpeed;
@ -466,12 +468,15 @@ usb_ModuleMove( Plustek_Device *dev, u_char action, u_long dwStep )
hw->dMaxMoveSpeed += 0.8; /* was 0.6 */ hw->dMaxMoveSpeed += 0.8; /* was 0.6 */
DBG( _DBG_INFO2, "Ejecting paper...\n" ); DBG( _DBG_INFO2, "Ejecting paper...\n" );
retval = SANE_TRUE; retval = SANE_TRUE;
ejected = SANE_FALSE;
do { do {
if( usb_SensorPaper(dev) && if( usb_SensorPaper(dev)) {
!usb_ModuleMove(dev,MOVE_SkipPaperSensor, 0 )) { if (!usb_ModuleMove(dev,MOVE_SkipPaperSensor, 0 )) {
hw->dMaxMoveSpeed = d; hw->dMaxMoveSpeed = d;
return SANE_FALSE; return SANE_FALSE;
}
ejected = SANE_TRUE;
} }
if( usb_SensorAdf(dev->fd) && if( usb_SensorAdf(dev->fd) &&
@ -490,7 +495,7 @@ usb_ModuleMove( Plustek_Device *dev, u_char action, u_long dwStep )
* to make sure, that the scanned sheet is out of the scanner * to make sure, that the scanned sheet is out of the scanner
* BUT: not at startup * BUT: not at startup
*/ */
if (dev->initialized >= 0) { if (dev->initialized >= 0 || ejected) {
if(!usb_ModuleMove( dev, MOVE_Forward, 300 /* *3 */)) { if(!usb_ModuleMove( dev, MOVE_Forward, 300 /* *3 */)) {
hw->dMaxMoveSpeed = d; hw->dMaxMoveSpeed = d;
return SANE_FALSE; return SANE_FALSE;

35
backend/plustek.c
Wyświetl plik

@ -157,7 +157,7 @@
#include "../include/sane/sanei.h" #include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h" #include "../include/sane/saneopts.h"
#define BACKEND_VERSION "0.51-10" #define BACKEND_VERSION "0.51-11"
#define BACKEND_NAME plustek #define BACKEND_NAME plustek
#include "../include/sane/sanei_access.h" #include "../include/sane/sanei_access.h"
@ -216,8 +216,8 @@ static const SANE_Device **devlist = 0;
static unsigned long tsecs = 0; static unsigned long tsecs = 0;
static Plustek_Scanner *sc = NULL; static Plustek_Scanner *sc = NULL;
static const SANE_Int bpp_lm9832_list [] = { 2, 8, 14 }; static const SANE_Int bpp_lm9832_list [] = { 1, 8, 14 };
static const SANE_Int bpp_lm9833_list [] = { 2, 8, 16 }; static const SANE_Int bpp_lm9833_list [] = { 1, 8, 16 };
static const SANE_String_Const mode_list[] = static const SANE_String_Const mode_list[] =
{ {
@ -355,7 +355,7 @@ getScanMode( Plustek_Scanner *scanner )
} else { } else {
scanner->params.depth = 16; scanner->params.depth = 16;
if( mode == 1 ) if( mode == 1 )
scanmode = COLOR_GRAY16; scanmode = COLOR_GRAY16;
else else
scanmode = COLOR_TRUE48; scanmode = COLOR_TRUE48;
} }
@ -1760,27 +1760,28 @@ do_calibration( void *args )
Plustek_Device *dev = s->hw; Plustek_Device *dev = s->hw;
DCapsDef *caps = &dev->usbDev.Caps; DCapsDef *caps = &dev->usbDev.Caps;
int scanmode, rc; int scanmode, rc;
int modes[] = { COLOR_BW, COLOR_256GRAY, COLOR_GRAY16,
COLOR_TRUE24, COLOR_TRUE48 };
thread_entry(); thread_entry();
/* if the device does only supports color scanning, there's no need /* if the device does only support color scanning, there's no need
* to calibrate the gray mode * to calibrate the gray modes
*/ */
if (caps->workaroundFlag & _WAF_GRAY_FROM_COLOR) if (caps->workaroundFlag & _WAF_GRAY_FROM_COLOR)
scanmode = 2; scanmode = 3;
else else
scanmode = 1; scanmode = 0;
for ( ; scanmode < 3; scanmode++ ) { for ( ; scanmode < 5; scanmode++ ) {
dev->scanning.dwFlag |= SCANFLAG_Calibration; dev->scanning.dwFlag |= SCANFLAG_Calibration;
if (SANE_STATUS_GOOD == local_sane_start(s, scanmode)) { if (SANE_STATUS_GOOD == local_sane_start(s, modes[scanmode])) {
/* prepare for scanning: speed-test, warmup, calibration */ /* prepare for scanning: speed-test, warmup, calibration */
rc = usbDev_Prepare( dev, s->buf ); rc = usbDev_Prepare( dev, s->buf );
if( rc != 0 || scanmode == 2) { if( rc != 0 || scanmode == 4) {
if (rc != 0 ) if (rc != 0 )
DBG(_DBG_INFO,"Calibration canceled!\n"); DBG(_DBG_INFO,"Calibration canceled!\n");
m_fStart = SANE_TRUE; m_fStart = SANE_TRUE;
@ -1827,7 +1828,15 @@ sane_control_option( SANE_Handle handle, SANE_Int option,
do_cancel(s, SANE_TRUE); do_cancel(s, SANE_TRUE);
return SANE_STATUS_GOOD; return SANE_STATUS_GOOD;
} }
return SANE_STATUS_DEVICE_BUSY;
/* okay, we need some exceptions */
switch (option) {
case OPT_TL_X:
case OPT_TL_Y:
case OPT_BR_X:
case OPT_BR_Y: break;
default: return SANE_STATUS_DEVICE_BUSY;
}
} }
} }

12
doc/plustek/Plustek-USB.changes
Wyświetl plik

@ -1,8 +1,18 @@
Plustek.changes - Gerhard Jäger <gerhard@gjaeger.de> Plustek.changes - Gerhard Jäger <gerhard@gjaeger.de>
==================================================== ====================================================
Note: All other not mentioned builds have never been released. Note: All other not mentioned builds have never been released.
V 0.51-11 (2006-06-08)
----------------------
Fixed calibration: All modes will be coarse calibrated now, fine calibration
will be done only for 8 bit modes.
Fixed paper eject during startup.
V 0.51-10 (2006-05-28)
---------------------
Released
V 0.51-8 (2006-04-09) V 0.51-8 (2006-04-09)
--------------------- ---------------------
Added cache for fine calibration (CIS devices only) Added cache for fine calibration (CIS devices only)