From fdfde41ed16f49623447f9bbc9a32c55790e1eb0 Mon Sep 17 00:00:00 2001 From: Rolf Bensch Date: Wed, 29 Oct 2014 09:14:50 +0100 Subject: [PATCH] new Canon scanners MAXIFY MB5000, MB5300, MB2000, MB2300 PIXMA MG7500, MG6600, MG5600, MG2900, E460 *all scanners need further testing* --- backend/pixma_mp150.c | 18 +++++++++++++ doc/descriptions/pixma.desc | 54 +++++++++++++++++++++++++++++++++++++ doc/sane-pixma.man | 10 ++++--- 3 files changed, 78 insertions(+), 4 deletions(-) diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c index f66cd3252..22ca41d88 100644 --- a/backend/pixma_mp150.c +++ b/backend/pixma_mp150.c @@ -212,8 +212,17 @@ /* 2014 new devices (untested) */ #define MX470_PID 0x1774 #define MX530_PID 0x1775 +#define MB5000_PID 0x1776 +#define MB5300_PID 0x1777 +#define MB2000_PID 0x1778 +#define MB2300_PID 0x1779 #define E400_PID 0x177a #define E560_PID 0x177b +#define MG7500_PID 0x177c +#define MG6600_PID 0x177e +#define MG5600_PID 0x177f +#define MG2900_PID 0x1780 +#define E460_PID 0x1788 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */ @@ -1796,8 +1805,17 @@ const pixma_config_t pixma_mp150_devices[] = { /* Latest devices (2014) Generation 4 CIS */ DEVICE ("Canon PIXMA MX470 Series", "MX470", MX470_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF), DEVICE ("Canon PIXMA MX530 Series", "MX530", MX530_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF), + DEVICE ("Canon MAXIFY MB5000 Series", "MB5000", MB5000_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP), + DEVICE ("Canon MAXIFY MB5300 Series", "MB5300", MB5300_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP), + DEVICE ("Canon MAXIFY MB2000 Series", "MB2000", MB2000_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP), + DEVICE ("Canon MAXIFY MB2300 Series", "MB2300", MB2300_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP), DEVICE ("Canon PIXMA E400", "E400", E400_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA E560", "E560", E560_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MG7500 Series", "MG7500", MG7500_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MG6600 Series", "MG6600", MG6600_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MG5600 Series", "MG5600", MG5600_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MG2900 Series", "MG2900", MG2900_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA E460 Series", "E460", E460_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), END_OF_DEVICE_LIST }; diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index e4702c641..19082dd77 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -30,6 +30,12 @@ :status :untested :comment "Testers needed!" +:model "PIXMA E460 Series" +:interface "USB" +:usbid "0x04a9" "0x1788" +:status :untested +:comment "Testers needed!" + :model "PIXMA E500" :interface "USB" :usbid "0x04a9" "0x1758" @@ -84,6 +90,12 @@ :status :untested :comment "Testers needed!" +:model "PIXMA MG2900 Series" +:interface "USB" +:usbid "0x04a9" "0x1780" +:status :untested +:comment "Testers needed!" + :model "PIXMA MG3100 Series" :interface "USB WiFi" :usbid "0x04a9" "0x1752" @@ -144,6 +156,12 @@ :status :complete :comment "All resolutions supported (up to 1200DPI)." +:model "PIXMA MG5600 Series" +:interface "USB" +:usbid "0x04a9" "0x177f" +:status :untested +:comment "Testers needed!" + :model "PIXMA MG6100 Series" :interface "USB" :usbid "0x04a9" "0x174a" @@ -174,12 +192,24 @@ :status :untested :comment "Testers needed!" +:model "PIXMA MG6600 Series" +:interface "USB" +:usbid "0x04a9" "0x177e" +:status :untested +:comment "Testers needed!" + :model "PIXMA MG7100 Series" :interface "USB" :usbid "0x04a9" "0x1772" :status :complete :comment "All resolutions supported (up to 2400DPI)." +:model "PIXMA MG7500 Series" +:interface "USB" +:usbid "0x04a9" "0x177c" +:status :untested +:comment "Testers needed!" + :model "PIXMA MG8100 Series" :interface "USB" :usbid "0x04a9" "0x174b" @@ -937,6 +967,30 @@ :status :untested :comment "Testers needed!" +:model "MAXIFY MB2000 Series" +:interface "USB" +:usbid "0x04a9" "0x1778" +:status :untested +:comment "Testers needed!" + +:model "MAXIFY MB2300 Series" +:interface "USB" +:usbid "0x04a9" "0x1779" +:status :untested +:comment "Testers needed!" + +:model "MAXIFY MB5000 Series" +:interface "USB" +:usbid "0x04a9" "0x1776" +:status :untested +:comment "Testers needed!" + +:model "MAXIFY MB5300 Series" +:interface "USB" +:usbid "0x04a9" "0x1777" +:status :untested +:comment "Testers needed!" + :model "CanoScan 8800F" :interface "USB" :usbid "0x04a9" "0x1901" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index b890c3bb1..623da087f 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -1,4 +1,4 @@ -.TH "sane\-pixma" "5" "27 Oct 2014" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH "sane\-pixma" "5" "29 Oct 2014" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane\-pixma .SH NAME sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners @@ -77,11 +77,11 @@ in the backend so that they get recognized and activated. Feedback in the sane\-devel mailing list welcome. .PP .RS -PIXMA E400, E500, E510, E560, E600, E610 +PIXMA E400, E460, E500, E510, E560, E600, E610 .br -PIXMA MG2200, MG2500, MG4100, MG5400 +PIXMA MG2200, MG2500, MG2900, MG4100, MG5400, MG5600 .br -PIXMA MG6400, MG6500, MG8100 +PIXMA MG6400, MG6500, MG6600, MG7500, MG8100 .br PIXMA MP375R, MP493, MP495, MP740 .br @@ -92,6 +92,8 @@ imageCLASS MF5630, MF5650, MF5750, MF8030, MF8170c imageRUNNER 1133 .br i-SENSYS MF5880dn, MF6680dn, MF8500C Series +.br +MAXIFY MB2000, MB2300, MB5000, MB5300 .RE .PP \#The following models may use partly the same Pixma protocol as other devices