pixma: Add models

backend/pixma/pixma_mp150.c

@@ -299,6 +299,25 @@
 #define TS3300_PID 0x18a2
 #define E3300_PID  0x18a3
 
+/* 2020 new devices (untested) */
+#define G7080_PID 0x1864
+#define GM4080_PID 0x186A
+#define TS3400_PID 0x18B7
+#define E3400_PID 0x18B8
+#define TR7000_PID 0x18B9
+#define G2020_PID 0x18BD
+#define G3060_PID 0x18C3
+#define G2060_PID 0x18C1
+#define G3020_PID 0x18BF
+#define TS7430_PID 0x18B2
+#define XK90_PID 0x18B6
+#define TS8430_PID 0x18B5
+#define TR7600_PID 0x18AA
+#define TR8600_PID 0x18AD
+#define TR8630_PID 0x18AF
+#define TS6400_PID 0x18D3
+#define TS7400_PID 0x18D7
+
 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
 #define XML_START_1   \
 "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\
@@ -1891,6 +1910,23 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA TS6330 Series", "TS6330", TS6330_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA TS3300 Series", "TS3300", TS3300_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA E3300 Series", "E3300", E3300_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS3400 Series", "TS3400", TS3400_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA E3400 Series", "E3400", E3400_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA TR7000 Series", "TR7000", TR7000_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA G2020", "G2020", G2020_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA G3060", "G3060", G3060_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA G2060", "G2060", G2060_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA G3020", "G3020", G3020_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS7430 Series", "TS7430", TS7430_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXUS XK90 Series", "XK90", XK90_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS8430 Series", "TS8430", TS8430_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TR7600 Series", "TR7600", TR7600_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA TR8600 Series", "TR8600", TR8600_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA TR8630 Series", "TR8630", TR8630_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA TS6400 Series", "TS6400", TS6400_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS7400 Series", "TS7400", TS7400_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA G7080 Series", "G7080", G7080_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA GM4080", "GM4080", GM4080_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
 
   END_OF_DEVICE_LIST
 };

doc/descriptions/pixma.desc

@@ -94,6 +94,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA E3400 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18b8"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA E4200 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1855"
@@ -112,6 +118,18 @@
 :status :complete
 :comment "All resolutions supported (up to 600DPI)."
 
+:model "PIXMA G2020"
+:interface "USB"
+:usbid "0x04a9" "0x18bd"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G2060"
+:interface "USB"
+:usbid "0x04a9" "0x18c1"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G2100"
 :interface "USB"
 :usbid "0x04a9" "0x1795"
@@ -130,6 +148,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA G3020"
+:interface "USB"
+:usbid "0x04a9" "0x18bf"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G3060"
+:interface "USB"
+:usbid "0x04a9" "0x18c3"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G4000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x181d"
@@ -160,12 +190,24 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA G7080"
+:interface "USB"
+:usbid "0x04a9" "0x1864"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA GM4000 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x1869"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA GM4080"
+:interface "USB"
+:usbid "0x04a9" "0x186A"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG2100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1751"
@@ -869,6 +911,13 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
 
+
+:model "PIXMA TR7000 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18b9"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TR7500 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1824"
@@ -881,6 +930,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TR7600 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18aa"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TR8500 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x1823"
@@ -899,6 +954,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TR8600 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18ad"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TR8630 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18af"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TR9530 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x185e"
@@ -917,6 +984,12 @@
 :status :good
 :comment "All resolutions supported (up to 1200DPI). WiFi not working."
 
+:model "PIXMA TS3400 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18b7"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS5000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1802"
@@ -1001,18 +1074,42 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS6400 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18d3"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS7330 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x188f"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS7400 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18d7"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS7430 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18b2"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS8000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1800"
 :status :good
 :comment "All resolutions supported (up to 2400DPI). WiFi not working."
 
+:model "PIXMA TS8430 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18b5"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS8100 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1821"

doc/sane-pixma.man

@@ -105,7 +105,9 @@ Feedback in the sane\-devel mailing list welcome.
 .RS
 PIXMA E400, E460, E470, E480, E500, E560, E600, E610
 .br
-PIXMA E3100, E3300, E4200
+PIXMA E3100, E3300, E3400, E4200
+.br
+PIXMA G2020, G2060, G3020, G3060, G7000, G7080
 .br
 PIXMA MG4100, MG6500, MG6600, MG6800, MG6900, MG8100
 .br
@@ -113,19 +115,21 @@ PIXMA MP375R, MP493, MP740
 .br
 PIXMA MX320, MX390, MX430, MX450, MX490, MX710
 .br
-PIXMA G3000, G3010, G4010, G6000, G6080, G7000, GM4000
+PIXMA G3000, G3010, G4010, G6000, G6080, G7000, GM4000, GM4080
 .br
-PIXMA TR7500, TR7530, TR8500, TR8530, TR8580, TR9530
+PIXMA TR7500, TR7530, TR7600, TR8500, TR8530, TR8580, TR8600
 .br
-PIXMA TS6000, TS6130, TS6180, TS6230, TS6280, TS6300, TS6330
+PIXMA TR8630, TR9530
 .br
-PIXMA TS6380, TS7330, TS8100, TS8130, TS8180, TS8230, TS8280
+PIXMA TS3400, TS5100, TS6000, TS6130, TS6180, TS6230, TS6280, TS6300
 .br
-PIXMA TS8300, TS8330, TS8380, TS9000, TS9100, TS9180, TS9500
+PIXMA TS6330, TS6330, TS6380, TS6400, TS7330, TS7400, TS7430, TS8100
 .br
-PIXMA TS9580
+PIXMA TS8130, TS8180, TS8230, TS8280, TS8300, TS8330, TS8380, TS9000
 .br
-PIXUS MP5, XK50, XK60, XK70, XK80
+PIXMA TS9100, TS9180, TS9500, TS9580
+.br
+PIXUS MP5, XK50, XK60, XK70, XK80, XK90
 .br
 imageCLASS MF720, MF810/820, MF5630, MF5650, MF5750, MF8170c
 .br