Wykres commitów

2939 Commity (bd44b058a0c2a99efb2c265a7c5ba949ad3bd6f7)

Autor SHA1 Wiadomość Data
Alessandro Zummo 56cac490f9 epson2: support TPU2 on GT-X800/V700 2011-12-02 00:27:28 +01:00
Stéphane Voltz b5eae79777 increase internal build number 2011-11-29 21:32:31 +01:00
Stéphane Voltz db23500243 improve GL847 shading calibration
- repark between each shading step
2011-11-29 21:32:31 +01:00
Stéphane Voltz f2acf37faa change led calibration for gl847 2011-11-29 21:32:31 +01:00
Stéphane Voltz f9447a43ff initialize fe before using it 2011-11-29 21:32:31 +01:00
m. allan noah 69b5f8cfcf Fujitsu backend v107 and v108
- M3091 does not support scanner_control(adf)
- Correct buffer overflow in read_from_3091duplex()
- sane_read() now always calls read_from_*()
- read_from_*() are callable when there is no data, and read to eof
- sane_read() will keep alternate duplex reads to similar length
- Added debugging statements
- Corrected comments
- Updated Copyright
- merged x/y resolution options
- moved page width/height to start of geometry group
- use mode to pick resolution list v/s range
- improved M3091 resolution choices
2011-11-21 15:19:26 -05:00
Chris Bagwell 2c4b1da0bf add FreeBSD Port's patches
epson2-commands.c: Include <sys/types.h> to resolve u_long.
epson2.c, magicolor.c, xerox_mfp-tcp.c: Include <sys/types.h>
and to <sys/socket.h> for anyone using setsockopt().
sanei_tcp.h: Include <sys/types.h> since ssize_t is referenced.
sanei_usb.c: Newer FreeBSD version checks.

All changes in this patch set come from FreeBSD ports patches.
Bug #312503.
2011-11-20 20:08:15 -06:00
Stéphane Voltz 0af5d2f94f genesys backend build 66 changelog 2011-11-20 11:34:30 +01:00
Stéphane Voltz b7a62c1d54 align offset/gain calibration of gl847 on gl124 code 2011-11-20 10:47:20 +01:00
Stéphane Voltz d0931a27c8 update HP N6310 description 2011-11-20 08:05:39 +01:00
Stéphane Voltz d090c32918 first step for N6310 2011-11-20 08:03:54 +01:00
Stéphane Voltz 3cd3534e87 fix calibration crash for LiDE 100/200 2011-11-20 08:02:55 +01:00
Stéphane Voltz 0e409babcc Merge branch 'gl843' 2011-11-19 09:53:06 +01:00
Stéphane Voltz c84445039d add HP 4850c as an untested gl843 device 2011-11-19 09:50:44 +01:00
Stéphane Voltz d750676ed0 XPA support for gl843 preparation
- define exposure map for XPA
- define optical flag for XPA
2011-11-19 09:34:12 +01:00
Nils Philippsen c648a4411e avision: reenable grayscale and lineart modes for AV220
See https://bugzilla.redhat.com/show_bug.cgi?id=700725
2011-11-18 12:17:22 +01:00
Alessandro Zummo cafa49bb92 epson2: fixup detection of GT-7000 2011-11-17 20:34:09 +01:00
Stéphane Voltz 6ddaf6fbc1 G4050 XPA progress
- define and tune move_to_ta for gl843
- GPIO settings to light XPA lamp
- GPIO settings to enable XPA lamp motor
- park XPA lamp function for gl843
2011-11-14 06:16:17 +01:00
Stéphane Voltz 23727765f8 handle XPA light on
- select XPA is trnasparency method
- toggle GPIO for XPA if needed
2011-11-14 06:16:17 +01:00
Stéphane Voltz 11ff6cfaa6 includes cleanup
- remove uneeded includes from genesys.c
- move backend name define to C file for unit testing
2011-11-14 06:16:17 +01:00
Stéphane Voltz 389cef9ca8 includes cleanup 2011-11-14 06:16:17 +01:00
Stéphane Voltz ec8bdc31a3 define and use HAS_UTA flag for G4050
- remove unused ALT_SLOPE flag
- create HAS_UTA_FLAG
- ease some compilation warnings
2011-11-14 06:16:17 +01:00
Stéphane Voltz 99df6f2b0a lamp off at sane_close() 2011-11-14 06:16:17 +01:00
Chris Bagwell 3125506715 revert broken sleep()->usleep conversion.
Got unit conversion wrong.
2011-11-10 18:39:12 -06:00
Chris Bagwell 50475719ef portabilty mods to epson2 backend
No behavior changes.  Wrap some optional headers with #ifdef's and
use usleep() instead of sleep() since it exist everywhere.
2011-11-09 21:50:18 -06:00
Chris Bagwell e7f01c3b36 Add --disable-dynamic/--disable-preload and update docs
Options were in README but removed at some point.  They
are useful so add them back.

Document BACKENDS and PRELOADABLE_BACKENDS variables in
README as well as in configure --help output.
2011-11-08 21:28:30 -06:00
Chris Bagwell db068dd6b1 complete preload linking fix.
dll.c is were optional preload behavior is implemented.
Since its linked in using a convienence library, we need
to libraries to have different behavior.
2011-11-08 20:06:30 -06:00
Chris Bagwell 0a6d41ff59 Add missing sanei_magic.lo to libsane backend.
At least Fujitsu backend uses it so needed to be able
to run "configure PRELOADABLE_BACKENDS=fujtsu".
2011-11-07 19:29:38 -06:00
Chris Bagwell 1dd768d534 Do not link in preload backends for libsane-dll
Current backend/Makefile.am states difference between libsane and
libsane-dll as:

> libsane.la and libsane-dll.la are the same thing except for
> the addition of backends listed by PRELOADABLE_BACKENDS that are
> statically linked in.

