Povilas Kanapickas
06ad1dd43f
genesys: Inline setup_for_scan() into gl646_repark_head()
2020-05-06 01:29:10 +03:00
Povilas Kanapickas
1b5c31bb01
genesys: Inline setup_for_scan() into init_regs_for_warmup() on gl646
2020-05-06 01:29:09 +03:00
Povilas Kanapickas
d7bf809a6c
genesys: Inline setup_for_scan() into init_regs_for_shading() on gl646
2020-05-06 01:29:08 +03:00
Povilas Kanapickas
7ba20e43a3
genesys: Simplify simple_scan() on gl646
2020-05-06 01:29:07 +03:00
Povilas Kanapickas
f1d6c2c0cd
genesys: Inline setup_for_scan into simple_scan on gl646
2020-05-06 01:29:06 +03:00
Ordissimo
a05983ba28
Merge branch 'fix-statis-no-data' into 'master'
...
If no data then the status is NO-DOCS.
See merge request sane-project/backends!440
2020-05-15 08:59:36 +00:00
thierry1970
0abdfa483f
If no data then the status is NO-DOCS.
2020-05-15 10:21:56 +02:00
Ordissimo
cf5c40b8e8
Merge branch 'fix-status-start-and-stop' into 'master'
...
Fix status start and stop
See merge request sane-project/backends!439
2020-05-14 14:23:51 +00:00
thierry1970
1027e8aae0
Fix build.
2020-05-14 15:31:10 +02:00
thierry1970
bd8cb0e6aa
Code cleanup.
2020-05-14 14:03:20 +02:00
thierry1970
287a6bb88a
Test status device before scan and after.
2020-05-14 13:05:08 +02:00
Ordissimo
9e8326a3bc
Merge branch 'fix-offset' into 'master'
...
Fix offset
See merge request sane-project/backends!438
2020-05-13 20:52:56 +00:00
Thierry HUCHARD
d9c377cf09
Fix style
2020-05-13 22:24:51 +02:00
Thierry HUCHARD
c66efc0faf
Allows the X and Y offset to be set to 0.
2020-05-13 22:20:55 +02:00
Ordissimo
0615d21718
Merge branch 'fix-return-status-adf' into 'master'
...
Fix status sane_read.
See merge request sane-project/backends!437
2020-05-13 18:49:57 +00:00
Thierry HUCHARD
29866b0b19
Fix status sane_read.
2020-05-13 20:33:01 +02:00
Louis Lagendijk
3eb72d7485
Merge branch 'pixma_mf4700n_not_buggy' into 'master'
...
doc: ADF not now buggy on imageClass MF4770n.
See merge request sane-project/backends!436
2020-05-11 16:50:27 +00:00
Ralph Little
c6a411a29f
doc: ADF not now buggy on imageClass MF4770n.
...
Due to recent work on the pixma backend.
2020-05-11 09:16:07 -07:00
Louis Lagendijk
080ac870ee
pixma_bjnp.c: fix incorrect return from SANE_STATUS_INVAL to BJNP_STATUS_INVAL
...
as pointed out on F32 compile in CI
2020-05-11 17:14:37 +02:00
Ordissimo
5ad7708381
Merge branch 'escl-fix-status-adf' into 'master'
...
Refactoring of the adf status.
See merge request sane-project/backends!434
2020-05-11 14:58:38 +00:00
Louis Lagendijk
767a289fd2
pixma_bjnp: fix ADF scanning for laser/mfnp scanners. mfnp devices require a single TCP session
...
for ADF scans, while bjnp requires a TCP session per page.
Squashed commit of the following:
commit 8ee0a23d6b2920bc344bf76fd39f4b556222190b
Author: Louis Lagendijk <louis.lagendijk@gmail.com>
Date: Sat May 9 16:47:23 2020 +0200
Make pixma_bjnp work for both bjnp and mfnp
commit 3df6d0d5903ccf4de0d27301e65025209888d3c7
Author: Louis Lagendijk <louis.lagendijk@gmail.com>
Date: Sat May 2 19:50:23 2020 +0200
Move opening tcp connection to bjnp_open/close
2020-05-11 16:42:33 +02:00
thierry1970
36ece1de84
Fix status for all vendors
2020-05-11 10:25:27 +02:00
Thierry HUCHARD
dc2b9aeade
JobState, if it exists, decides whether to proceed to the next page.
2020-05-10 22:20:30 +02:00
Thierry HUCHARD
70daed5132
Fix error name variable.
2020-05-10 15:11:30 +02:00
Thierry HUCHARD
64c1c8a865
Logic correction.
2020-05-10 01:28:49 +02:00
Thierry HUCHARD
c1d302f3d7
Adjuste status adf.
2020-05-09 23:48:48 +02:00
Thierry HUCHARD
296e73ae6b
escl get sane_cancel output
2020-05-09 15:42:33 +02:00
Thierry HUCHARD
f233792702
Update Adf status.
2020-05-09 10:03:39 +02:00
Thierry HUCHARD
c4d8cc424e
Update Adf status.
2020-05-09 09:50:15 +02:00
Ordissimo
10408cfa99
Merge branch 'escl-clean' into 'master'
...
escl - release memory and close descriptor.
See merge request sane-project/backends!435
2020-05-08 07:01:30 +00:00
Thierry HUCHARD
73bf5533f9
release memory and close descriptor.
2020-05-08 08:35:50 +02:00
thierry1970
a931e0df57
Refactoring of the adf status.
2020-05-07 19:19:55 +02:00
Ordissimo
6689104f01
Merge branch 'fix-status-returned-by-sane-start' into 'master'
...
escl: Add support for SANE_STATUS_NO_DOCS and SANE_STATUS_DEVICE_BUSY to sane_start
Closes #283
See merge request sane-project/backends!433
2020-05-06 18:29:07 +00:00
Ordissimo
e8e9577c12
Merge branch 'add-more-logs' into 'master'
...
Make curl error message more informative, to help debug issues
See merge request sane-project/backends!431
2020-05-06 18:10:33 +00:00
Bartosz Kosiorek
878197a00e
escl: Add support for SANE_STATUS_NO_DOCS and SANE_STATUS_DEVICE_BUSY to sane_start
...
Fixes : #283
2020-05-06 18:25:44 +02:00
Ordissimo
20f7026371
Merge branch 'escl-reduces-number-entries-offer' into 'master'
...
Escl reduces number entries offer
See merge request sane-project/backends!432
2020-05-06 14:44:24 +00:00
thierry1970
fc14edf69e
Fix build.
2020-05-06 16:22:11 +02:00
thierry1970
646ee990d3
Reduces the number of entries on offer.
2020-05-06 16:08:53 +02:00
Bartosz Kosiorek
adbbdc8a69
Make curl error message more informative, to help debug issues
2020-05-06 16:01:01 +02:00
Ordissimo
050e73d07e
Merge branch 'escl-fix-feeder-not-duplex' into 'master'
...
Escl fix feeder not duplex
See merge request sane-project/backends!429
2020-05-06 09:21:28 +00:00
thierry1970
c9fdb62060
The duplex tag is only sent to the device if the device supports AdfDuplex.
2020-05-06 10:44:31 +02:00
thierry1970
9b3d7dc8b6
Fix name of sources.
2020-05-06 10:12:52 +02:00
Olaf Meeuwissen
833c25c3ae
Merge branch 'inspiration-from-freebsd-patches' into 'master'
...
Inspiration from freebsd patches
Closes #291 , #290 , #289 , and #286
See merge request sane-project/backends!425
2020-05-06 05:58:02 +00:00
Ordissimo
b5013094f8
Merge branch 'add-vendor' into 'master'
...
Escl - Add vendor
See merge request sane-project/backends!428
2020-05-05 22:31:58 +00:00
Thierry HUCHARD
0efee9ddd6
Fix model name cropping.
2020-05-06 00:14:12 +02:00
Thierry HUCHARD
cd18ba69de
Add vendor
2020-05-06 00:13:37 +02:00
Ordissimo
7f1741d54d
Merge branch 'escl-fix-vendor' into 'master'
...
Put the vendor corresponding to the device used.
See merge request sane-project/backends!426
2020-05-05 20:48:02 +00:00
Thierry HUCHARD
8e2d335653
Put the vendor corresponding to the device used.
2020-05-05 22:29:03 +02:00
Olaf Meeuwissen
e18242108e
v4l: Drop kernel interface from v4l.h
...
It has been included in libv4l1.h since 0.8.3.
2020-05-05 16:15:13 +09:00
Olaf Meeuwissen
95b4369166
v4l: Prefer C99 standard type over asm __u32. Re #291
2020-05-05 16:14:11 +09:00