From 652da9a378c2dbc850b1f0d216ba0e3dbac82274 Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Tue, 21 Apr 2009 08:22:20 +0000 Subject: [PATCH] Updated documentation for Pixma MP240, reported to work fine by Nik. --- ChangeLog | 5 +++++ backend/pixma_mp150.c | 2 +- doc/descriptions/pixma.desc | 4 ++-- doc/sane-pixma.man | 14 ++++++++++---- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ad5b201e..761beced3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-04-21 Nicolas Martin + * doc/sane-pixma.man, doc/descriptions/pixma.desc, + backand/pixma_mp150.c: + Updated documentation for Pixma MP240, reported to work fine by Nik. + 2009-04-21 Alex Belkin * backend/xerox_mfp.c: update version number. diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c index c57efac11..4b0fceefc 100644 --- a/backend/pixma_mp150.c +++ b/backend/pixma_mp150.c @@ -136,7 +136,7 @@ #define MP620_PID 0x172f #define MP540_PID 0x1730 #define MP480_PID 0x1731 -#define MP240_PID 0x1732 /* Untested */ +#define MP240_PID 0x1732 #define MP260_PID 0x1733 /* Untested */ #define MP190_PID 0x1734 diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index 9a428258a..f72153eb9 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -276,8 +276,8 @@ :model "PIXMA MP240" :interface "USB" :usbid "0x04a9" "0x1732" -:status :untested -:comment "Same protocol as Pixma Generation 3? Testers needed!" +:status :good +:comment "All resolutions supported (up to 1200DPI)" :model "PIXMA MP260" :interface "USB" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index f10d0537d..6ea426eb7 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -12,9 +12,13 @@ using Canon's BJNP protocol. Currently, the following models work with this backend: .PP .RS -PIXMA MP140, MP150, MP160, MP170, MP180, MP190, MP210, MP220 +PIXMA MP140, MP150, MP160, MP170, MP180, MP190 .br -PIXMA MP450, MP460, MP470, MP480, MP500, MP510, MP520, MP530, MP540 +PIXMA MP210, MP220, MP240 +.br +PIXMA MP450, MP460, MP470, MP480 +.br +PIXMA MP500, MP510, MP520, MP530, MP540 .br PIXMA MP600, MP600R, MP610, MP620, MP630, MP710 .br @@ -24,7 +28,9 @@ PIXMA MX300, MX310, MX700, MX850, MX7600 .br MultiPASS MP700, PIXMA MP750 (no grayscale) .br -ImageCLASS MF4010, MF4018, MF4120, MF4122, MF4140, MF4150, MF4270 +ImageCLASS MF4010, MF4018, MF4120, MF4122, MF4140, MF4150 +.br +ImageCLASS MF4270 .RE .PP The following models are not well tested and/or the scanner sometimes hangs @@ -44,7 +50,7 @@ Feedback in the Sane-dev mailing list welcome. .RS PIXMA MP740 .br -PIXMA MP240, MP260 +PIXMA MP260 .br ImageCLASS MF3110, MF3240 .br