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

genesys: added 50dpi to HP ScanJet 3670 backend 

Windows driver supports 50dpi as the lowest mode.
merge-requests/317/merge
Ralph Little 2020-01-07 22:36:09 -08:00
rodzic bc804f5641
commit 88ea0d48e7
4 zmienionych plików z 37 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
backend/genesys/gl646.h
Wyświetl plik

@ -144,6 +144,10 @@ typedef struct
*/
static Motor_Master motor_master[] = {
/* HP3670 motor settings */
{MotorId::HP3670, 50, 3, StepType::HALF, false, true, 1,
MotorSlope::create_from_steps(2329, 120, 229),
MotorSlope::create_from_steps(3399, 337, 192), 192},
{MotorId::HP3670, 75, 3, StepType::FULL, false, true, 1,
MotorSlope::create_from_steps(3429, 305, 200),
MotorSlope::create_from_steps(3399, 337, 192), 192},
@ -168,8 +172,8 @@ static Motor_Master motor_master[] = {
MotorSlope::create_from_steps(15937, 6375, 3),
MotorSlope::create_from_steps(3399, 337, 192), 192},
{MotorId::HP3670,2400, 3, StepType::HALF, false, true, 0,
MotorSlope::create_from_steps(15937, 12750, 3),
{MotorId::HP3670, 50, 1, StepType::HALF, false, true, 1,
MotorSlope::create_from_steps(2329, 120, 229),
MotorSlope::create_from_steps(3399, 337, 192), 192},
{MotorId::HP3670, 75, 1, StepType::FULL, false, true, 1,
@ -196,10 +200,6 @@ static Motor_Master motor_master[] = {
MotorSlope::create_from_steps(15937, 6375, 3),
MotorSlope::create_from_steps(3399, 337, 192), 192},
{MotorId::HP3670,2400, 3, StepType::HALF, false, true, 0,
MotorSlope::create_from_steps(15937, 12750, 3),
MotorSlope::create_from_steps(3399, 337, 192), 192},
/* HP2400/G2410 motor settings base motor dpi = 600 */
{MotorId::HP2400, 50, 3, StepType::FULL, false, true, 63,
MotorSlope::create_from_steps(8736, 601, 120),

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

@ -1476,8 +1476,8 @@ void genesys_init_usb_device_tables()
model.resolutions = {
{
{ ScanMethod::FLATBED },
{ 1200, 600, 300, 150, 100, 75 },
{ 1200, 600, 300, 150, 100, 75 },
{ 1200, 600, 300, 150, 100, 75, 50 },
{ 1200, 600, 300, 150, 100, 75, 50 },
}
};

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

@ -83,7 +83,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::HP3670;
motor.base_ydpi = 1200;
motor.optical_ydpi = 2400;
motor.optical_ydpi = 1200;
motor.slopes.push_back(MotorSlope::create_from_steps(11000, 3000, 128));
motor.slopes.push_back(MotorSlope::create_from_steps(11000, 3000, 128));
s_motors->push_back(std::move(motor));

28
backend/genesys/tables_sensor.cpp
Wyświetl plik

@ -1181,6 +1181,34 @@ void genesys_init_sensor_tables()
};
CustomSensorSettings custom_settings[] = {
{ { 50 }, 5758, {
{ 0x08, 0x00 },
{ 0x09, 0x0a },
{ 0x0a, 0x0b },
{ 0x0b, 0x0d },
{ 0x16, 0x33 },
{ 0x17, 0x07 },
{ 0x18, 0x33 },
{ 0x19, 0x2a },
{ 0x1a, 0x02 },
{ 0x1b, 0x13 },
{ 0x1c, 0xc0 },
{ 0x1d, 0x43 },
{ 0x52, 0x0f },
{ 0x53, 0x13 },
{ 0x54, 0x17 },
{ 0x55, 0x03 },
{ 0x56, 0x07 },
{ 0x57, 0x0b },
{ 0x58, 0x83 },
{ 0x59, 0x15 },
{ 0x5a, 0xc1 },
{ 0x5b, 0x05 },
{ 0x5c, 0x0a },
{ 0x5d, 0x0f },
{ 0x5e, 0x00 }
}
},
{ { 75 }, 4879, {
{ 0x08, 0x00 },
{ 0x09, 0x0a },