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

genesys: Make sure we don't set exposure to zero

merge-requests/340/head
Povilas Kanapickas 2020-02-16 10:41:17 +02:00
rodzic 054a73c02c
commit b2d378d413
2 zmienionych plików z 2 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -941,7 +941,8 @@ void scanner_move(Genesys_Device& dev, ScanMethod scan_method, unsigned steps, D
dev.cmd_set->init_regs_for_scan_session(&dev, sensor, &local_reg, session); dev.cmd_set->init_regs_for_scan_session(&dev, sensor, &local_reg, session);
if (dev.model->asic_type != AsicType::GL843) { if (dev.model->asic_type != AsicType::GL843) {
regs_set_exposure(dev.model->asic_type, local_reg, {0, 0, 0}); regs_set_exposure(dev.model->asic_type, local_reg,
sanei_genesys_fixup_exposure({0, 0, 0}));
} }
scanner_clear_scan_and_feed_counts2(dev); scanner_clear_scan_and_feed_counts2(dev);

11
backend/genesys/low.cpp
Wyświetl plik

@ -625,17 +625,6 @@ void sanei_genesys_set_lamp_power(Genesys_Device* dev, const Genesys_Sensor& sen
regs_set_exposure(dev->model->asic_type, regs, {0x0101, 0x0101, 0x0101}); regs_set_exposure(dev->model->asic_type, regs, {0x0101, 0x0101, 0x0101});
regs.set8(0x19, 0xff); regs.set8(0x19, 0xff);
} }
if (dev->model->asic_type == AsicType::GL843) {
if (dev->model->model_id == ModelId::PANASONIC_KV_SS080 ||
dev->model->model_id == ModelId::HP_SCANJET_4850C ||
dev->model->model_id == ModelId::HP_SCANJET_G4010 ||
dev->model->model_id == ModelId::HP_SCANJET_G4050)
{
// BUG: datasheet says we shouldn't set exposure to zero
regs_set_exposure(dev->model->asic_type, regs, {0, 0, 0});
}
}
} }
regs.state.is_lamp_on = set; regs.state.is_lamp_on = set;
} }