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

genesys: Use AUTO_GO_HOME flag to control AGOHOME bit on gl646

merge-requests/463/merge
Povilas Kanapickas 2020-05-09 04:10:13 +03:00
rodzic 4b5b2b2f0b
commit 84d4d0b15c
2 zmienionych plików z 10 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/genesys/enums.h
Wyświetl plik

@ -565,7 +565,7 @@ enum class ScanFlag : unsigned
ENABLE_LEDADD = 1 << 10,
REVERSE = 1 << 12,
// (unused): the scanner should return head to home position automatically after scan.
// the scanner should return head to home position automatically after scan.
AUTO_GO_HOME = 1 << 13,
};

20
backend/genesys/gl646.cpp
Wyświetl plik

@ -572,7 +572,7 @@ void CommandSetGl646::init_regs_for_scan_session(Genesys_Device* dev, const Gene
break;
}
if (dev->model->is_sheetfed) {
if (dev->model->is_sheetfed || !has_flag(session.params.flags, ScanFlag::AUTO_GO_HOME)) {
regs->find_reg(0x02).value &= ~REG_0x02_AGOHOME;
} else {
regs->find_reg(0x02).value |= REG_0x02_AGOHOME;
@ -1762,7 +1762,8 @@ void CommandSetGl646::move_back_home(Genesys_Device* dev, bool wait_until_home)
session.params.scan_method = dev->model->default_method;
session.params.scan_mode = ScanColorMode::COLOR_SINGLE_PASS;
session.params.color_filter = ColorFilter::RED;
session.params.flags = ScanFlag::REVERSE;
session.params.flags = ScanFlag::REVERSE |
ScanFlag::AUTO_GO_HOME;
if (dev->model->default_method == ScanMethod::TRANSPARENCY) {
session.params.flags |= ScanFlag::USE_XPA;
}
@ -1895,7 +1896,7 @@ void CommandSetGl646::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
/* no shading */
dev->reg.find_reg(0x01).value &= ~REG_0x01_DVDSET;
dev->reg.find_reg(0x02).value |= REG_0x02_ACDCDIS; /* ease backtracking */
dev->reg.find_reg(0x02).value &= ~(REG_0x02_FASTFED | REG_0x02_AGOHOME);
dev->reg.find_reg(0x02).value &= ~REG_0x02_FASTFED;
dev->reg.find_reg(0x05).value &= ~REG_0x05_GMMENB;
sanei_genesys_set_motor_power(dev->reg, false);
@ -2727,7 +2728,7 @@ void CommandSetGl646::init_regs_for_warmup(Genesys_Device* dev, const Genesys_Se
dev->cmd_set->init_regs_for_scan_session(dev, local_sensor, &dev->reg, session);
/* we are not going to move, so clear these bits */
dev->reg.find_reg(0x02).value &= ~(REG_0x02_FASTFED | REG_0x02_AGOHOME);
dev->reg.find_reg(0x02).value &= ~REG_0x02_FASTFED;
/* copy to local_reg */
*local_reg = dev->reg;
@ -2771,7 +2772,7 @@ static void gl646_repark_head(Genesys_Device* dev)
session.params.scan_method = dev->settings.scan_method;
session.params.scan_mode = ScanColorMode::COLOR_SINGLE_PASS;
session.params.color_filter = ColorFilter::RED;
session.params.flags = ScanFlag::NONE;
session.params.flags = ScanFlag::AUTO_GO_HOME;
if (dev->settings.scan_method == ScanMethod::TRANSPARENCY) {
session.params.flags |= ScanFlag::USE_XPA;
}
@ -2993,10 +2994,7 @@ static void simple_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
dev->reg.find_reg(0x02).value &= ~REG_0x02_FASTFED;
if (!move) {
sanei_genesys_set_motor_power(dev->reg, false);
/* no automatic go home if no movement */
dev->reg.find_reg(0x02).value &= ~REG_0x02_AGOHOME;
sanei_genesys_set_motor_power(dev->reg, false);
}
/* no automatic go home when using XPA */
@ -3096,7 +3094,7 @@ static void simple_move(Genesys_Device* dev, SANE_Int distance)
session.params.scan_method = dev->settings.scan_method;
session.params.scan_mode = ScanColorMode::COLOR_SINGLE_PASS;
session.params.color_filter = ColorFilter::RED;
session.params.flags = ScanFlag::NONE;
session.params.flags = ScanFlag::AUTO_GO_HOME;
if (dev->settings.scan_method == ScanMethod::TRANSPARENCY) {
session.params.flags |= ScanFlag::USE_XPA;
}
@ -3341,7 +3339,7 @@ ScanSession CommandSetGl646::calculate_scan_session(const Genesys_Device* dev,
session.params.scan_method = dev->settings.scan_method;
session.params.scan_mode = settings.scan_mode;
session.params.color_filter = settings.color_filter;
session.params.flags = ScanFlag::NONE;
session.params.flags = ScanFlag::AUTO_GO_HOME;
if (settings.scan_method == ScanMethod::TRANSPARENCY) {
session.params.flags |= ScanFlag::USE_XPA;
}