Merge branch 'genesys-canoscan-700f' into 'master'

genesys: Fix support for CanoScan 700F

See merge request sane-project/backends!402
merge-requests/213/head^2
Povilas Kanapickas 2020-04-13 13:31:04 +00:00
commit db828453fa
2 zmienionych plików z 9 dodań i 2 usunięć

Wyświetl plik

@ -802,6 +802,12 @@ void scanner_move(Genesys_Device& dev, ScanMethod scan_method, unsigned steps, D
} }
// wait until feed count reaches the required value // wait until feed count reaches the required value
if (dev.model->model_id == ModelId::CANON_LIDE_700F) {
if (dev.cmd_set->needs_update_home_sensor_gpio()) {
dev.cmd_set->update_home_sensor_gpio(dev);
}
}
// FIXME: should porbably wait for some timeout // FIXME: should porbably wait for some timeout
Status status; Status status;
for (unsigned i = 0;; ++i) { for (unsigned i = 0;; ++i) {

Wyświetl plik

@ -950,9 +950,10 @@ void genesys_init_usb_device_tables()
model.resolutions = { model.resolutions = {
{ {
// FIXME: support 2400 ad 4800 dpi
{ ScanMethod::FLATBED }, { ScanMethod::FLATBED },
{ 4800, 2400, 1200, 600, 300, 200, 150, 100, 75 }, { 1200, 600, 300, 200, 150, 100, 75 },
{ 4800, 2400, 1200, 600, 300, 200, 150, 100, 75 }, { 1200, 600, 300, 200, 150, 100, 75 },
} }
}; };