mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: Pass registers from callers to dark-white shading calibration

merge-requests/340/head
Povilas Kanapickas 2020-02-02 18:45:26 +02:00
rodzic 25f097b445
commit 2a3ae40d8d
1 zmienionych plików z 11 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
backend/genesys/genesys.cpp
Wyświetl plik

@ -1883,17 +1883,18 @@ static void genesys_white_shading_calibration(Genesys_Device* dev, const Genesys
// This calibration uses a scan over the calibration target, comprising a black and a white strip. // This calibration uses a scan over the calibration target, comprising a black and a white strip.
// (So the motor must be on.) // (So the motor must be on.)
static void genesys_dark_white_shading_calibration(Genesys_Device* dev, static void genesys_dark_white_shading_calibration(Genesys_Device* dev,
const Genesys_Sensor& sensor) const Genesys_Sensor& sensor,
Genesys_Register_Set& local_reg)
{ {
DBG_HELPER_ARGS(dbg, "lines = %zu", dev->calib_lines); DBG_HELPER_ARGS(dbg, "lines = %zu", dev->calib_lines);
// FIXME: remove when updating tests // FIXME: remove when updating tests
dev->interface->record_progress_message("init_regs_for_shading"); dev->interface->record_progress_message("init_regs_for_shading");
dev->cmd_set->init_regs_for_shading(dev, sensor, dev->calib_reg); dev->cmd_set->init_regs_for_shading(dev, sensor, local_reg);
if (dev->model->asic_type != AsicType::GL646) { if (dev->model->asic_type != AsicType::GL646) {
dev->interface->write_registers(dev->calib_reg); dev->interface->write_registers(local_reg);
} }
// FIXME: remove when updating tests // FIXME: remove when updating tests
@ -1932,22 +1933,22 @@ static void genesys_dark_white_shading_calibration(Genesys_Device* dev,
} }
// turn on motor and lamp power // turn on motor and lamp power
sanei_genesys_set_lamp_power(dev, sensor, dev->calib_reg, true); sanei_genesys_set_lamp_power(dev, sensor, local_reg, true);
sanei_genesys_set_motor_power(dev->calib_reg, motor); sanei_genesys_set_motor_power(local_reg, motor);
dev->interface->write_registers(dev->calib_reg); dev->interface->write_registers(local_reg);
dev->cmd_set->begin_scan(dev, sensor, &dev->calib_reg, false); dev->cmd_set->begin_scan(dev, sensor, &local_reg, false);
if (is_testing_mode()) { if (is_testing_mode()) {
dev->interface->test_checkpoint("dark_white_shading_calibration"); dev->interface->test_checkpoint("dark_white_shading_calibration");
dev->cmd_set->end_scan(dev, &dev->calib_reg, true); dev->cmd_set->end_scan(dev, &local_reg, true);
return; return;
} }
sanei_genesys_read_data_from_scanner(dev, calibration_data.data(), size); sanei_genesys_read_data_from_scanner(dev, calibration_data.data(), size);
dev->cmd_set->end_scan(dev, &dev->calib_reg, true); dev->cmd_set->end_scan(dev, &local_reg, true);
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
@ -2985,7 +2986,7 @@ static void genesys_flatbed_calibration(Genesys_Device* dev, Genesys_Sensor& sen
if (has_flag(dev->model->flags, ModelFlag::DARK_WHITE_CALIBRATION)) { if (has_flag(dev->model->flags, ModelFlag::DARK_WHITE_CALIBRATION)) {
// FIXME: enable when updating tests // FIXME: enable when updating tests
// dev->interface->record_progress_message("genesys_dark_white_shading_calibration"); // dev->interface->record_progress_message("genesys_dark_white_shading_calibration");
genesys_dark_white_shading_calibration(dev, sensor); genesys_dark_white_shading_calibration(dev, sensor, dev->calib_reg);
} else { } else {
DBG(DBG_proc, "%s : genesys_dark_shading_calibration dev->calib_reg ", __func__); DBG(DBG_proc, "%s : genesys_dark_shading_calibration dev->calib_reg ", __func__);
debug_dump(DBG_proc, dev->calib_reg); debug_dump(DBG_proc, dev->calib_reg);