0943bf00bd
Merge branch 'epson2/better_timeouts' into 'master'
...
epson2: better timeouts
See merge request sane-project/backends!605
2021-04-09 19:36:06 +00:00
75575e0888
epson2: Wolfram Sang is now the maintainer for this backend.
2021-04-08 09:37:24 -07:00
7b7b36e593
Merge branch '464-genesys-backend-crashes-during-exception-handling' into 'master'
...
Resolve "genesys backend crashes during exception handling"
Closes #464
See merge request sane-project/backends!621
2021-04-07 16:24:08 +00:00
730e4ada37
genesys: fixed indentation again.
...
Hopefully, I will get it right this time. Uses 4 space indents rather
than 2 as used elsewhere in the code base.
2021-04-07 09:06:39 -07:00
5702046a9c
genesys: fix indentation
2021-04-07 09:01:29 -07:00
d9412740ac
Merge branch 'mention-advanced-in-scanimage' into 'master'
...
scanimage: mention when an option is advanced
See merge request sane-project/backends!613
2021-04-07 03:24:46 +00:00
7ce23d05e2
genesys: ensure that vector ptr is initialized
2021-04-06 08:41:41 -07:00
c5d84e5f17
Merge branch 'digitdia4000_slide' into 'master'
...
Enable Slide advance on DigitDia 4000 and correct misspelling
See merge request sane-project/backends!620
2021-04-06 13:39:11 +00:00
df34fa403a
canon_lide70
...
approximate slope tables with formula a/(1+b*(x-c))
2021-04-04 16:15:10 +02:00
696ccd2d7b
Enable Slide on DigitDia 4000, correct misspelling
2021-04-03 18:41:06 +02:00
e16d023b2b
Merge branch 'ps-devel-fix-thread-less-compile-001' into 'master'
...
genesys: use usleep instead of std::this_thread::sleep_for to re-enable thread less compile
See merge request sane-project/backends!619
2021-03-31 23:54:18 +00:00
691d774f75
genesys: use usleep instead of std::this_thread::sleep_for to re-enable thread less compile
...
Fixes:
genesys/scanner_interface_usb.cpp: In member function ‘virtual void genesys::ScannerInterfaceUsb::sleep_us(unsigned int)’:
genesys/scanner_interface_usb.cpp:484:10: error: ‘std::this_thread’ has not been declared
484 | std::this_thread::sleep_for(std::chrono::microseconds{microseconds});
| ^~~~~~~~~~~
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-03-31 22:57:48 +02:00
eb702d33c4
Merge branch 'fix-escl-resolution-with-jpeg' into 'master'
...
Fix scan all resolution with JPEG.
See merge request sane-project/backends!617
2021-03-31 16:12:51 +00:00
de5b27c995
Merge branch 'add-escl-models' into 'master'
...
Add models Canon TR455X
See merge request sane-project/backends!618
2021-03-31 16:11:24 +00:00
9539027f24
Add models Canon TR455X
2021-03-31 17:47:16 +02:00
f99687b3cc
Fix scan all resolution with JPEG.
2021-03-31 17:35:40 +02:00
69df00d00c
Merge branch 'restore_plustek_opticfilm_v2' into 'master'
...
genesys: add back Plustek Optifilm 7200 V2 config.
See merge request sane-project/backends!612
2021-03-30 16:00:15 +00:00
a6ffa6c8f8
scanimage: mention when an option is advanced
2021-03-30 11:51:21 +01:00
0bbbf85528
genesys: add back Plustek Optifilm 7200 V2 config.
...
This has support in the backend and user reports works. I think this
might just be an oversight.
2021-03-28 21:07:21 -07:00
0ef485d189
lide70: more white balance, less slope tables
2021-03-25 13:55:13 +01:00
1d30150c3c
Merge branch 'epson2/disable_focus_properly' into 'master'
...
epson2: disable focus properly
See merge request sane-project/backends!604
2021-03-20 16:51:18 +00:00
82117153f5
Merge branch 'epson2/fix-descs' into 'master'
...
epson2: improve descs
See merge request sane-project/backends!606
2021-03-20 16:46:52 +00:00
bb90aa9d95
Merge branch '454-hp-scanjet-4200c-backend-causes-segmentation-violation' into 'master'
...
Resolve "HP ScanJet 4200C backend causes segmentation violation"
Closes #454
See merge request sane-project/backends!607
2021-03-14 18:41:17 +00:00
acc5ca499f
hp4200: memset incorrectly sized. registro[0] is pointer not int.
2021-03-13 17:05:13 -08:00
39ced55454
epson2: 12000XL and 1640SU have been tested with TPU
...
So we can mark them as "complete" now.
2021-03-12 20:32:46 +01:00
6e85a57e64
epson2: remove desc entries which are supported by other backends
...
Only the epson2.desc has entries pointing to other backends. Remove them
and update the backends which really support them instead.
2021-03-12 20:26:17 +01:00
a696443555
epson2: remove double semicolon
2021-03-04 20:54:31 +01:00
85d8047601
epson2: bail out if device is still initializing
...
The comment says it all.
2021-03-04 20:54:31 +01:00
c70426fde2
epson2: use longer USB timeout
...
With my 12000XL, using autofocus takes ~35 sec before scanning starts.
So, extend the default USB timeout.
2021-03-04 20:54:31 +01:00
580c278dca
epson2: disable focus properly
...
The old epson driver disabled the focus by erasing the setFocus command.
The epson2 driver turned it into a seperate flag. However, scanners
which disabled focus in post_init were not converted to use the new
flag. Because we meanwhile set focus during init, these scanners could
not start anymore. Convert them to use the new flag.
While here, update the comment how we handle focus detection and update
the debug strings accordingly.
Bug reported by Hans Meir and debugged by Zdenek Dohnal. Many thanks!
2021-03-04 08:30:46 +01:00
5819a79ab0
canon_dr v62b
...
- rewrite do_cmd() timeout handling
- remove long timeout TUR from v61 (did not help)
- allow config file to set initial tur timeout for DR-X10C (#142 )
2021-02-28 21:28:59 -05:00
6d990e73e9
canon_dr v62a
...
- allow config file to set inq and vpd lengths for DR-M1060 (#263 )
2021-02-28 21:28:59 -05:00
e55ea7c06d
added lide 600 to central manpage
2021-02-24 14:01:10 +01:00
dd9d90223e
Merge branch '433-issues-in-sane-man-pages' into 'master'
...
Resolve "Issues in SANE man pages"
Closes #433
See merge request sane-project/backends!598
2021-02-24 02:16:05 +00:00
b9edb46542
doc: final corrections indicated by translators.
2021-02-23 18:00:18 -08:00
44a085d685
Merge branch 'debug-minolta-dimage-scan-dual-ii' into 'master'
...
Add function to debug avision command
See merge request sane-project/backends!595
2021-02-24 01:21:13 +00:00
12c81e2f19
some color and geometry changes
2021-02-23 14:28:56 +01:00
325c775036
Add function to debug avision command
...
Define a new enum that contains Avision data type codes and use those instead
of pure values. I also added a couple of helper functions for debugging the
command operation and data type code if read or send.
2021-02-21 19:53:46 -05:00
7413e3131b
doc: some small man page corrections.
2021-02-21 09:01:26 -08:00
13d1cb694e
Merge branch 'update-release-documentation' into 'master'
...
Update release documentation
See merge request sane-project/backends!596
2021-02-16 11:49:48 +00:00
5d749ac796
doc: Update the release procedure and convert to Markdown
2021-02-16 20:32:47 +09:00
7ac30dced0
NEWS: Add placeholder for user-visible changes in the next release
2021-02-16 19:46:57 +09:00
00df971593
Merge branch 'release/1.0.32' into 'master'
...
Release/1.0.32
Closes #122 and #248
See merge request sane-project/backends!594
2021-02-14 12:24:09 +00:00
c1c567c49b
NEWS: Document changes for 1.0.32 release
2021-02-14 20:00:00 +09:00
eda0a770bf
po: Re-sync *.po files to pick up latest source code changes
...
Lines number have changes due to the FSF address change.
2021-02-14 18:36:23 +09:00
edcfdbc0d8
saned: Add new -p, --port option to the manual page
...
This complements !549 .
2021-02-14 18:36:10 +09:00
3408eef8ed
escl.desc: Add entries for models newly supported since 1.0.31
...
These were mentioned in the commit logs and merge requests but missing
from the descriptions file.
2021-02-14 18:36:10 +09:00
e0b5a7e407
Merge branch 'disable-canoscan-4400f' into 'release/1.0.32'
...
genesys: Disable support for the CanoScan 4400F
See merge request sane-project/backends!592
2021-02-14 09:31:59 +00:00
102288c22e
Merge branch 'add-files-to-source-tarball' into 'release/1.0.32'
...
Add extra documentation and utility file to the source tarball
See merge request sane-project/backends!593
2021-02-14 07:18:00 +00:00
e3962ad184
Add extra documentation and utility file to the source tarball
...
These might be useful for someone starting from one of our release or
snapshot source tarballs.
2021-02-14 16:01:01 +09:00
Wolfram Sang