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

genesys: Only ever use sanei_genesys_set_motor_power() to turn on motor

merge-requests/82/head
Povilas Kanapickas 2019-06-08 14:04:26 +03:00
rodzic 5b788022dc
commit 6d9e783a51
6 zmienionych plików z 7 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/genesys_gl124.cc
Wyświetl plik

@ -760,7 +760,6 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
/* compute register 02 value */
uint8_t r02 = REG02_NOTHOME;
r02 |= REG02_MTRPWR;
if (use_fast_fed) {
r02 |= REG02_FASTFED;
@ -778,6 +777,7 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
}
reg->set8(REG02, r02);
sanei_genesys_set_motor_power(*reg, true);
/* SCANFED */
sanei_genesys_set_double(reg,REG_SCANFED,4);

5
backend/genesys_gl646.cc
Wyświetl plik

@ -590,7 +590,7 @@ gl646_setup_registers (Genesys_Device * dev,
dev->reg.find_reg(0x02).value |= REG02_ACDCDIS;
/* setup motor power and direction */
regs->find_reg(0x02).value |= REG02_MTRPWR;
sanei_genesys_set_motor_power(*regs, true);
regs->find_reg(0x02).value &= ~REG02_MTRREV;
/* fastfed enabled (2 motor slope tables) */
@ -4273,8 +4273,7 @@ simple_scan (Genesys_Device * dev, const Genesys_Sensor& sensor,
if (move == SANE_FALSE)
{
/* clear motor power flag if no move */
dev->reg.find_reg(0x02).value &= ~REG02_MTRPWR;
sanei_genesys_set_motor_power(dev->reg, false);
/* no automatic go home if no movement */
dev->reg.find_reg(0x02).value &= ~REG02_AGOHOME;

2
backend/genesys_gl841.cc
Wyświetl plik

@ -634,7 +634,7 @@ gl841_init_registers (Genesys_Device * dev)
dev->reg.find_reg(0x02).value = 0x30 /*0x38 */ ; /* auto home, one-table-move, full step */
dev->reg.find_reg(0x02).value |= REG02_AGOHOME;
dev->reg.find_reg(0x02).value |= REG02_MTRPWR;
sanei_genesys_set_motor_power(dev->reg, true);
dev->reg.find_reg(0x02).value |= REG02_FASTFED;
dev->reg.find_reg(0x03).value = 0x1f /*0x17 */ ; /* lamp on */

2
backend/genesys_gl843.cc
Wyświetl plik

@ -906,7 +906,7 @@ gl843_init_motor_regs_scan (Genesys_Device * dev,
/* compute register 02 value */
r = sanei_genesys_get_address (reg, REG02);
r->value = 0x00;
r->value |= REG02_MTRPWR;
sanei_genesys_set_motor_power(*reg, true);
if (use_fast_fed)
r->value |= REG02_FASTFED;

2
backend/genesys_gl846.cc
Wyświetl plik

@ -634,7 +634,7 @@ gl846_init_motor_regs_scan (Genesys_Device * dev,
/* compute register 02 value */
r = sanei_genesys_get_address (reg, REG02);
r->value = 0x00;
r->value |= REG02_MTRPWR;
sanei_genesys_set_motor_power(*reg, true);
if (use_fast_fed)
r->value |= REG02_FASTFED;

2
backend/genesys_gl847.cc
Wyświetl plik

@ -668,7 +668,7 @@ gl847_init_motor_regs_scan (Genesys_Device * dev,
/* compute register 02 value */
r = sanei_genesys_get_address (reg, REG02);
r->value = 0x00;
r->value |= REG02_MTRPWR;
sanei_genesys_set_motor_power(*reg, true);
if (use_fast_fed)
r->value |= REG02_FASTFED;