diff --git a/ChangeLog b/ChangeLog index e402f1103..3f98a1c5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-01-18 Rolf Bensch + * backend/pixma_mp150, doc/descriptions/pixma.desc, doc/sane-pixma.man: + New scanner MX880. + 2012-01-17 Rolf Bensch * backend/pixma_mp810.c: Flatbed mode supports max. 4800 dpi. diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c index b268996d1..efef44108 100644 --- a/backend/pixma_mp150.c +++ b/backend/pixma_mp150.c @@ -161,6 +161,9 @@ #define MG5200_PID 0x1749 #define MG6100_PID 0x174a +/* PIXMA 2011 vintage */ +#define MX880_PID 0x1750 + /* 2011 new devices (untested) */ #define MG2100_PID 0x1751 #define MG3100_PID 0x1752 @@ -1164,6 +1167,7 @@ mp150_check_param (pixma_t * s, pixma_scan_param_t * sp) if (( s->cfg->pid == MX850_PID || s->cfg->pid == MX860_PID || s->cfg->pid == MX870_PID || + s->cfg->pid == MX880_PID || s->cfg->pid == MX320_PID || s->cfg->pid == MX330_PID || s->cfg->pid == MX340_PID || @@ -1560,6 +1564,9 @@ const pixma_config_t pixma_mp150_devices[] = { DEVICE ("Canon PIXMA MX350", "MX350", MX350_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF), DEVICE ("Canon PIXMA MX870", "MX870", MX870_PID, 2400, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP), + /* PIXMA 2011 vintage */ + DEVICE ("Canon PIXMA MX880", "MX880", MX880_PID, 2400, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP), + /* Generation 4: CIS */ DEVICE ("Canon PIXMA MP640", "MP640", MP640_PID, 4800, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA MP560", "MP560", MP560_PID, 2400, 638, 877, PIXMA_CAP_CIS), diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index 8c502b9f5..c5d61ebf8 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -283,6 +283,12 @@ :status :complete :comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported, ADF empty buggy." +:model "PIXMA MX880" +:interface "USB Ethernet" +:usbid "0x04a9" "0x1750" +:status :complete +:comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported, ADF empty buggy." + :model "PIXMA MX7600" :interface "USB Ethernet" :usbid "0x04a9" "0x171c" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index 8c80563aa..35a03e58e 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -31,7 +31,7 @@ PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980, MP990 .br PIXMA MX300, MX310, MX330, MX340, MX350 .br -PIXMA MX700, MX850, MX860, MX870, MX7600 +PIXMA MX700, MX850, MX860, MX870, MX880, MX7600 .br PIXMA MP700, MP730, PIXMA MP750 (no grayscale) .br @@ -243,7 +243,7 @@ the pixma backend, available in the Sane git repository at: You can also post into the Sane-devel mailing list for support. .SH AUTHORS -Wittawat Yamwong, Nicolas Martin, Dennis Lou, Louis Lagendijk +Wittawat Yamwong, Nicolas Martin, Dennis Lou, Louis Lagendijk, Rolf Bensch .PP We would like to thank all testers and helpers. Without them we could not be able to write subdrivers for models we don't have. See also the project