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

Merge branch 'genesys-motor-fixes' into 'master' 

genesys: Motor table fixes

See merge request sane-project/backends!322
merge-requests/323/merge
Povilas Kanapickas 2020-02-01 21:43:09 +00:00
rodzic 07e3d5d4d6 6e2e885ec5
commit 12e113ab52
2 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -975,7 +975,7 @@ static void gl843_init_motor_regs_scan(Genesys_Device* dev,
r->value |= scan_dummy; /* dummy lines */
reg->set8_mask(REG_0x67, static_cast<unsigned>(motor_profile.step_type) << REG_0x67S_STEPSEL, 0xc0);
reg->set8_mask(REG_0x68, static_cast<unsigned>(motor_profile.step_type) << REG_0x68S_FSTPSEL, 0xc0);
reg->set8_mask(REG_0x68, static_cast<unsigned>(fast_profile->step_type) << REG_0x68S_FSTPSEL, 0xc0);
// steps for STOP table
reg->set8(REG_FMOVDEC, fast_table.steps_count / step_multiplier);

6
backend/genesys/tables_motor.cpp
Wyświetl plik

@ -297,7 +297,7 @@ void genesys_init_motor_tables()
profile = MotorProfile();
profile.slope = MotorSlope::create_from_steps(54612, 1500, 219);
profile.step_type = StepType::HALF;
profile.step_type = StepType::QUARTER;
profile.motor_vref = 2;
profile.resolutions = { 1200, 2400 };
profile.scan_methods = { ScanMethod::FLATBED };
@ -322,7 +322,7 @@ void genesys_init_motor_tables()
profile = MotorProfile();
profile.slope = MotorSlope::create_from_steps(54612, 1500, 219);
profile.step_type = StepType::HALF;
profile.step_type = StepType::QUARTER;
profile.motor_vref = 1;
profile.resolutions = { 1200, 2400 };
profile.scan_methods = { ScanMethod::TRANSPARENCY,
@ -340,7 +340,7 @@ void genesys_init_motor_tables()
profile = MotorProfile();
profile.slope = MotorSlope::create_from_steps(59240, 582, 1020);
profile.step_type = StepType::HALF;
profile.step_type = StepType::QUARTER;
profile.motor_vref = 2;
motor.fast_profiles.push_back(std::move(profile));