Merge branch 'feature/upstream' into develop

1 files changed, 145 insertions, 1 deletions

diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index b1a5657..07c4740 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -136,12 +136,24 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "G2030 series"
+:interface "USB"
+:usbid "0x04a9" "0x1106"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G2060"
 :interface "USB"
 :usbid "0x04a9" "0x18c1"
 :status :untested
 :comment "Testers needed!"
 
+:model "G2070 series"
+:interface "USB"
+:usbid "0x04a9" "0x18f5"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G2100"
 :interface "USB"
 :usbid "0x04a9" "0x1795"
@@ -166,12 +178,24 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "G3030 series"
+:interface "USB"
+:usbid "0x04a9" "0x1105"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G3060"
 :interface "USB"
 :usbid "0x04a9" "0x18c3"
 :status :untested
 :comment "Testers needed!"
 
+:model "G3070 series"
+:interface "USB"
+:usbid "0x04a9" "0x18f4"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G4000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x181d"
@@ -184,6 +208,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "G4070 series"
+:interface "USB"
+:usbid "0x04a9" "0x18f3"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G4511"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x183d"
@@ -226,12 +256,42 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA GX1000 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x110b"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA GX2000 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x110d"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA GX3000 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18f1"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA GX4000"
+:interface "USB"
+:usbid "0x04a9" "0x18f2"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA GX6000 Series"
-:interface "USB Ethernet WiFi"
+:interface "USB"
 :usbid "0x04a9" "0x18a6"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA GX6500 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1148"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA GX7000"
 :interface "USB"
 :usbid "0x04a9" "0x18a8"
@@ -935,6 +995,18 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 4800DPI)"
 
+:model "TC-20M"
+:interface "USB"
+:usbid "0x04a9" "0x18fc"
+:status :untested
+:comment "Testers needed!"
+
+:model "TC-5200M"
+:interface "USB"
+:usbid "0x04a9" "0x18ff"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TR4500 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1854"
@@ -977,6 +1049,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TR7800 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1151"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TR8500 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x1823"
@@ -1163,6 +1241,18 @@
 :status :good
 :comment "All resolutions supported (up to 1200DPI). WiFi not tested by Pixma as yet."
 
+:model "PIXMA TS6630 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x114e"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6730 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1150"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS7330 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x188f"
@@ -1193,6 +1283,30 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS7600i series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x114f"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS7700 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x110f"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS7700A series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1111"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS7700i series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1152"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS8000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1800"
@@ -1265,6 +1379,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS8630 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18f8"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8700 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1118"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS9000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x179f"
@@ -1337,6 +1463,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXUS XK110 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18f9"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS XK120 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1119"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXUS XK500 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x18df"
@@ -1505,6 +1643,12 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
 
+:model "i-SENSYS MF750 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x2885"
+:status :untested
+:comment "Testers needed!"
+
 :model "i-SENSYS MF810/820"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x27a6"