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

new scanners Canon PIXMA E[56]00, MX370, MX4[123]0, MX710

merge-requests/1/head
Rolf Bensch 2012-07-28 13:59:17 +02:00
rodzic db5226979d
commit 9ee5a9f248
3 zmienionych plików z 72 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
backend/pixma_mp150.c
Wyświetl plik

@ -160,9 +160,11 @@
#define MG5100_PID 0x1748
#define MG5200_PID 0x1749
#define MG6100_PID 0x174a
#define MX360_PID 0x174d
/* PIXMA 2011 vintage */
#define MX360_PID 0x174d
#define MX410_PID 0x174e
#define MX420_PID 0x174f
#define MX880_PID 0x1750
/* 2011 new devices (untested) */
@ -172,10 +174,15 @@
#define MG5300_PID 0x1754
#define MG6200_PID 0x1755
#define MP493_PID 0x1757
#define E500_PID 0x1758
/* 2012 new devices (untested) */
#define MX370_PID 0x1759
#define MX430_PID 0x175B
#define MX510_PID 0x175C
#define MX710_PID 0x175D
#define MX890_PID 0x175E
#define E600_PID 0x175A
/* Generation 4 XML messages that encapsulates the Pixma protocol messages */
@ -1594,10 +1601,12 @@ const pixma_config_t pixma_mp150_devices[] = {
/* PIXMA 2010 vintage */
DEVICE ("Canon PIXMA MX340", "MX340", MX340_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX350", "MX350", MX350_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX360", "MX360", MX360_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX870", "MX870", MX870_PID, 2400, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
/* PIXMA 2011 vintage */
DEVICE ("Canon PIXMA MX360", "MX360", MX360_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX410", "MX410", MX410_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX420", "MX420", MX420_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX880 Series", "MX880", MX880_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
/* Generation 4: CIS */
@ -1622,10 +1631,15 @@ const pixma_config_t pixma_mp150_devices[] = {
DEVICE ("Canon PIXMA MG5300", "MG5300", MG5300_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MG6200", "MG6200", MG6200_PID, 4800, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MP493", "MP493", MP493_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA E500", "E500", E500_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_EXPERIMENT),
/* Latest devices (2012) Generation 4 CIS/CCD */
DEVICE ("Canon PIXMA MX370 Series", "MX370", MX370_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF | PIXMA_CAP_EXPERIMENT),
DEVICE ("Canon PIXMA MX430 Series", "MX430", MX430_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF | PIXMA_CAP_EXPERIMENT),
DEVICE ("Canon PIXMA MX510 Series", "MX510", MX510_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MX710 Series", "MX710", MX710_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP | PIXMA_CAP_EXPERIMENT),
DEVICE ("Canon PIXMA MX890 Series", "MX890", MX890_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA E600 Series", "E600", E600_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF | PIXMA_CAP_EXPERIMENT),
END_OF_DEVICE_LIST
};

42
doc/descriptions/pixma.desc
Wyświetl plik

@ -24,6 +24,18 @@
:mfg "Canon" ; name a manufacturer
:url "http://www.canon.com/"
:model "PIXMA E500"
:interface "USB"
:usbid "0x04a9" "0x1758"
:status :untested
:comment "All resolutions supported (up to 1200DPI)."
:model "PIXMA E600"
:interface "USB"
:usbid "0x04a9" "0x175a"
:status :untested
:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)."
:model "PIXMA MP140"
:interface "USB"
:usbid "0x04a9" "0x172b"
@ -361,6 +373,30 @@
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
:model "PIXMA MX370 Series"
:interface "USB"
:usbid "0x04a9" "0x1759"
:status :untested
:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
:model "PIXMA MX410"
:interface "USB WLAN"
:usbid "0x04a9" "0x174e"
:status :untested
:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
:model "PIXMA MX420"
:interface "USB Ethernet WLAN"
:usbid "0x04a9" "0x174f"
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
:model "PIXMA MX430 Series"
:interface "USB WLAN"
:usbid "0x04a9" "0x175b"
:status :untested
:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
:model "PIXMA MX510 Series"
:interface "USB"
:usbid "0x04a9" "0x175c"
@ -373,6 +409,12 @@
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 2400DPI)"
:model "PIXMA MX710 Series"
:interface "USB Ethernet WLAN"
:usbid "0x04a9" "0x175d"
:status :untested
:comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported, ADF empty buggy."
:model "PIXMA MX850"
:interface "USB Ethernet"
:usbid "0x04a9" "0x172c"

25
doc/sane-pixma.man
Wyświetl plik

@ -29,7 +29,7 @@ PIXMA MP600, MP600R, MP610, MP620, MP630, MP640, MP710
.br
PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980, MP990
.br
PIXMA MX300, MX310, MX330, MX340, MX350, MX360
PIXMA MX300, MX310, MX330, MX340, MX350, MX360, MX420
.br
PIXMA MX700, MX850, MX860, MX870, MX7600
.br
@ -58,24 +58,27 @@ PIXMA MP760, MP770, MP780, MP790, MX360
The following models may use the same Pixma protocol as those listed
above, but have not yet been reported to work (or not). They are declared
in the backend so that they get recognized and activated.
Feedback in the Sane-dev mailing list welcome.
Feedback in the sane\-devel mailing list welcome.
.PP
.RS
PIXMA MP375R, MP740
.br
PIXMA MX320, MX510, MX890
PIXMA MX320, MX410, MX510, MX890
.br
ImageCLASS MF5630, MF5650, MF5730, MF5750, MF8170c
.RE
.PP
\#The following models may use partly the same Pixma protocol as MPs listed
\#above, but may still need some work. They are declared in the backend as
\#experimental. Snoop logs are required to further investigate, please contact
\#the sane\-devel mailing list.
\#.PP
\#.RS
\#PIXMA MP---
\#.RE
The following models may use partly the same Pixma protocol as MPs listed
above, but may still need some work. They are declared in the backend as
experimental. Snoop logs are required to further investigate, please contact
the sane\-devel mailing list.
.PP
.RS
PIXMA E500, E600
.br
PIXMA MX370, MX430, MX710
.RE
.PP
The backend supports:
.PP
.RS