From 524c9de1fa0cc953fc3b441db22ca141cf2d52d4 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Sun, 8 Dec 2019 11:42:30 +0200 Subject: [PATCH] genesys: Fix calibration exposure in testing mode --- backend/genesys/gl124.cpp | 2 +- backend/genesys/gl646.cpp | 2 +- backend/genesys/gl841.cpp | 2 +- backend/genesys/gl843.cpp | 2 +- backend/genesys/gl846.cpp | 2 +- backend/genesys/gl847.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/genesys/gl124.cpp b/backend/genesys/gl124.cpp index fe6740811..b033e8361 100644 --- a/backend/genesys/gl124.cpp +++ b/backend/genesys/gl124.cpp @@ -1640,7 +1640,7 @@ SensorExposure CommandSetGl124::led_calibration(Genesys_Device* dev, const Genes if (is_testing_mode()) { dev->interface->test_checkpoint("led_calibration"); scanner_stop_action(*dev); - return { 0, 0, 0 }; + return sensor.exposure; } sanei_genesys_read_data_from_scanner(dev, line.data(), total_size); diff --git a/backend/genesys/gl646.cpp b/backend/genesys/gl646.cpp index 584b8488f..e5ca4d044 100644 --- a/backend/genesys/gl646.cpp +++ b/backend/genesys/gl646.cpp @@ -1975,7 +1975,7 @@ SensorExposure CommandSetGl646::led_calibration(Genesys_Device* dev, const Genes simple_scan(dev, calib_sensor, settings, false, true, false, line, "led_calibration"); if (is_testing_mode()) { - return { 0, 0, 0 }; + return calib_sensor.exposure; } if (DBG_LEVEL >= DBG_data) diff --git a/backend/genesys/gl841.cpp b/backend/genesys/gl841.cpp index 627031080..d5872dfa1 100644 --- a/backend/genesys/gl841.cpp +++ b/backend/genesys/gl841.cpp @@ -2705,7 +2705,7 @@ SensorExposure CommandSetGl841::led_calibration(Genesys_Device* dev, const Genes if (is_testing_mode()) { dev->interface->test_checkpoint("led_calibration"); move_back_home(dev, true); - return { 0, 0, 0 }; + return calib_sensor.exposure; } sanei_genesys_read_data_from_scanner(dev, line.data(), total_size); diff --git a/backend/genesys/gl843.cpp b/backend/genesys/gl843.cpp index 842c72a24..1681cc0b3 100644 --- a/backend/genesys/gl843.cpp +++ b/backend/genesys/gl843.cpp @@ -2078,7 +2078,7 @@ SensorExposure CommandSetGl843::led_calibration(Genesys_Device* dev, const Genes if (is_testing_mode()) { dev->interface->test_checkpoint("led_calibration"); move_back_home(dev, true); - return { 0, 0, 0 }; + return calib_sensor.exposure; } auto image = read_unshuffled_image_from_scanner(dev, session, diff --git a/backend/genesys/gl846.cpp b/backend/genesys/gl846.cpp index 51d97e9ef..e2741896d 100644 --- a/backend/genesys/gl846.cpp +++ b/backend/genesys/gl846.cpp @@ -1313,7 +1313,7 @@ SensorExposure CommandSetGl846::led_calibration(Genesys_Device* dev, const Genes dev->interface->test_checkpoint("led_calibration"); scanner_stop_action(*dev); move_back_home(dev, true); - return { 0, 0, 0 }; + return sensor.exposure; } sanei_genesys_read_data_from_scanner(dev, line.data(), total_size); diff --git a/backend/genesys/gl847.cpp b/backend/genesys/gl847.cpp index 0d971cc5a..ba621323c 100644 --- a/backend/genesys/gl847.cpp +++ b/backend/genesys/gl847.cpp @@ -1347,7 +1347,7 @@ SensorExposure CommandSetGl847::led_calibration(Genesys_Device* dev, const Genes dev->interface->test_checkpoint("led_calibration"); scanner_stop_action(*dev); move_back_home(dev, true); - return { 0, 0, 0 }; + return sensor.exposure; } sanei_genesys_read_data_from_scanner(dev, line.data(), total_size);