Merge branch 'patch-1' into 'master'

pixma: detect MF440. Fix #257

Closes #257

See merge request sane-project/backends!347
fix-build-obselete-jpeg
Rolf Bensch 2020-03-11 11:43:49 +00:00
commit b9a19d0cef
3 zmienionych plików z 9 dodań i 1 usunięć

Wyświetl plik

@ -122,6 +122,7 @@
#define MF743_PID 0x27fc
#define MF640_PID 0x27fe
#define MF645_PID 0x27fd
#define MF440_PID 0x2823
enum iclass_state_t
@ -981,5 +982,6 @@ const pixma_config_t pixma_iclass_devices[] = {
DEV ("Canon i-SENSYS MF741C/743C", "MF741C/743C", MF743_PID, 600, 300, 640, 1050, PIXMA_CAP_ADFDUP), /* ADFDUP restricted to 300dpi */
DEV ("Canon i-SENSYS MF640 Series", "MF642C/643C/644C", MF640_PID, 600, 0, 640, 1050, PIXMA_CAP_ADFDUP),
DEV ("Canon i-SENSYS MF645C", "MF645C", MF645_PID, 600, 0, 637, 877, PIXMA_CAP_ADFDUP), /* max. w = 216mm */
DEV ("Canon i-SENSYS MF440 Series", "MF440", MF440_PID, 600, 0, 637, 877, PIXMA_CAP_ADFDUP),
DEV (NULL, NULL, 0, 0, 0, 0, 0, 0)
};

Wyświetl plik

@ -1199,6 +1199,12 @@
:status :untested
:comment "Testers needed!"
:model "i-SENSYS MF440 Series"
:interface "USB Ethernet WiFi"
:usbid "0x04a9" "0x2823"
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI, ADF up to 300DPI)."
:model "i-SENSYS MF510 Series"
:interface "USB Ethernet WiFi"
:usbid "0x04a9" "0x27c2"

Wyświetl plik

@ -69,7 +69,7 @@ imageCLASS MF5730, MF5770, MF6550, MPC200
.br
imageCLASS D420, D480, D530, D570
.br
i-SENSYS MF210, MF230, MF240, MF620, MF630, MF640, MF645C, MF730
i-SENSYS MF210, MF230, MF240, MF440, MF620, MF630, MF640, MF645C, MF730
.br
i-SENSYS MF731/733, MF741/743, MF3010, MF4320d, MF4330d, MF4500
.br