We were (mistakenly) linking in dll-preload.h and thus symbols
for all preload backends for both libraries but we were only
linking in those symbols for libsane.

This mistake became obvious on mingw which does not allow for
any unresolved symbols.  Resolve by forcing an empty preload
backend list for libsane-dll.
2011-11-06 16:39:06 -06:00
Chris Bagwell 5061c2d5b2 More mingw portability updates.
Add check for winsock2.h for socket.h replancement. Also, use this
check to add ws2_32 library. Also, switch all winsock.h references
to winsock2.h.

Add check for getuid and getpass; which are not on mingw.

Add a syslog() replacement that is basically a print(). This
is also used by vsyslog() replacement.

Comment out parts of replacement sigprocmask.c on mingw.

To support these configure.in changes, I need to rebuild all
related files with autoconf 2.68 and libtool 2.4. Hand ported
our sane-backend specific changes to newer ltmain.sh.
2011-11-06 12:40:00 -06:00
Chris Bagwell e7d1932f5b use usleep consistently in umax_pp_low.c
It was about an 90/10 split with usleep/sleep. We have portablity
logic to make usleep on all platforms but not sleep. This is
needed to link tools directory under mingw.
2011-11-06 11:24:45 -06:00
Stéphane Voltz 8f0f05225b includes for genesys_gl841.c 2011-11-02 08:41:10 +01:00
Stéphane Voltz 11d8819768 genesys code cleanup
- create an include file for genesys_gl841.c
- simplify includes
- cleanup warnings
2011-11-02 08:40:25 +01:00
m. allan noah 938469218b Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends
Conflicts:
	ChangeLog
