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

genesys: Simplify move_to_ta() on gl843

merge-requests/244/head
Povilas Kanapickas 2020-05-26 01:32:43 +03:00
rodzic bc973a21c2
commit c4135d63a7
2 zmienionych plików z 7 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
backend/genesys/gl843.cpp
Wyświetl plik

@ -1706,15 +1706,7 @@ void CommandSetGl843::move_to_ta(Genesys_Device* dev) const
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
const auto& resolution_settings = dev->model->get_resolution_settings(dev->model->default_method); unsigned feed = static_cast<unsigned>((dev->model->y_offset_sensor_to_ta * dev->motor.base_ydpi) /
float resolution = resolution_settings.get_min_resolution_y();
unsigned multiplier = 16;
if (dev->model->model_id == ModelId::CANON_8400F ||
dev->model->model_id == ModelId::CANON_4400F) {
multiplier = 4;
}
unsigned feed = static_cast<unsigned>(multiplier * (dev->model->y_offset_sensor_to_ta * resolution) /
MM_PER_INCH); MM_PER_INCH);
scanner_move(*dev, dev->model->default_method, feed, Direction::FORWARD); scanner_move(*dev, dev->model->default_method, feed, Direction::FORWARD);
} }

12
backend/genesys/tables_model.cpp
Wyświetl plik

@ -440,12 +440,12 @@ void genesys_init_usb_device_tables()
model.x_size_calib_mm = 241.3; model.x_size_calib_mm = 241.3;
model.x_offset_ta = 115.0; model.x_offset_ta = 115.0;
model.y_offset_ta = 60.0; model.y_offset_ta = 37.0;
model.x_size_ta = 35.0; model.x_size_ta = 35.0;
model.y_size_ta = 230.0; model.y_size_ta = 230.0;
model.y_offset_sensor_to_ta = 46.0; model.y_offset_sensor_to_ta = 23.0;
model.y_offset_calib_white_ta = 47.0; model.y_offset_calib_white_ta = 24.0;
model.y_size_calib_ta_mm = 2.0; model.y_size_calib_ta_mm = 2.0;
model.post_scan = 0.0; model.post_scan = 0.0;
@ -578,12 +578,12 @@ void genesys_init_usb_device_tables()
model.x_size_calib_mm = 240.70734; model.x_size_calib_mm = 240.70734;
model.x_offset_ta = 97.0; model.x_offset_ta = 97.0;
model.y_offset_ta = 27.0; model.y_offset_ta = 38.5;
model.x_size_ta = 70.0; model.x_size_ta = 70.0;
model.y_size_ta = 230.0; model.y_size_ta = 230.0;
model.y_offset_sensor_to_ta = 11.5; model.y_offset_sensor_to_ta = 23.0;
model.y_offset_calib_white_ta = 14.0; model.y_offset_calib_white_ta = 25.5;
model.y_size_calib_ta_mm = 3.0; model.y_size_calib_ta_mm = 3.0;
model.post_scan = 0.0; model.post_scan = 0.0;