aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Bensch <roben-guest@alioth.debian.org>2016-10-08 14:24:53 +0200
committerRolf Bensch <roben-guest@alioth.debian.org>2016-10-08 14:24:53 +0200
commit7e20475c8b45249d05315d5a889551924210666d (patch)
tree1ecaf24875e2377ee0815f9a6fa1f73e57d8a9bb
parent3b63fdab2b94f14765f8ba165546f6d69fc23ea9 (diff)
pixma: new scanner Canon PIXMA MG3000 Series
see bug report #315521
-rw-r--r--backend/pixma_mp150.c5
-rw-r--r--doc/descriptions/pixma.desc6
-rw-r--r--doc/sane-pixma.man4
3 files changed, 13 insertions, 2 deletions
diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index b61dd49..5e96d2b 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -233,6 +233,8 @@
#define MG6800_PID 0x178d
#define MG5700_PID 0x178e
+/* 2016 new devices (untested) */
+#define MG3000_PID 0x180b
/* Generation 4 XML messages that encapsulates the Pixma protocol messages */
#define XML_START_1 \
@@ -1846,5 +1848,8 @@ const pixma_config_t pixma_mp150_devices[] = {
DEVICE ("Canon PIXMA MG6800 Series", "MG6800", MG6800_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MG5700 Series", "MG5700", MG5700_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+ /* Latest devices (2016) Generation 4 CIS */
+ DEVICE ("Canon PIXMA MG3000 Series", "MG3000", MG3000_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 799c62b..9855d97 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -100,6 +100,12 @@
:status :complete
:comment "All resolutions supported (up to 600DPI)."
+:model "PIXMA MG3000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x180b"
+:status :untested
+:comment "Testers needed!"
+
:model "PIXMA MG3100 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x1752"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 784d5a6..c8e0348 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "12 Apr 2016" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "08 Oct 2016" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-pixma
.SH NAME
sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -85,7 +85,7 @@ Feedback in the sane\-devel mailing list welcome.
.RS
PIXMA E400, E460, E480, E500, E510, E560, E600, E610
.br
-PIXMA MG4100, MG5400, MG6500, MG6600, MG6800, MG6900
+PIXMA MG3000, MG4100, MG5400, MG6500, MG6600, MG6800, MG6900
.br
PIXMA MG8100
.br