2011-11-01 16:12:03 -04:00
m. allan noah 8ee3e59375 canon_dr: DR-2580C pads the backside of duplex scans 2011-11-01 15:23:08 -04:00
Stéphane Voltz f0e42223a7 include <sys/types> in a clean way 2011-11-01 16:10:07 +01:00
Stéphane Voltz 638d7750a9 fix gpo description of LIDE210 2011-11-01 10:08:36 +01:00
Mattias Ellert 9e639753a3 Include <sys/types.h> for definition of u_long on MacOS X 2011-10-30 10:32:34 +01:00
Mattias Ellert c048a73700 Use more precise path to internal headers 2011-10-30 10:27:47 +01:00
Mattias Ellert 97e89c3ad7 Use portable endian macros from config.h 2011-10-30 10:19:07 +01:00
Stéphane Voltz 0c75f5ca4e minor compatibility change for KV-SS080 2011-10-21 07:45:45 +02:00
Stéphane Voltz 6aec6884b1 G4010/G4050 device description cleanup 2011-10-21 07:45:45 +02:00
Stéphane Voltz 61daa4300b shading data bug is fixed 2011-10-21 07:45:44 +02:00
Stéphane Voltz d35e4a072f GL843 progress, working 1200 and 2400 dpi modes
- shading is working using SHDAREA
2011-10-21 07:45:44 +02:00
Stéphane Voltz 1329a3dfe0 G4050 progress : working 1200/2400 dpi
- handle undocumented register 0xaa
2011-10-21 07:45:44 +02:00
Stéphane Voltz 20b6d224fb adjust ld shift to normal case when needed 2011-10-21 07:45:44 +02:00
Stéphane Voltz b05ca3c3f3 move specific gl843 shading function to genesys_gl843.c 2011-10-21 07:45:44 +02:00
Stéphane Voltz 155bc33c62 handle different domains for ld distance shift 2011-10-21 07:45:44 +02:00
Stéphane Voltz e52c10adf6 simplified *regs_off parameters 2011-10-21 07:45:44 +02:00
Stéphane Voltz 6490c9635f move ld_shift_* values from motor to device session level 2011-10-21 07:45:44 +02:00
Stéphane Voltz c7e0cbd84c gl843 3 way dichotomy for offset calibration 2011-10-21 07:45:43 +02:00
Stéphane Voltz 85eade8436 GL843 ok up to 600 dpi optical 2011-10-21 07:45:43 +02:00
Stéphane Voltz 1ed7e3e589 G4050 WIP : stable point
- scanarea needs tuning
- calibration needs tuning
2011-10-21 07:45:43 +02:00
Stéphane Voltz 45ea23bc56 G4050 2400 dpi is working 2011-10-21 07:45:43 +02:00
Stéphane Voltz 40ebdf4676 cksel setting fix 2011-10-21 07:45:43 +02:00
Stéphane Voltz e133c62730 minor cleanups 2011-10-21 07:45:43 +02:00
Stéphane Voltz dd6df8a7c7 GL843 progress
- warming up working for gl843 scanners
- per resolution motor/sensor profiles for gl843 scanners
- use sanei_genesysy_slope_tale for gl843 scanners
- glxxx_set_motor_power usage cleanups
2011-10-21 07:45:43 +02:00
Stéphane Voltz 6b1afd92ab add scan_mode to gl843_init_scan_reg 2011-10-21 07:45:43 +02:00
Stéphane Voltz 73cbc00b3e initialize binary debug file to NULL 2011-10-20 06:28:41 +02:00
Alex Belkin 4293d7b1fd Usb id for Samsung CLX 3185, reported by John Dignum.
From: John Dignum <jp.dignum@dignum.jp>
2011-10-19 11:40:11 +04:00
m. allan noah 8607f65505 Revert "Applied patch for HPN6310"
This reverts commit f7a0ef6817.
2011-10-18 20:47:56 -04:00
m. allan noah 96fa2ec9fe Revert "unwanted files removed"
This reverts commit b99814b0b4.
2011-10-18 20:47:31 -04:00
Abdul Salam 95d2512169 Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends 2011-10-17 13:00:25 +05:30
JAZ b99814b0b4 unwanted files removed 2011-10-17 12:49:31 +05:30
JAZ f7a0ef6817 Applied patch for HPN6310 2011-10-17 12:27:09 +05:30
Julien BLACHE ff534c16cb Use IPv6 prefix reserved for documentation (2001:db8::/32) 2011-10-10 18:22:43 +02:00
Alex Belkin 4f30d7e7eb Usb id for Samsung SCX-4828FN or SCX-4x28 Series, reported by Patrice Levesque.
Reported via https://alioth.debian.org/tracker/?func=detail&atid=410366&aid=313380&group_id=30186
2011-10-01 16:18:54 +04:00
Reinhold Kainhofer b0058051f0 Magicolor: Fix SNMP detection with multiple snmp agents in the network.
So far, the snmp detection would stop working after the first response, because libsnmp
haved like that if we return 1 in the callback. Since we want multiple responses to one
broadcast query, we don't tell libsnmp that the response has answered our query.
As a drawback, libsnmp will send the same query in 1-second-intervals, and each device
will answer again. So, we have to keep a list of all devices already detected.
2011-09-19 19:28:59 +02:00
Nils Philippsen 058f423a30 epson2: add USB id for Epson Stylus SX125 2011-09-16 13:17:33 +02:00
Stéphane Voltz b4d279d540 fix code typo 2011-09-07 06:46:59 +02:00
Stéphane Voltz 49ebc601bf fix canon LiDE 210 button mapping 2011-09-07 06:45:16 +02:00
Stéphane Voltz 84d39e7188 MD5345 shading calibration fix
- create a no move during shading calibration flag
- use this flag for MD5345
2011-08-25 06:43:25 +02:00
Stéphane Voltz d5189e200d genesys park and preview improvements
- use fatest motor speed to park for gl843, gl847 and gl124
- use sensor lowest dpi (and not motor's one) as default value so
	preview is done with it
2011-08-23 07:20:52 +02:00
Stéphane Voltz ae95873837 calibration fixes
- make calibration work for both KV-SS080 and G4050
2011-08-22 22:19:57 +02:00
Stéphane Voltz 1e8c1043b3 fixes for G4050
- add feed function and use it a init time
- update KV-SS080 CKxMAP
- clean up old CKxMAP setting up code
2011-08-22 21:07:49 +02:00
Stéphane Voltz 55bf2b85c7 G4050/G4010 calibration fixes
- handle varying dpihw when doing calibration
- use flags from genesys_low.h
- handle dummy and black pixels
2011-08-22 07:07:15 +02:00
Stéphane Voltz dbc2f9976f code cleanups to prepare glxxx_init_scan_regs convergence 2011-08-22 07:05:54 +02:00
Stéphane Voltz e56afbd8e8 change resolution default for all scanners
- use lowest available y dpi instead of fixed 300 dpi so that preview
  with scanimage is done at low resolution
value
2011-08-22 07:03:27 +02:00
Stéphane Voltz 9b1fbd3d9d use flags from genesys_low.h 2011-08-22 07:02:56 +02:00
Stéphane Voltz 0fc5db2155 use flags from genesys_low.h 2011-08-22 07:02:27 +02:00
Stéphane Voltz 2ea0836330 add log debug log message and define optical/motor flags 2011-08-22 07:01:18 +02:00
Stéphane Voltz 656b79e6e2 activate calibration for G4050/G4010 and tune scanarea width 2011-08-22 07:00:24 +02:00
Stéphane Voltz 774f86861a G4050 parking issue fixed
- use FEED flag for parking
2011-08-12 07:55:52 +02:00
Stéphane Voltz e742139517 600 dpi working again for G4050 2011-08-11 21:59:37 +02:00
Stéphane Voltz bd581d8ca4 handle cache calibration for scan resolution higher than sensor's one
- x scan resolution may be higher than sensor's one, in this case use
  sensor resolution for calibration cache
2011-08-05 07:17:36 +02:00
Stéphane Voltz 410021d1e8 improved read data expansion in lineart mode 2011-08-04 21:42:03 +02:00
Stéphane Voltz 4e9895aca0 use scan method constat intead of numeric value 2011-08-02 07:32:11 +02:00
Stéphane Voltz 867cd5e14c fix generic is_compatible_cache for CCD case 2011-08-02 07:31:38 +02:00
Stéphane Voltz 0e83cf58eb is_compatible_cache refactor for gl124, gl847 and gl843 2011-07-31 22:09:46 +02:00
Stéphane Voltz bda7a84ade use sanei_genesys_compute_dpihw instead of per asic function 2011-07-31 09:00:03 +02:00
Stéphane Voltz 66fa10b91a re-tune MD5345/MD6228 scan area 2011-07-15 10:00:05 +02:00
Stéphane Voltz 5dd12d4a61 slow_back_home cleanups 2011-07-15 08:18:27 +02:00
Stéphane Voltz a77381a4af increase tolerance for home point detection 2011-07-15 07:29:12 +02:00
Stéphane Voltz eb061b2c28 fixed incorrect image height for sheetfed scanners 2011-07-07 22:31:08 +02:00
m. allan noah 03c6806618 canon_dr backend v38
- initial support for DR-5020
- use ppl_mod instead of Bpl_mod, apply to all modes
- invert logic of read_panel tracking
- add ability to disable read_panel()
- automatically disable read/send_panel if unsupported
2011-07-07 10:29:45 -04:00
Stéphane Voltz 91027fdee9 double the number of shading lines at 4800 dpi 2011-07-06 21:45:34 +02:00
Stéphane Voltz c4ebb66293 remove all un-needed use of mode->shading_lines 2011-07-06 21:33:38 +02:00
Stéphane Voltz 68074484ff use the new calib_lines field instead of model->shading_lines 2011-07-06 21:17:13 +02:00
Stéphane Voltz 5a0c42a357 calibration cache fix
- overwrite old entries so that calibration file doesn't grow up
2011-07-05 15:04:30 +02:00
Stéphane Voltz 1581bd3865 Merge branch 'gl847' 2011-07-05 14:29:12 +02:00
Stéphane Voltz abcc5104dd 4800 dpi now fully working 2011-07-05 14:27:56 +02:00
Stéphane Voltz b8ea43fd39 added bytes to skip from scan line 2011-07-05 13:55:13 +02:00
Stéphane Voltz 197d5ce954 high resolution fixes
- use 32 bit number for pixel number so we can handle high resolution
- simplify cache reuse
- code cleanups
2011-07-05 13:53:44 +02:00
Stéphane Voltz 69b17b34f2 binary logging fixes 2011-06-29 06:55:26 +02:00
Stéphane Voltz e827077bf3 binary logging change
- removed old raw data logging
- added new binary data logging (gl847 only for now)
2011-06-28 22:13:41 +02:00
Stéphane Voltz a3274977cb add little move at probe time 2011-06-27 06:29:05 +02:00
Alex Belkin 9aa6850874 USB id for Samsung CLX-216x Series, tested with CLX-216.
Reported by Malte Starostik <malte@malte.homeip.net>
2011-06-16 13:34:59 +04:00
Stéphane Voltz 15e256f8b0 lineart fix 2011-06-15 07:14:08 +02:00
Stéphane Voltz 245db82a37 HP2400 support from Alexey Osipov <simba@lerlan.ru>
- applied and tweaked a patch from Alexey Osipov to complete
HP2400 support
2011-06-13 21:52:05 +02:00
Stéphane Voltz b750f1715c gl847 start of scanarea tuning 2011-06-13 21:15:47 +02:00
Stéphane Voltz cef28b4d46 X1100 device regression fix 2011-06-09 22:22:57 +02:00
Stéphane Voltz 80254a558c move LIDE 100 to new description model, 2400 now available 2011-06-08 22:23:30 +02:00
Stéphane Voltz e2b633ef8b good for release
- nice quality from 75 to 2400 dpi
- 4800 dpi shading improvement
- motor moving smoothing
2011-06-08 21:55:59 +02:00
Stéphane Voltz 0a807c9db1 position after shading OK 2011-06-07 21:26:20 +02:00
Stéphane Voltz 91a186bce0 move ok at all resolution 2011-06-07 21:26:20 +02:00
Stéphane Voltz abf93fae62 fix 1200 dpi move bug by using fast fed only for this mode 2011-06-07 21:26:20 +02:00
Stéphane Voltz c31eb26d1e LiDE 200 almost OK
- 1200 dpi scans hang after calibration
- 4800 dpi shding data is incorrect
- move to scan area needs tuning
2011-06-07 21:26:20 +02:00
Stéphane Voltz 18beac8e63 1200 and 2400 dpi shading are working 2011-06-07 21:26:20 +02:00
Stéphane Voltz ae6349b2ba shading calibration start to work again at <= 600 dpi 2011-06-07 21:26:20 +02:00
Stéphane Voltz a7652acdcc working 4800 dpi scans 2011-06-07 21:26:20 +02:00
Stéphane Voltz 9f9a157801 4800 dpi motor settings progress 2011-06-07 21:26:19 +02:00
Stéphane Voltz 721d388eca swithc slop definitions to uin32t to allow high resolutions 2011-06-07 21:26:19 +02:00
Stéphane Voltz d7551176ce 4800 dpi WIP
- 8 segments scan handling for 8 and 16 bits
- scan buffer size computing fix
- enable 4800 dpi for LiDE 200
- tune minimal slope size to step factor
2011-06-07 21:26:19 +02:00
Stéphane Voltz bfc3cad22f working 2400 dpi mode for gl847 2011-06-07 21:26:19 +02:00
Stéphane Voltz 49b9fa7c4b fast move to scan area at 1200 dpi 2011-06-07 21:26:19 +02:00
Stéphane Voltz 7f30df8b6f 1200 DPI working again 2011-06-07 21:26:18 +02:00
Stéphane Voltz d67135cf4c gl847 rework : 75-600 dpi motor speed working 2011-06-07 21:26:18 +02:00
Stéphane Voltz 4f5be8bdb7 gl847 rework progress 2011-06-07 21:26:18 +02:00
Stéphane Voltz 801f4ed160 before gl847 motor setting rewrite 2011-06-07 21:26:18 +02:00
Stéphane Voltz f3fa997d9b gl847 exposure setting rework 2011-06-07 21:26:18 +02:00
Stéphane Voltz 1265e26d61 gl847 rewrite progress
- sensor setup function updated
2011-06-07 21:26:17 +02:00
Stéphane Voltz 2a6872c385 rework gl847 to set up exposure and coordinates like multi-segmented
gl124
2011-06-07 21:26:17 +02:00
Stéphane Voltz c67786154f Add software page de-rotate and white page skip 2011-06-07 06:38:04 +02:00
m. allan noah e4f634d68e add support for sanei_magic to kvs1025 backend 2011-06-06 20:52:25 -04:00
m. allan noah 483b0dc488 adding new kvs40xx backend 2011-06-06 14:28:55 -04:00
Stéphane Voltz 08b5abc8ca add Xerox 2400 onetouch model 2011-04-20 21:42:49 +02:00
Stéphane Voltz 709885ccaf big endian hadling rewrite 2011-03-28 17:16:59 +02:00
Stéphane Voltz b1da70e585 minor changes for genesys backend
- improve calibration file handling
- big endian fixes rewrite
2011-03-18 07:04:35 +01:00
Stéphane Voltz d581aec7ad big endian fixes for gl847/gl124 based scanners 2011-03-17 06:20:17 +01:00
Stéphane Voltz 6ae81b713b make private function getLine static
- make private function getLine static to prevent clashing with
  same function from sanei_magic.c under cygwin static build
2011-03-15 06:19:50 +01:00
Stéphane Voltz 1891efebfe add sanei_magic to libsane dependencies
- add sanei_magic to libsane dependencies to fix problems
  in cygwin static build
2011-03-15 06:16:18 +01:00
Troy Rollo 91ea92686d hp3500.c: Remove interdependency between contrast and brightness 2011-03-13 10:07:33 +11:00
Troy Rollo b7d79169f3 Add grayscale and line art scanning to HP3500 backend, as well as contrast
and brightness controls that influence calibration of the scanner.
2011-03-12 20:36:43 +11:00
Alex Belkin 90f15838ea usb ids for Samsung SCX-4623FW 2011-03-08 18:01:25 +03:00
Alex Belkin 5ea227caea keep usb device by default (correct for bug introduced by tcp sub-backend 2011-03-08 17:57:19 +03:00
Ilia Sotnikov 10c776769f hp5590: fixed detection of HP4500 devices (tested) and HP5550 (untested) -
these devices need no reading USB-in-USB acknowledgement after each command.
To achieve that, proto_flags are passed down to low-level functions. These
flags are taken from device descriptions
hp5590: fixed up get_status command - index should be 0x00, not 0x20
hp5590: bump up the backend version
2011-03-06 13:30:58 +02:00
Ilia Sotnikov 359114a7a0 hp5590: in ADF modes the device can scan up to 14", which is usually bigger
than what scanner reports back during initialization
2011-03-06 13:10:39 +02:00
Alessandro Zummo ccf58bf516 epson2: updated resolution list detection 2011-02-23 11:16:48 +01:00
Julien BLACHE c5ca46c2d1 Fix v4l build with libv4l 0.8.3+ 2011-02-16 19:37:43 +01:00
Alessandro Zummo 71f68035b3 epson2: try to avoid a division by zero 2011-02-05 18:14:29 +01:00
Stéphane Voltz 66716a5666 disbale software crop/deskew and despeckle at 16 bit depth 2011-02-04 06:17:27 +01:00
Stéphane Voltz e375cef3b0 genesys asynchronous parking hadling fixes 2011-02-02 10:47:21 +01:00
Stéphane Voltz 99ede36f75 more asynchronous parking issues fixed 2011-02-02 09:30:13 +01:00
Stéphane Voltz 58d5d64e00 fix unused variables 2011-01-31 21:47:32 +01:00
Stéphane Voltz 66549b2b7d minor cleanups and changelog entry 2011-01-31 21:47:32 +01:00
Stéphane Voltz 5ea5757579 don't return EOF if some data was available 2011-01-31 21:46:22 +01:00
Stéphane Voltz d0ea6b8647 fix asynchronous parking issues 2011-01-31 21:46:22 +01:00
Stéphane Voltz 948aa52e54 handle writing of lineart data 2011-01-31 21:46:22 +01:00
m. allan noah cde8951ef9 fujitsu backend v106:
- listed new models
- dont call mode_select with a page code the scanner does not support
2011-01-31 08:31:34 -05:00
m. allan noah 583c345a39 epjitsu: comment changes, listed new models 2011-01-31 08:31:34 -05:00
Reinhold Kainhofer 8e688f51b6 magicolor: Drop SNMP autodetection timout from 2.5 to 1.5 secs 2011-01-31 14:27:10 +01:00
Mike Kelly 8e623c473e Bumped the BUILD version 2011-01-29 11:50:17 +09:00
Mike Kelly edcf4cbadb Fixed initialization and duplexing for AV220-G
This fix correctly initializes the AV220-G by querying the firmware.
Added the correct option to support the interlaced duplex format used by
this unit.
2011-01-29 11:50:15 +09:00
Mike Kelly d7b3076142 Add page re-flipping as an option
Flipping duplex scanners must flip the page in order to scan the back side
of the page.  With this option set (which is the default), the page is
flipped back to the original orientation.  This is important if you have
a stack of papers.  However, if you don't care if every page ends up
flipped compared to how it was loaded, turning this option off might save
some scanning time as the paper won't have to be pulled back through the
ADF mechanism a third time.
2011-01-29 11:50:14 +09:00
Mike Kelly b82e9949b5 Fixed back page handling for flipping duplexers
Although the flipping duplexer is working, there are some issues relating to
the mechanics of physically flipping paper.  First among these is that the
back side of each page is physically scanned in reverse, resulting in an
upside down image.  Secondly, the page is held partially in the ADF
mechanism while waiting for the frontend to make another scan request for
the back side image, thus resulting in a stuck page if the frontend fails to
follow through.

My solution to these problems is to treat page flipping as an extreme
extension of interlaced scanning; page level interlacing.  This means making
another scan request on behalf of the frontend, and writing the resulting
image to a file as would have been done if the page were line interlaced.
We would have had to write this image to a file anyway to flip the image
right-side up, so we aren't doing any extra work, and technique allows us to
reuse existing code for most of the file handling.  The reader_process()
function is called again (recursively) after scanning the front page.  We
use the page length of the front side to determine the length of the back,
so that we can write the lines to the file starting at the end and working
towards the beginning (thus flipping the image).

A side effect of this solution was the discovery that the scanner must be
reminded that the paper needs to be re-flipped after each scan, so
set_window() must also be called in reader_process() before starting the
second scan.

Finally, with this change, a minor bug was exposed where frontends were
given the number of lines which would be scanned, which makes sense in
flatbed mode, but does not make sense for an ADF, where the page may be
smaller than the scan window.  The code was changed to follow the
specifications, returning -1 in ADF mode (when the length cannot be
determined).
2011-01-29 11:50:13 +09:00
Mike Kelly 104b43a183 Removed inquiry_adf_need_mirror_rear variable
After fixing the duplexer initialization, it became clear that the code was
mirroring the back pages.  Since the scanner already supports page
mirroring internally with an optional bit setting (which was already set)
it made the most sense to simplify the code base and remove the variable.
2011-01-29 11:50:12 +09:00
Mike Kelly 1b1b0b9a78 Fixed flipping duplexer initialization
For scanners which potentially have flipping duplexers, only enable
duplexing if there is an ADF present.  This leads to the next problem, that
the flipping duplexers (present only on the HP 8200 series AFAIK) don't
always seem to be properly configured when powered up.  To solve this some
magical values are written to magical memory locations, and some more
magical status is read back, causing an apparent firmware reset which
blocks communication for a short period of time.  See adf_reset() for
details.
2011-01-29 11:50:11 +09:00
Mike Kelly 12924236c6 Enable firmware reading for some scanners.
Sometimes scanners like to have their firmware read to cause them to
function properly.
2011-01-29 11:50:10 +09:00
Mike Kelly 1b1df46e41 Add feature type for flipping duplexing ADF units
Added the AV_ADF_FLIPPING_DUPLEX flag to activate the flipping duplex code
only for models known to have such duplexing ADFs.  Prior to this a doubious
huristic was used to guess when the hardware had a flipping duplex unit.
2011-01-29 11:50:09 +09:00
Mike Kelly 1904dad962 Removed additional_probe gatekeeper variable
The additional_probe variable protected add_source_mode() and
add_color_mode() from being entered upon subsequent calls.  These functions
were patched to not insert duplicate records in this case, removing the
need for the gatekeeper variable.
2011-01-29 11:50:08 +09:00
Mike Kelly 4d38523bda Return copied values in sane_get_parameters()
Until now the code has been changing the frontend supplied pointer to point
to our internal data structure.  There are two problems with this.  It
orphans the data previously associated with that pointer, which causes a
memory leak.  It also gives the frontend the ability to munge our internal
data structure.

The only downside to this change is the possibility that a frontend took the
spec too literally and merely supplies a pointer but does not allocate
storage space for the result.  Technically, the spec is a bit vague on this
point, because it does not specifically state who should allocate the
structure, but I feel a reasonable programmer would guess that space
allocation is a frontend obligation.
2011-01-29 11:50:07 +09:00
Mike Kelly 64caf38683 Don't compute parameters twice (in a row)
Removed a redundant call to compute parameters.  This function is called
from within the last function call, no need to call it again.
2011-01-29 11:50:06 +09:00
Mike Kelly b45400222d Added paper-length option to prevent double feeds
There was an old TODO in the code which suggests creating an option for using
the paper_length field to detect double feeds in the ADF.  I've added it as
an option, but set the default to not use it since it might cause older
scanners to get confused.
2011-01-29 11:50:05 +09:00
Mike Kelly 42cdb00aa1 Added a Misc option group to hold misc features
I felt that the ehancements group was doing double duity for image tuning and
other more hardware related options.  This new group takes ownership of those.
I'm not happy with the name, but that can always be changed.
2011-01-29 11:50:04 +09:00
Mike Kelly d48f749cae Fixed debug level for a single message
There is no reason that this message needs to be triggered at 100 when
everything else only goes to 9.
2011-01-29 11:50:03 +09:00
Mike Kelly 1bc4003b6c Whitespace changes. 2011-01-29 11:50:02 +09:00
Mike Kelly a230ee3ae2 Fixed spelling and grammar 2011-01-29 11:50:01 +09:00
Mike Kelly 260e86397f Updated copyright because it's 2011! 2011-01-29 11:50:00 +09:00
m. allan noah c78f416175 canon_dr backend v37:
- don't center window when using flatbed
- improve request sense error messages
- enable flatbed for all known models
- ad usb ids for DR-6030C, CR-135i & CR-190i
- moved DR-2020U to unsupported.desc
2011-01-26 22:05:02 -05:00
m. allan noah e237abad17 hopefully enable flatbed support 2011-01-26 22:05:02 -05:00
Reinhold Kainhofer e7532c03c5 magicolor: Get rid of the byteorder macros, copy the bytes manually to/from little endian
This also fixes some compiler error on 64-bit systems
2011-01-25 21:25:00 +01:00
Reinhold Kainhofer f054a4e8ee magicolor: cast size_t arguments to unsigned long for debug output and use the %lu format 2011-01-20 21:23:51 +01:00
Reinhold Kainhofer 2d9f458992 magicolor: Get rid of compiler warning 2011-01-20 21:23:51 +01:00
Stéphane Voltz 0e2432be53 HP2400/G2410 support progress 2011-01-20 06:59:17 +01:00
m. allan noah 70da6167cc Disable automatic RIF of binary modes on DR-5060F 2011-01-19 08:42:05 -05:00
m. allan noah 40e40989d9 rebuild autofoo for magicolor and snmp support 2011-01-18 21:31:13 -05:00
m. allan noah 39ae267f06 improved scsi scanner detection 2011-01-18 10:46:33 -05:00
m. allan noah 5aa48d8b17 update credits 2011-01-18 10:08:38 -05:00
m. allan noah a52a72a260 initial support for DR-7090C 2011-01-18 10:08:38 -05:00
m. allan noah 6130047b10 canon_dr backend v36
- initial support for DR-3080 and DR-5060
- add code to clamp scan width to an arbitrary byte width boundary
- add code to prevent setting of brightness/threshold/contrast
- don't send dropout color command on non-color scanners
2011-01-18 10:08:38 -05:00
Reinhold Kainhofer 6a7888ef26 New backend: magicolor (for KONICA MINOLTA magicolor devices)
-) LAN and USB communication
-) SNMP LAN auto-detection (using libsnmp, added configure check!)
-) Based on the epson2 backend, with many structural changes
-) B/W, Gray, Color scanning works in 150/300/600dpi (full-page
   color scan only possible with <=300dpi)

