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 '188-hp-scanjet-3670-fails-to-scan-at-75dpi' into 'master' 

Resolve "HP ScanJet 3670 fails to scan at 75dpi"

Closes #188

See merge request sane-project/backends!298
merge-requests/317/merge
Povilas Kanapickas 2020-01-11 15:50:06 +00:00
rodzic aedebecef7 c4a88e6bf4
commit 0830b83915
19 zmienionych plików z 61 dodań i 33 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/genesys.conf.in
Wyświetl plik

@ -11,7 +11,7 @@
# Hewlett Packard ScanJet 2400c
usb 0x03f0 0x0a01
# Hewlett Packard ScanJet 3670c/3690c
# Hewlett Packard ScanJet 3670/3690c
usb 0x03f0 0x1405
# Plustek OpticPro ST24

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

@ -192,7 +192,7 @@ enum class ModelId : unsigned
DCT_DOCKETPORT_487,
HP_SCANJET_2300C,
HP_SCANJET_2400C,
HP_SCANJET_3670C,
HP_SCANJET_3670,
HP_SCANJET_4850C,
HP_SCANJET_G4010,
HP_SCANJET_G4050,

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),

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

@ -1467,17 +1467,17 @@ void genesys_init_usb_device_tables()
model = Genesys_Model();
model.name = "hewlett-packard-scanjet-3670c";
model.name = "hewlett-packard-scanjet-3670";
model.vendor = "Hewlett Packard";
model.model = "ScanJet 3670c";
model.model_id = ModelId::HP_SCANJET_3670C;
model.model = "ScanJet 3670";
model.model_id = ModelId::HP_SCANJET_3670;
model.asic_type = AsicType::GL646;
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 },

4
doc/descriptions/genesys.desc
Wyświetl plik

@ -79,7 +79,7 @@
:status :basic
:comment "clone of the HP 2400C"
:model "ScanJet 3670C"
:model "ScanJet 3670"
:interface "USB"
:usbid "0x03f0" "0x1405"
:status :complete
@ -89,7 +89,7 @@
:interface "USB"
:usbid "0x03f0" "0x1405"
:status :complete
:comment "1200x1200 dpi max, same as HP 3670C"
:comment "1200x1200 dpi max, same as HP 3670"
:model "ScanJet 4850C"
:interface "USB"

4
testsuite/tools/data/ascii.ref
Wyświetl plik

@ -5709,7 +5709,7 @@ backend `genesys'
status basic
url *none*
comment `clone of the HP 2400C'
model `ScanJet 3670C'
model `ScanJet 3670'
interface `USB'
usb-vendor-id `0x03f0'
usb-product-id `0x1405'
@ -5722,7 +5722,7 @@ backend `genesys'
usb-product-id `0x1405'
status complete
url *none*
comment `1200x1200 dpi max, same as HP 3670C'
comment `1200x1200 dpi max, same as HP 3670'
model `ScanJet 4850C'
interface `USB'
usb-vendor-id `0x03f0'

2
testsuite/tools/data/db.ref
Wyświetl plik

@ -66,7 +66,7 @@
0x03f0 0x1205 root:scanner 0664
# Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
0x03f0 0x1305 root:scanner 0664
# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C
# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
0x03f0 0x1405 root:scanner 0664
# Hewlett-Packard ScanJet 5590
0x03f0 0x1705 root:scanner 0664

2
testsuite/tools/data/hal-new.ref
Wyświetl plik

@ -175,7 +175,7 @@
<append key="info.capabilities" type="strlist">scanner</append>
<merge key="scanner.access_method" type="string">proprietary</merge>
</match>
<!-- Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C -->
<!-- Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C -->
<match key="usb.product_id" int="0x1405">
<append key="info.capabilities" type="strlist">scanner</append>
<merge key="scanner.access_method" type="string">proprietary</merge>

2
testsuite/tools/data/hal.ref
Wyświetl plik

@ -175,7 +175,7 @@
<append key="info.capabilities" type="strlist">scanner</append>
<merge key="scanner.access_method" type="string">proprietary</merge>
</match>
<!-- Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C -->
<!-- Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C -->
<match key="usb.product_id" int="0x1405">
<append key="info.capabilities" type="strlist">scanner</append>
<merge key="scanner.access_method" type="string">proprietary</merge>

4
testsuite/tools/data/html-backends-split.ref
Wyświetl plik

