Restore slow_back_home use, disable rewind for gl847

See #7.
merge-requests/37/head
Olaf Meeuwissen 2018-12-16 21:56:52 +09:00
rodzic dc3e6e6e41
commit d609de285b
2 zmienionych plików z 9 dodań i 5 usunięć

Wyświetl plik

@ -2070,11 +2070,15 @@ genesys_white_shading_calibration (Genesys_Device * dev)
dev->model->cmd_set->set_lamp_power (dev, dev->calib_reg, SANE_TRUE);
dev->model->cmd_set->set_motor_power (dev->calib_reg, motor);
/* if needed, go back before doin next scan, by using rewind, registers and
* slopes table are kept intact from previous scan */
if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK && dev->model->cmd_set->rewind)
/* if needed, go back before doing next scan */
if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK)
{
status = dev->model->cmd_set->rewind (dev);
/* rewind keeps registers and slopes table intact from previous
scan but is not available on all supported chipsets (or may
cause scan artifacts, see #7) */
status = (dev->model->cmd_set->rewind
? dev->model->cmd_set->rewind (dev)
: dev->model->cmd_set->slow_back_home (dev, SANE_TRUE));
}
status =

Wyświetl plik

@ -3793,7 +3793,7 @@ static Genesys_Command_Set gl847_cmd_set = {
gl847_led_calibration,
gl847_slow_back_home,
gl847_rewind,
NULL, /* disable gl847_rewind, see #7 */
sanei_genesys_bulk_write_register,
NULL,