-) The timeouts (SNMP, scan data, other data) are configurable in the
   magicolor.conf file

-) Keeps list of known scanners in sane_get_devices, does not destroy
   existing handles; Also correctly calls sanei_usb_init.
2011-01-15 22:10:34 +01:00
Stéphane Voltz ded946b70d exposure calibration cache fix 2011-01-13 22:27:26 +01:00
Stéphane Voltz 53e28b3cd1 working 2400 dpi mode for LiDE 110 2011-01-13 22:08:31 +01:00
Stéphane Voltz 1e3956b5a5 disable 2400 dpi scanning since it isn't ready 2011-01-12 20:52:57 +01:00
Stéphane Voltz 1f82a765d4 add a wait for head to park function for genesys based scanners 2011-01-12 20:51:32 +01:00
Stéphane Voltz 4da932ad57 2400 dpi for LiDE 110/210 2011-01-11 06:26:41 +01:00
Stéphane Voltz 6e77181966 genesys fixes
- wait for head ot park before leaving in sane_close()
- fix lineart bug when yres is hegher than xres and dynamic lineart is
  enabled
2011-01-09 17:18:42 +01:00
Stéphane Voltz 3e5ecd012a genesys fixes
- fix shading calibration for non gl847/gl124 scanners
- enable 16 bit gamma for gl847
- add MUST_WAIT flags to gl847 scanners so solve parking isues
2011-01-07 06:08:15 +01:00
Nicolas Martin e72c0f548e pixma: Added patch proposed by Klaus Stengel for Canon imageRunner 1020/1024/1025 support.
modified:   ChangeLog
	modified:   backend/pixma_mp730.c
