Rolf Bensch
fd94a7e60c
Merge branch 'MF633_635_645' into 'master'
...
pixma: new scanners Canon i-SENSYS MF633C/MF635C, MF645C
See merge request sane-project/backends!126
2019-09-12 19:42:12 +00:00
Vladislav Bogdanov
8f1615f333
ricoh2: Add support for Aficio SG3110SFNw
2019-09-04 13:13:36 +03:00
Mikael Vallerie
7f491519d1
Removing MF635_PID, using MF630_PID instead
2019-08-27 15:34:47 +02:00
Mikael Vallerie
13008723cd
Right PIDs for MF633C/MF635C and MF645C
2019-08-26 18:41:29 +02:00
Povilas Kanapickas
2757475dd9
genesys: Use session.params.xres directly where possible
2019-08-24 10:13:44 +03:00
Povilas Kanapickas
ba3013b1aa
genesys: Handle full sensor scans on gl841 consistently to other chips
2019-08-24 10:13:43 +03:00
Povilas Kanapickas
48251cf8b2
genesys: Simplify start pixel computation on gl841
2019-08-24 10:13:42 +03:00
Povilas Kanapickas
6ca11bfd71
genesys: Always dump session after computing it
2019-08-24 10:13:41 +03:00
Povilas Kanapickas
5226a163ab
genesys: Use common code path to compute session optical_pixels
2019-08-24 10:05:53 +03:00
Povilas Kanapickas
ec5225e1f8
genesys: Assume correct resolution is passed from high-level
2019-08-24 10:00:52 +03:00
Povilas Kanapickas
9a21a8335f
genesys: Remove dead code related to SCAN_FLAG_USE_OPTICAL_RES
2019-08-24 10:00:51 +03:00
Povilas Kanapickas
21f949bd87
genesys: Remove *_compute_exposure() wrappers
2019-08-24 10:00:50 +03:00
Mikael Vallerie
5d21800b51
pixma: new scanners Canon i-SENSYS MF633C/MF635C, MF645C
2019-08-18 18:53:08 +02:00
Povilas Kanapickas
a2ade50870
genesys: Ensure that resolution is set to a supported one at high-level
...
Previously we relied on low-level implementation to detect when the
requested resolution is higher than one supported by the scanner and
seamlessly patch around so that the high-level code does not notice.
This complicates the low level implementation and results to duplicate
code.
2019-08-18 11:13:01 +03:00
Povilas Kanapickas
61a055a8cf
genesys: Pass the line width requested by the frontend separately
2019-08-18 11:13:00 +03:00
Povilas Kanapickas
0b2840a3ff
genesys: Clarify frontend param processing a little
2019-08-18 11:12:59 +03:00
Povilas Kanapickas
ec0ceaebb5
genesys: Use correct resolution to select sensor during option parsing
2019-08-18 11:12:58 +03:00
Povilas Kanapickas
f48239419a
genesys: Use common code path to compute session optical_resolution
2019-08-18 10:39:36 +03:00
Povilas Kanapickas
687b549f0a
genesys: Use ScanSession to compute ccd_size_divisor on all chips
2019-08-18 10:37:49 +03:00
Povilas Kanapickas
510b6d0d86
genesys: Remove gl646-specific get_ccd_size_divisor
2019-08-31 19:02:15 +03:00
Povilas Kanapickas
e0efbd37b8
genesys: Use sensor functionality instead of compute_ccd_size_divisor()
2019-08-31 19:02:15 +03:00
Povilas Kanapickas
a6a785e28d
genesys: Use common path to compute ccd_size_divisor on gl646
2019-08-31 19:02:15 +03:00
Povilas Kanapickas
e2e1efae80
genesys: Use the sensor passed to gl646_setup_registers()
2019-08-31 19:02:15 +03:00
Povilas Kanapickas
ceb56a8b3b
genesys: Move gl646 sensor settings to the common sensor table
2019-08-17 12:02:45 +03:00
Povilas Kanapickas
a31da79e07
genesys: Compute cksel from register descriptions on gl646
2019-08-17 12:02:44 +03:00
Povilas Kanapickas
5532f2f277
genesys: Add channel count to the parameters that identify a sensor
2019-08-17 11:51:35 +03:00
Povilas Kanapickas
f2871ca81d
genesys: Reduce duplication in channel count and depth calculation
2019-08-17 11:51:34 +03:00
Povilas Kanapickas
0c6d7cd4a4
Merge branch 'genesys-fix-missing-return-after-refactor' into 'master'
...
genesys: Fix missing return from a previous refactor
See merge request sane-project/backends!138
2019-08-31 14:56:23 +00:00
Povilas Kanapickas
3e2b6cead0
Merge branch 'genesys-gl646-simplify-sensor' into 'master'
...
genesys: Simplify sensor setup on GL646
See merge request sane-project/backends!139
2019-08-31 14:55:57 +00:00
Povilas Kanapickas
6216ada2e7
Merge branch 'genesys-fix-sensor-write' into 'master'
...
genesys: Fix writing to sensors
See merge request sane-project/backends!137
2019-08-31 14:43:05 +00:00
Povilas Kanapickas
0cd26a8adf
genesys: Extract resolution filtering to separate class
2019-08-17 11:56:45 +03:00
Povilas Kanapickas
d9fab3a7d8
genesys: Fix incorrect channel count when fetching ccd_size_divisor
...
All current scanners use the same divisor on both 1 and 3 channels, so
this commit does not change behavior.
2019-08-17 11:49:10 +03:00
Povilas Kanapickas
e8d9b6ff5d
genesys: Reduce duplication in the Sensor_Master struct list
2019-08-17 11:49:09 +03:00
Povilas Kanapickas
f228e427a9
genesys: Store sensor settings in std::vector on gl646
2019-08-17 11:49:08 +03:00
Povilas Kanapickas
a8ed3df0fd
genesys: Merge Sensor_Settings struct to Sensor_Master
2019-08-17 11:49:07 +03:00
Povilas Kanapickas
c001662c05
genesys: Reorder the components on Sensor_Master struct
2019-08-17 11:49:06 +03:00
Povilas Kanapickas
71a467ddf3
genesys: Remove unused data from Sensor_Master on gl646
2019-08-17 11:49:05 +03:00
Povilas Kanapickas
b19720cfa1
genesys: Simplify sensor register desc by matching ccd_size_divisor
2019-08-17 11:49:04 +03:00
Povilas Kanapickas
e36d6b8fb5
genesys: Simplify exposure setting on gl646
2019-08-17 11:49:03 +03:00
Povilas Kanapickas
a4a1003ffc
genesys: Rename Sensor_Master::{exposure->exposure_lperiod}
2019-08-17 11:49:02 +03:00
Povilas Kanapickas
a3a3647006
genesys: Compute dpiset instead of storing it in tables on gl646
2019-08-17 11:49:01 +03:00
Povilas Kanapickas
d2d43d5ed8
genesys: Make sensor table initialization more generic on gl646
2019-08-17 11:49:00 +03:00
Povilas Kanapickas
1330d2289b
genesys: Correctly initialize Sensor_Master struct
2019-08-17 11:48:59 +03:00
Povilas Kanapickas
eb4fb44048
genesys: Fix missing return from a previous refactor
2019-08-17 11:30:33 +03:00
Povilas Kanapickas
107404dcd0
genesys: Move ccd_size_divisor computation to compute_session()
2019-08-17 11:11:15 +03:00
Povilas Kanapickas
92412a90b2
genesys: Create compute_session() for common session computation
2019-08-17 11:11:14 +03:00
Povilas Kanapickas
c34cd7cd86
Merge branch 'genesys-common-sensor-profiles' into 'master'
...
genesys: Use the sensor description list for sensor profiles
See merge request sane-project/backends!134
2019-08-31 13:25:34 +00:00
Povilas Kanapickas
86ac877d82
genesys: Remove unused code
2019-08-17 11:05:38 +03:00
Povilas Kanapickas
eb1c4fadb9
genesys: Pick correct sensors during option parsing
2019-08-17 11:05:37 +03:00
Povilas Kanapickas
1902c9fbcb
genesys: Fix sensor const safety in *_search_start_position()
2019-08-17 11:05:36 +03:00