From 52ec47a434c746dfb10dd8a136c4d2edaae58d89 Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Sun, 16 Mar 2008 16:33:53 +0000 Subject: [PATCH] Added Canon PIXMA MX700, declared MX300 and MX310, and updated some descriptions. --- ChangeLog | 6 ++++++ backend/pixma.h | 2 +- backend/pixma_mp150.c | 12 ++++++++++-- doc/descriptions/pixma.desc | 36 +++++++++++++++++++++++++++--------- doc/sane-pixma.man | 17 ++++++++++++++--- 5 files changed, 58 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4378a596f..88cb3d2f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-16 Nicolas Martin + * backend/pixma_mp150.c, backend/pixma.h, doc/sane-pixma.man, + doc/descriptions/pixma.desc: + Changes to have new Canon PIXMA MX700 working with pixma backend + Flatbed and ADF scan are supported. + 2008-03-15 Julien Blache * include/sane/sanei_usb.h: typo fix. diff --git a/backend/pixma.h b/backend/pixma.h index 0b68f0069..2eb52b788 100644 --- a/backend/pixma.h +++ b/backend/pixma.h @@ -108,7 +108,7 @@ typedef u_int32_t uint32_t; /**@{*/ #define PIXMA_VERSION_MAJOR 0 #define PIXMA_VERSION_MINOR 14 -#define PIXMA_VERSION_BUILD 3 +#define PIXMA_VERSION_BUILD 4 /**@}*/ /** \name Error codes */ diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c index 0e15b5a28..645248416 100644 --- a/backend/pixma_mp150.c +++ b/backend/pixma_mp150.c @@ -104,7 +104,9 @@ #define MP520_PID 0x1724 #define MP610_PID 0x1725 #define MP970_PID 0x1726 /* untested */ - +#define MX300_PID 0x1727 /* untested */ +#define MX310_PID 0x1728 /* untested */ +#define MX700_PID 0x1729 enum mp150_state_t { @@ -430,7 +432,7 @@ send_scan_param (pixma_t * s) else { data = pixma_newcmd (&mp->cb, cmd_scan_param_3, 0x38, 0); - data[0x00] = 0x01; + data[0x00] = (s->param->source == PIXMA_SOURCE_ADF) ? 0x02 : 0x01; data[0x01] = 0x01; data[0x02] = 0x01; data[0x05] = 0x01; /* This one also seen at 0. Don't know yet what's used for */ @@ -1022,6 +1024,12 @@ const pixma_config_t pixma_mp150_devices[] = { DEVICE ("Canon PIXMA MP520", MP520_PID, 2400, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA MP610", MP610_PID, 4800, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MX300", MX300_PID, 600, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA MX310", MX310_PID, 1200, + PIXMA_CAP_CIS | PIXMA_CAP_ADF), + DEVICE ("Canon PIXMA MX700", MX700_PID, 2400, + PIXMA_CAP_CIS | PIXMA_CAP_ADF), + /* Generation 3: CCD */ DEVICE ("Canon PIXMA MP970", MP970_PID, 4800, PIXMA_CAP_CCD | PIXMA_CAP_TPU | PIXMA_CAP_EXPERIMENT), diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index 857511f98..ceeb64814 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -11,7 +11,7 @@ ; See doc/descriptions.txt for details. :backend "pixma" ; name of backend -:version "0.14.3" ; version of backend (or "unmaintained") +:version "0.14.4" ; version of backend (or "unmaintained") :manpage "sane-pixma" ; name of manpage (if it exists) :url "http://home.arcor.de/wittawat/pixma/" ; 0.13.1 backend's web page :url "http://mp610.blogspot.com/" ; 0.14.2 backend's web page @@ -28,7 +28,7 @@ :interface "USB" :usbid "0x04a9" "0x172b" :status :good -:comment "up to 600 DPI" +:comment "All resolutions supported (up to 600 DPI)" :model "PIXMA MP150" :interface "USB" @@ -54,13 +54,13 @@ :interface "USB" :usbid "0x04a9" "0x1721" :status :good -:comment "up to 600DPI" +:comment "All resolutions supported (up to 600DPI)" :model "PIXMA MP220" :interface "USB" :usbid "0x04a9" "0x1722" :status :untested -:comment "Testers needed! Likely to use generation 3 protocol." +:comment "Testers needed! Likely to use generation 3 protocol like MP210." :model "PIXMA MP450" :interface "USB" @@ -77,7 +77,7 @@ :interface "USB" :usbid "0x04a9" "0x1723" :status :good -:comment "up to 2400DPI" +:comment "All resolutions supported (up to 2400DPI)" :model "PIXMA MP500" :interface "USB" @@ -93,7 +93,7 @@ :interface "USB" :usbid "0x04a9" "0x1724" :status :good -:comment "up to 2400DPI" +:comment "All resolutions supported (up to 2400DPI)" :model "PIXMA MP530" :interface "USB" @@ -116,7 +116,7 @@ :interface "USB" :usbid "0x04a9" "0x1725" :status :good -:comment "up to 4800DPI" +:comment "All resolutions supported (up to 4800DPI)" :model "PIXMA MP750" :interface "USB" @@ -158,7 +158,7 @@ :interface "USB" :usbid "0x04a9" "0x1713" :status :basic -:comment "Sigle-side ADF works but duplex doesn't work yet." +:comment "Single-side ADF works but duplex doesn't work yet." :model "PIXMA MP960" :interface "USB" @@ -199,7 +199,7 @@ :interface "USB" :usbid "0x04a9" "0x264d" :status :good -:comment "up to 1200DPI" +:comment "All resolutions supported (up to 1200DPI)" :model "PIXMA MP740" :interface "USB" @@ -212,3 +212,21 @@ :usbid "0x04a9" "0x262f" :status :minimal :comment "Do grayscale and ADF work? Same model as SmartBase MP730 Photo?" + +:model "PIXMA MX300" +:interface "USB" +:usbid "0x04a9" "0x1727" +:status :untested +:comment "Probably uses the same protocol as MX700 ?" + +:model "PIXMA MX310" +:interface "USB" +:usbid "0x04a9" "0x1728" +:status :untested +:comment "Probably uses the same protocol as MX700 ?" + +:model "PIXMA MX700" +:interface "USB" +:usbid "0x04a9" "0x1729" +:status :good +:comment "Flatbed and ADF scan. All resolutions supported (up to 2400DPI)" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index 52685ca12..81da7e4f9 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -1,4 +1,4 @@ -.TH "sane-pixma" "5" "17 February 2008" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH "sane-pixma" "5" "16 March 2008" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane-pixma .SH NAME sane-pixma \- SANE backend for Canon PIXMA MP series @@ -14,7 +14,9 @@ PIXMA MP140, MP150, MP160, MP170, MP180, MP210, MP450, MP460, MP470 .br PIXMA MP500, MP510, MP520, MP530, MP600, MP600R, MP610, MP710 .br -PIXMA MP800, MP800R, MP810, MP830, MP960 +PIXMA MP800, MP800R, MP810, MP830, MP960 +.br +PIXMA MX700 .br MultiPASS MP700, PIXMA MP750 (no grayscale) .RE @@ -34,9 +36,18 @@ in the backend so that they get recognized and activated. Feedback in the Sane-dev mailing list welcome. .PP .RS -PIXMA MP220, MP740, MP970 +PIXMA MP220, MP740, MP970, MX300, MX310 .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-dev mailing list. +.\".PP +.\".RS +.\"PIXMA MX300, MX310, MX700 +.\".RE +.\".PP The backend supports .br * resolutions at 75,150,300,600,1200,2400 and 4800 DPI (some maybe buggy),