2011-01-05 21:30:11 +01:00
Nicolas Martin 68c15af1b2 pixma: several updates for MP830, MP990, memmove bug fix, and 64 bits image size.
modified:   ChangeLog
	modified:   backend/pixma.c
	modified:   backend/pixma.h
	modified:   backend/pixma_common.c
	modified:   backend/pixma_common.h
	modified:   backend/pixma_mp150.c
2011-01-04 22:19:52 +01:00
Nicolas Martin 529673f220 Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends 2011-01-04 22:12:27 +01:00
Stéphane Voltz 6cfbb6d09e Merge branch 'gl124' 2011-01-04 21:40:10 +01:00
Stéphane Voltz 8fb58d5118 fix lineart issue at 1200 dpi and clean up block read for gl124 2011-01-04 21:37:41 +01:00
Nicolas Martin 97d7464acb Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends 2011-01-04 21:09:56 +01:00
Stéphane Voltz de2af06d35 make lineart work when number of segments is higher than 1 2011-01-03 21:35:44 +01:00
Stéphane Voltz 25dc093bb6 fix place for DBG statement 2011-01-03 20:56:22 +01:00
Chris Bagwell e2463c9ca3 Add SOCKET_LIBS to xerox_mfp since it uses sanei_tcp
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
2011-01-03 10:55:35 -06:00
Chris Bagwell 650ea7cf8a update generate files using latest autoconf tools.
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
2011-01-02 13:07:31 -06:00
Nicolas Martin 6c19d00e19 Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends 2010-12-30 20:04:56 +01:00
Stéphane Voltz dd2a64e9a4 lide 110/210 scanarea fine tuning 2010-12-29 07:17:14 +01:00
Stéphane Voltz 107374b4fe misc genesys updates
- add or tune entry for 5600f/700f
- fix HP2300 warming up problem
2010-12-28 21:01:46 +01:00
Stéphane Voltz fbf9dd562a add half-step mode to DSmobile 600 motor 2010-12-27 22:40:11 +01:00
Stéphane Voltz a30e72a68c descriptions and man page updates for OpticBokk 3600 2010-12-27 07:08:44 +01:00
Stéphane Voltz 6df16ae86c add opticbook 3600 to genesys.conf.in 2010-12-27 07:01:01 +01:00
Stéphane Voltz b8bf7c3840 copyright updates 2010-12-27 07:01:01 +01:00
Stéphane Voltz 86c8214e93 add support for Plustek Opticbook 3600 by Chris Berry & Michael Rickmann 2010-12-27 07:01:01 +01:00
Stéphane Voltz 02ce13c350 up build number 2010-12-27 06:50:51 +01:00
Stéphane Voltz 35385e5725 genesys backend update
- enable 16 bit gamma for GL124 scanners
- genesys doc credits and models update
2010-12-26 12:08:01 +01:00
Stéphane Voltz 0645ab29d1 enable gamma in 16 bit depth 2010-12-24 11:08:57 +01:00
Stéphane Voltz d8552eb4ad GL124 shading area tuning 2010-12-24 08:41:15 +01:00
Stéphane Voltz f8e1b82561 add a message to print the kind of libusb used 2010-12-24 08:28:16 +01:00
Stéphane Voltz 37a69dad2d gl847 fixes
- improved send shading data calls
- fixed shading area line number for gl847 scanners
2010-12-24 08:28:16 +01:00
Stéphane Voltz 91832dccb3 add X74 support to lexmark backend
- patch from "Torsten Houwaart" <ToHo@gmx.de>
2010-12-24 08:02:44 +01:00
Mike Kelly 99853b5360 Bumped build number 2010-12-23 20:50:46 +09:00
Mike Kelly e422d4456d Removed "regularly tested" from various scanners
These scanners are no longer tested regularly by the maintainter, and should
not be listed as such in the description file.
2010-12-23 20:25:21 +09:00
Mike Kelly 9920c2b324 Fixed USB id for Avision FB2080E
Added leading zero to the USB id of Avision FB2080E.  Regenerated description
file.
2010-12-23 20:24:50 +09:00
Mike Kelly 24237f2562 Added support for the Avision AV210D2+ scanner
Added support for the Avision AV210D2+ scanner.  This is the first scanner
to require the use of the gray filter bits, so code was added to enable them.
Regenerated description file to reflect this change.
2010-12-23 19:47:56 +09:00
Mike Kelly 37b45c4f76 Moved device init code to sane_get_devices()
Moved device init code from sane_init() to the newly created
sane_reload_devices() function, which is now called from sane_get_devices().
This means that device initialization now happens when sane_get_devices() is
called, not when sane_init() is called.
2010-12-23 19:38:24 +09:00
Mike Kelly 046441ad6c Rewrote indirect "adf_mode" code to be more direct
Replaced the clever, yet totally confusing, code using the "adf_mode"
variable.  This variable was used with a complex interaction of bit shifts
and subtraction indirectly influnced by the value of s->source_mode.  The
replacement code direct references s->source_mode instead, simplifying
things greatly.  This change is functionally identical.

