diff --git a/ChangeLog b/ChangeLog index dd1b3e710..e01d5d195 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-03-21 Rolf Bensch + * backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man: + New scanners Canon Pixma MG2400, MG2500, MG3500, MG5500, MG64000, MG6500 + and MG7100. All scanners need further testing. + 2013-09-08 paul newall * kodakaio.desc: Added hero 4.1 model, marked some scanners as staus basic diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c index e2af7dd08..e29dccd3e 100644 --- a/backend/pixma_mp150.c +++ b/backend/pixma_mp150.c @@ -201,6 +201,13 @@ #define MX520_PID 0x1769 #define MX720_PID 0x176a #define MX920_PID 0x176b +#define MG2400_PID 0x176c +#define MG2500_PID 0x176d +#define MG3500_PID 0x176e +#define MG6500_PID 0x176f +#define MG6400_PID 0x1770 +#define MG5500_PID 0x1771 +#define MG7100_PID 0x1772 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */ @@ -1740,6 +1747,13 @@ const pixma_config_t pixma_mp150_devices[] = { DEVICE ("Canon PIXMA MX520 Series", "MX520", MX520_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), DEVICE ("Canon PIXMA MX720 Series", "MX720", MX720_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), DEVICE ("Canon PIXMA MX920 Series", "MX920", MX920_PID, 2400, 0, 600, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP), + DEVICE ("Canon PIXMA MG2400 Series", "MG2400", MG2400_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MG2500 Series", "MG2500", MG2500_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MG3500 Series", "MG3500", MG3500_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MG5500 Series", "MG5500", MG5500_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MG6400 Series", "MG6400", MG6400_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MG6500 Series", "MG6500", MG6500_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MG7100 Series", "MG7100", MG7100_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS), END_OF_DEVICE_LIST }; diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index b9e1dd430..51cf45415 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -60,6 +60,18 @@ :status :untested :comment "Testers needed!" +:model "PIXMA MG2400 Series" +:interface "USB" +:usbid "0x04a9" "0x176c" +:status :untested +:comment "Testers needed!" + +:model "PIXMA MG2500 Series" +:interface "USB" +:usbid "0x04a9" "0x176d" +:status :untested +:comment "Testers needed!" + :model "PIXMA MG3100 Series" :interface "USB WLAN" :usbid "0x04a9" "0x1752" @@ -72,6 +84,12 @@ :status :untested :comment "Testers needed!" +:model "PIXMA MG3500 Series" +:interface "USB" +:usbid "0x04a9" "0x176e" +:status :untested +:comment "Testers needed!" + :model "PIXMA MG4100 Series" :interface "USB" :usbid "0x04a9" "0x1753" @@ -108,6 +126,12 @@ :status :untested :comment "Testers needed!" +:model "PIXMA MG5500 Series" +:interface "USB" +:usbid "0x04a9" "0x1771" +:status :untested +:comment "Testers needed!" + :model "PIXMA MG6100 Series" :interface "USB" :usbid "0x04a9" "0x174a" @@ -126,6 +150,24 @@ :status :complete :comment "All resolutions supported (up to 2400DPI)." +:model "PIXMA MG6400 Series" +:interface "USB" +:usbid "0x04a9" "0x1770" +:status :untested +:comment "Testers needed!" + +:model "PIXMA MG6500 Series" +:interface "USB" +:usbid "0x04a9" "0x176f" +:status :untested +:comment "Testers needed!" + +:model "PIXMA MG7100 Series" +:interface "USB" +:usbid "0x04a9" "0x1772" +:status :untested +:comment "Testers needed!" + :model "PIXMA MG8100 Series" :interface "USB" :usbid "0x04a9" "0x174b" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index 618f1c9b7..b910b07bc 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -1,4 +1,4 @@ -.TH "sane\-pixma" "5" "18 Jul 2013" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH "sane\-pixma" "5" "11 Sep 2013" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane\-pixma .SH NAME sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners @@ -77,7 +77,9 @@ Feedback in the sane\-devel mailing list welcome. .RS PIXMA E500, E510, E600, E610 .br -PIXMA MG2200, MG3200, MG4100, MG5400, MG8100 +PIXMA MG2200, MG2400, MG2500, MG3200, MG4100, MG5400, MG5500 +.br +PIXMA MG6400, MG6500, MG7100, MG8100 .br PIXMA MP375R, MP493, MP495, MP740 .br