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

genesys: Rename record_{test => progress}_message

merge-requests/240/head
Povilas Kanapickas 2019-10-26 11:38:48 +02:00
rodzic e2e3ea0947
commit 391d472127
6 zmienionych plików z 27 dodań i 27 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -2696,43 +2696,43 @@ static void genesys_flatbed_calibration(Genesys_Device* dev, Genesys_Sensor& sen
/* do offset calibration if needed */
if (dev->model->flags & GENESYS_FLAG_OFFSET_CALIBRATION)
{
dev->interface->record_test_message("offset_calibration");
dev->interface->record_progress_message("offset_calibration");
dev->cmd_set->offset_calibration(dev, sensor, dev->calib_reg);
/* since all the registers are set up correctly, just use them */
dev->interface->record_test_message("coarse_gain_calibration");
dev->interface->record_progress_message("coarse_gain_calibration");
dev->cmd_set->coarse_gain_calibration(dev, sensor, dev->calib_reg, coarse_res);
} else {
/* since we have 2 gain calibration proc, skip second if first one was
used. */
dev->interface->record_test_message("init_regs_for_coarse_calibration");
dev->interface->record_progress_message("init_regs_for_coarse_calibration");
dev->cmd_set->init_regs_for_coarse_calibration(dev, sensor, dev->calib_reg);
dev->interface->record_test_message("genesys_coarse_calibration");
dev->interface->record_progress_message("genesys_coarse_calibration");
genesys_coarse_calibration(dev, sensor);
}
if (dev->model->is_cis)
{
/* the afe now sends valid data for doing led calibration */
dev->interface->record_test_message("led_calibration");
dev->interface->record_progress_message("led_calibration");
sensor.exposure = dev->cmd_set->led_calibration(dev, sensor, dev->calib_reg);
/* calibrate afe again to match new exposure */
if (dev->model->flags & GENESYS_FLAG_OFFSET_CALIBRATION) {
dev->interface->record_test_message("offset_calibration");
dev->interface->record_progress_message("offset_calibration");
dev->cmd_set->offset_calibration(dev, sensor, dev->calib_reg);
// since all the registers are set up correctly, just use them
dev->interface->record_test_message("coarse_gain_calibration");
dev->interface->record_progress_message("coarse_gain_calibration");
dev->cmd_set->coarse_gain_calibration(dev, sensor, dev->calib_reg, coarse_res);
} else {
// since we have 2 gain calibration proc, skip second if first one was used
dev->interface->record_test_message("init_regs_for_coarse_calibration");
dev->interface->record_progress_message("init_regs_for_coarse_calibration");
dev->cmd_set->init_regs_for_coarse_calibration(dev, sensor, dev->calib_reg);
dev->interface->record_test_message("genesys_coarse_calibration");
dev->interface->record_progress_message("genesys_coarse_calibration");
genesys_coarse_calibration(dev, sensor);
}
}
@ -2749,7 +2749,7 @@ static void genesys_flatbed_calibration(Genesys_Device* dev, Genesys_Sensor& sen
}
// send default shading data
dev->interface->record_test_message("sanei_genesys_init_shading_data");
dev->interface->record_progress_message("sanei_genesys_init_shading_data");
sanei_genesys_init_shading_data(dev, sensor, pixels_per_line);
if (dev->settings.scan_method == ScanMethod::TRANSPARENCY ||
@ -2760,28 +2760,28 @@ static void genesys_flatbed_calibration(Genesys_Device* dev, Genesys_Sensor& sen
// shading calibration
if (dev->model->flags & GENESYS_FLAG_DARK_WHITE_CALIBRATION) {
dev->interface->record_test_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->interface->record_test_message("genesys_dark_white_shading_calibration");
dev->interface->record_progress_message("genesys_dark_white_shading_calibration");
genesys_dark_white_shading_calibration(dev, sensor);
} else {
DBG(DBG_proc, "%s : genesys_dark_shading_calibration dev->calib_reg ", __func__);
debug_dump(DBG_proc, dev->calib_reg);
if (dev->model->flags & GENESYS_FLAG_DARK_CALIBRATION) {
dev->interface->record_test_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->interface->record_test_message("genesys_dark_shading_calibration");
dev->interface->record_progress_message("genesys_dark_shading_calibration");
genesys_dark_shading_calibration(dev, sensor);
genesys_repark_sensor_before_shading(dev);
}
dev->interface->record_test_message("init_regs_for_shading2");
dev->interface->record_progress_message("init_regs_for_shading2");
dev->cmd_set->init_regs_for_shading(dev, sensor, dev->calib_reg);
dev->interface->record_test_message("genesys_white_shading_calibration");
dev->interface->record_progress_message("genesys_white_shading_calibration");
genesys_white_shading_calibration(dev, sensor);
genesys_repark_sensor_after_white_shading(dev);
@ -2791,7 +2791,7 @@ static void genesys_flatbed_calibration(Genesys_Device* dev, Genesys_Sensor& sen
}
if (!dev->cmd_set->has_send_shading_data()) {
dev->interface->record_test_message("genesys_send_shading_coefficient");
dev->interface->record_progress_message("genesys_send_shading_coefficient");
genesys_send_shading_coefficient(dev, sensor);
}
}

2
backend/genesys/scanner_interface.h
Wyświetl plik

@ -96,7 +96,7 @@ public:
sleep_us(milliseconds * 1000);
}
virtual void record_test_message(const char* msg) = 0;
virtual void record_progress_message(const char* msg) = 0;
};
} // namespace genesys

2
backend/genesys/scanner_interface_usb.cpp
Wyświetl plik

@ -489,7 +489,7 @@ void ScannerInterfaceUsb::sleep_us(unsigned microseconds)
std::this_thread::sleep_for(std::chrono::microseconds{microseconds});
}
void ScannerInterfaceUsb::record_test_message(const char* msg)
void ScannerInterfaceUsb::record_progress_message(const char* msg)
{
sanei_usb_testing_record_message(msg);
}

2
backend/genesys/scanner_interface_usb.h
Wyświetl plik

@ -80,7 +80,7 @@ public:
void sleep_us(unsigned microseconds) override;
void record_test_message(const char* msg) override;
void record_progress_message(const char* msg) override;
private:
Genesys_Device* dev_;

8
backend/genesys/test_scanner_interface.cpp
Wyświetl plik

@ -137,14 +137,14 @@ void TestScannerInterface::sleep_us(unsigned microseconds)
(void) microseconds;
}
void TestScannerInterface::record_test_message(const char* msg)
void TestScannerInterface::record_progress_message(const char* msg)
{
last_test_message_ = msg;
last_progress_message_ = msg;
}
const std::string& TestScannerInterface::last_test_message() const
const std::string& TestScannerInterface::last_progress_message() const
{
return last_test_message_;
return last_progress_message_;
}
} // namespace genesys

6
backend/genesys/test_scanner_interface.h
Wyświetl plik

@ -78,15 +78,15 @@ public:
void sleep_us(unsigned microseconds) override;
void record_test_message(const char* msg) override;
void record_progress_message(const char* msg) override;
const std::string& last_test_message() const;
const std::string& last_progress_message() const;
private:
RegisterCache<std::uint8_t> cached_regs_;
RegisterCache<std::uint16_t> cached_fe_regs_;
TestUsbDevice usb_dev_;
std::string last_test_message_;
std::string last_progress_message_;
};
} // namespace genesys