As a side note, the adf_mode code allowed "ADF Rear" scanners, in addition to
"ADF Duplex" scanners, to enter the section of code normally used for (HP)
duplex scanners.  It's not clear if this was the intended effect, or if, as
the comments suggest, this was an unnoticed side effect caused by the
confusing code.  The point is moot, however, because prior in the code, the
ADF Duplex flag is set anytime the ADF Rear flag is set.  As long as all
ADF Rear scanners are duplex scanners this shouldn't be a problem.
2010-12-23 19:38:24 +09:00
Mike Kelly 8bd4e454ca Fixed indentation 2010-12-23 19:38:13 +09:00
Mike Kelly 7999eeb19d Changed AVISION_FILTER_* defs to use final values
Changed the AVISION_FILTER_* defines to their final values rather than
bit-shifting them prior to use.  This make reading the code much easier
since no mental calculation is necessary to determine what the final
bit-pattern/value will be.
2010-12-23 19:38:13 +09:00
Mike Kelly ce8b353950 Wrap duplicate USB id entries with ifdefs
Wrap scanner entries with duplicate USB ids with ifdefs so they will not be
compiled.  This shortens the search for new scanners because we don't try
the same USB id more than once.
2010-12-23 19:38:13 +09:00
Mike Kelly 0233072a5e Removed a duplicate entry for Avision AV210C2
Removed a duplicate entry for Avision AV210C2 and Regenerated the
description file.
2010-12-23 19:38:07 +09:00
Mike Kelly 336a057594 Print out USB ids as four digit hex numbers
Print out USB ids as four digit hex numbers.
Also fixed a spelling/type-o error in a comment.
2010-12-23 19:37:52 +09:00
Mike Kelly 82bcacb732 Enhance sane_get_option_descriptor() debug message
Print the value of the "option" parameter to the sane_get_option_descriptor()
function.
2010-12-23 19:13:52 +09:00
Stéphane Voltz c6c16f4956 LiDE 210 GPIO settings fix 2010-12-19 06:50:13 +01:00
Stéphane Voltz 9547c057bd up the max number of supported scanners in genesys backend 2010-12-16 22:22:14 +01:00
Stéphane Voltz 98c5d9454f LiDE 210 tuning
- dynamic lineart not enabled by default
2010-12-16 22:10:37 +01:00
Stéphane Voltz 35f133c59b add an device entry for LiDE 210 2010-12-15 06:24:55 +01:00
Stéphane Voltz ad27fe1e05 cleanups and restriction on lineart modes 2010-12-14 21:55:01 +01:00
Stéphane Voltz 7e996472a6 changelog entry for GL124
- add an entry for genesys backend update
- up genesys build number
2010-12-14 18:29:55 +01:00
Stéphane Voltz 3d89a6f880 add new gl124 asic
create a place holder for low level commands