@ -5991,7 +5991,7 @@ Kyocera
<td>clone of the HP 2400C</td>
</tr>
<tr>
<td align=center>ScanJet 3670C</td>
<td align=center>ScanJet 3670</td>
<td align=center>USB</td>
<td align=center>0x03f0/0x1405</td>
<td align=center><font color="#007000">Complete</font></td>
@ -6002,7 +6002,7 @@ Kyocera
<td align=center>USB</td>
<td align=center>0x03f0/0x1405</td>
<td align=center><font color="#007000">Complete</font></td>
<td>1200x1200 dpi max, same as HP 3670C</td>
<td>1200x1200 dpi max, same as HP 3670</td>
</tr>
<tr>
<td align=center>ScanJet 4850C</td>

4
testsuite/tools/data/html-mfgs.ref
Wyświetl plik

@ -12078,7 +12078,7 @@ hpljm1005<br>(0)
</td>
<td align=center><a href="man/sane-hp3500.5.html">sane-hp3500</a></td>
</tr>
<tr><td align=center>ScanJet 3670C</td>
<tr><td align=center>ScanJet 3670</td>
<td align=center>USB</td>
<td align=center>0x03f0/0x1405</td>
<td align=center><font color="#007000">Complete</font></td>
@ -12093,7 +12093,7 @@ hpljm1005<br>(0)
<td align=center>USB</td>
<td align=center>0x03f0/0x1405</td>
<td align=center><font color="#007000">Complete</font></td>
<td>1200x1200 dpi max, same as HP 3670C</td>
<td>1200x1200 dpi max, same as HP 3670</td>
<td align=center>
<a href="http://www.meier-geinitz.de/sane/genesys-backend/">genesys</a>
<br>(1.0-63)

2
testsuite/tools/data/hwdb.ref
Wyświetl plik

@ -97,7 +97,7 @@ usb:v03F0p1205*
usb:v03F0p1305*
libsane_matched=yes
# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C
# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
usb:v03F0p1405*
libsane_matched=yes

4
testsuite/tools/data/testfile.desc
Wyświetl plik

@ -4894,7 +4894,7 @@
:status :basic
:comment "clone of the HP 2400C"
:model "ScanJet 3670C"
:model "ScanJet 3670"
:interface "USB"
:usbid "0x03f0" "0x1405"
:status :complete
@ -4904,7 +4904,7 @@
:interface "USB"
:usbid "0x03f0" "0x1405"
:status :complete
:comment "1200x1200 dpi max, same as HP 3670C"
:comment "1200x1200 dpi max, same as HP 3670"
:model "ScanJet 4850C"
:interface "USB"

2
testsuite/tools/data/udev+acl.ref
Wyświetl plik

@ -81,7 +81,7 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1105", ENV{libsane_matched}="yes"
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1205", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1305", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C
# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1405", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 5590
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1705", ENV{libsane_matched}="yes"

2
testsuite/tools/data/udev.ref
Wyświetl plik

@ -81,7 +81,7 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1105", MODE="0664", GROUP="scanner",
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1205", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1305", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C
# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1405", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 5590
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1705", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"

2
testsuite/tools/data/usermap.ref
Wyświetl plik

@ -64,7 +64,7 @@ libusbscanner 0x0003 0x03f0 0x1105 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0
libusbscanner 0x0003 0x03f0 0x1205 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
libusbscanner 0x0003 0x03f0 0x1305 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C
# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
libusbscanner 0x0003 0x03f0 0x1405 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Hewlett-Packard ScanJet 5590
libusbscanner 0x0003 0x03f0 0x1705 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000

4
testsuite/tools/data/xml.ref
Wyświetl plik

@ -6609,7 +6609,7 @@
<url>*none*</url>
<comment>clone of the HP 2400C</comment>
</model>
<model name="ScanJet 3670C">
<model name="ScanJet 3670">
<interface>USB</interface>
<usbvendorid>0x03f0</usbvendorid>
<usbproductid>0x1405</usbproductid>
@ -6623,7 +6623,7 @@
<usbproductid>0x1405</usbproductid>
<status>complete</status>
<url>*none*</url>
<comment>1200x1200 dpi max, same as HP 3670C</comment>
<comment>1200x1200 dpi max, same as HP 3670</comment>
</model>
<model name="ScanJet 4850C">
<interface>USB</interface>