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

genesys: Compare all subsequent scans during lamp warmup

merge-requests/213/head^2
Povilas Kanapickas 2020-04-09 23:57:07 +03:00
rodzic fa594d965d
commit 0ab6e78657
1 zmienionych plików z 5 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -3445,9 +3445,11 @@ static void genesys_warmup_lamp(Genesys_Device* dev)
std::vector<uint8_t> first_line(total_size); std::vector<uint8_t> first_line(total_size);
std::vector<uint8_t> second_line(total_size); std::vector<uint8_t> second_line(total_size);
do do {
{ DBG(DBG_info, "%s: one more loop\n", __func__);
DBG(DBG_info, "%s: one more loop\n", __func__);
first_line = second_line;
dev->cmd_set->begin_scan(dev, sensor, &dev->reg, false); dev->cmd_set->begin_scan(dev, sensor, &dev->reg, false);
if (is_testing_mode()) { if (is_testing_mode()) {
@ -3458,22 +3460,6 @@ static void genesys_warmup_lamp(Genesys_Device* dev)
wait_until_buffer_non_empty(dev); wait_until_buffer_non_empty(dev);
try {
sanei_genesys_read_data_from_scanner(dev, first_line.data(), total_size);
} catch (...) {
// FIXME: document why this retry is here
sanei_genesys_read_data_from_scanner(dev, first_line.data(), total_size);
}
dev->cmd_set->end_scan(dev, &dev->reg, true);
dev->interface->sleep_ms(1000);
seconds++;
dev->cmd_set->begin_scan(dev, sensor, &dev->reg, false);
wait_until_buffer_non_empty(dev);
sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size); sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size);
dev->cmd_set->end_scan(dev, &dev->reg, true); dev->cmd_set->end_scan(dev, &dev->reg, true);