move low level functions to genesys_low.c

GL124 progresses

enable genesys_low debug and add DAC for LiDE 110

gl124 WIP
- gl847 cleanups
- genesys_low refactor
- gl124 starting version

GL124 WIP
- read scancnt/fedcnt,valid words coded
- memory layout coded

LiDE110 WIP

GL 124 WIP
- definition and use of get/set double/triple
- define register names

all mods done, ready to test

set fe OK

GL124 WIP : ready to test scans

GL124 WIP

GL124 WIP
- fixed analog fe issue: don't put afe regs in global set

GL124 : first light at 300 dpi

GL124 WIP
- 300 and 600 uncalibrated mostly ok (x coordinate rounding)
- 150 and 75 OK x-wise, y to be solved

solved rounding errors for gl124

re-add 400, 200 and 100 dpi modes

GL124 : tous x dpi OK

before adding line cropping

GL124 : line cropping almost finished

GL124 WIP : working line deletion

compute step rework

GL124 WIP : high speed table for dpi <= 300

move to scan area working

line skipping fix

new slope table for 600 dpi base

geometry and movement tuned

GL124 WIP : shading calibration almost working

working 600 dpi shading

GL124 : working shading calibration for all modes but 1200 dpi

working 1200 dpi shading

beta 1 of GL124 support

