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
Povilas Kanapickas
f019f9e7b8
genesys: Don't modify sensor in *_led_calibration()
2019-08-17 11:05:35 +03:00
Povilas Kanapickas
53d447b6dc
genesys: Move GL846 sensor profiles to a common sensor array
2019-08-17 11:02:39 +03:00
Povilas Kanapickas
4978eceda3
genesys: Move GL847 sensor profiles to a common sensor array
2019-08-17 11:02:38 +03:00
Povilas Kanapickas
63cc11bce1
genesys: Move GL124 sensor profiles to a common sensor array
2019-08-17 11:02:37 +03:00
Povilas Kanapickas
4348451e47
genesys: Add sensor profile to the sensor struct
...
This will allow moving per-chip sensor profile tables to a common
configuration
2019-08-17 11:02:36 +03:00
Povilas Kanapickas
ba546d5370
genesys: Store segment order as a std::vector
2019-08-17 11:02:35 +03:00
Povilas Kanapickas
4a9738b719
Merge branch 'genesys-simplify-reg-setting-set' into 'master'
...
genesys: Reduce duplication in GenesysRegisterSettingSet
See merge request sane-project/backends!132
2019-08-31 13:04:53 +00:00
Povilas Kanapickas
2896c21ffe
Merge branch 'genesys-frontend-type' into 'master'
...
genesys: Add frontend type to the frontend description
See merge request sane-project/backends!131
2019-08-31 12:58:50 +00:00
Povilas Kanapickas
562f900337
Merge branch 'genesys-override-dpiset' into 'master'
...
genesys: Implement a way to override dpiset
See merge request sane-project/backends!130
2019-08-31 12:54:14 +00:00
Povilas Kanapickas
503797c248
genesys: Simplify shading computation by using enum for color order
2019-08-17 10:53:56 +03:00
Povilas Kanapickas
3a1163480a
genesys: Store calibration data using correct type internally
2019-08-17 10:53:55 +03:00
Povilas Kanapickas
5e5a1a6fc3
genesys: Use correct type for std::plus
2019-08-31 15:11:40 +03:00
Stanislav Yuzvinsky
e6b2786380
Merge branch 'macos-malloc-fix' into 'master'
...
ricoh2_buffer: fix malloc header location on macOS
See merge request sane-project/backends!90
2019-08-30 14:16:41 +00:00