last tuning

update genesys.desc for LiDE 110

motor slope and start area tuning

shading coefficient computing clean up

add support for GL124 based CanoScan LiDE 110

feed almost OK up to 300 dpi

feeding is fixed

all issues fixed
2010-12-14 18:23:23 +01:00
Olaf Meeuwissen 9a89932ab4 epson2: fixed issue when a scan is cancelled 2010-12-12 16:25:17 +01:00
Alessandro Zummo 4b17f3cdb2 epson2: fixed compilation error 2010-12-12 16:16:19 +01:00
Alessandro Zummo 31500161d2 epson2: updated device list 2010-12-12 16:14:45 +01:00
Alessandro Zummo 98df227f22 epson2: do not reset networked scanners after scan 2010-12-12 15:55:17 +01:00
Alessandro Zummo a37093431b coolscan3: setup of unknown options is now non fatal to aid debugging 2010-12-12 14:22:19 +01:00
Alessandro Zummo 14d0ca4364 epson2: fixed segfault when attaching network devices 2010-12-12 13:56:52 +01:00
Mike Kelly 4fcd69a7da - Added the full range of the HP 8300 series scanners. These scanners are all
the same and already work, but this change will reflect that fact on the
  website.
- Generated a new version of doc/descriptions/avision.desc from avision.c.
2010-12-09 16:25:32 +09:00
Mike Kelly 6a49df4496 - Added Xerox DocuMate262i.
- Generated a new version of doc/descriptions/avision.desc from avision.c.
2010-12-09 16:23:18 +09:00