Merge branch 'feature/upstream' into develop

1 files changed, 123 insertions, 10 deletions

diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 618d128..b1a5657 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -106,6 +106,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA E4500 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18db"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G600"
+:interface "USB"
+:usbid "0x04a9" "0x18d5"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)."
+
 :model "PIXMA G2000"
 :interface "USB"
 :usbid "0x04a9" "0x1795"
@@ -214,6 +226,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA GX6000 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x18a6"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA GX7000"
+:interface "USB"
+:usbid "0x04a9" "0x18a8"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG2100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1751"
@@ -917,6 +941,17 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
 
+:model "PIXMA TR4600 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18da"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
+
+:model "PIXMA TR4700 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18dc"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
 
 :model "PIXMA TR7000 Series"
 :interface "USB"
@@ -978,6 +1013,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS2400 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1108"
+:status :good
+:comment "All resolutions supported (up to 600DPI). WiFi not working."
+
+:model "PIXMA TS2600 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1107"
+:status :good
+:comment "All resolutions supported (up to 600DPI). WiFi not working."
+
 :model "PIXMA TS3100 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1827"
@@ -990,9 +1037,27 @@
 :status :good
 :comment "All resolutions supported (up to 1200DPI). WiFi not working."
 
-:model "PIXMA TS3400 Series"
+:model "PIXMA TS3450"
+:interface "USB"
+:usbid "0x04a9" "0x18b7"
+:status :good
+:comment ""All resolutions supported (up to 600DPI). WiFi not working.
+
+:model "PIXMA TS3451"
+:interface "USB"
+:usbid "0x04a9" "0x18b7"
+:status :good
+:comment ""All resolutions supported (up to 600DPI). WiFi not working.
+
+:model "PIXMA TS3452"
 :interface "USB"
 :usbid "0x04a9" "0x18b7"
+:status :good
+:comment ""All resolutions supported (up to 600DPI). WiFi not working.
+
+:model "PIXMA TS3500 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18d4"
 :status :untested
 :comment "Testers needed!"
 
@@ -1014,12 +1079,24 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS5350i Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18d9"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS5380 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x188c"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS5400 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18d8"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS6000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1801"
@@ -1083,8 +1160,8 @@
 :model "PIXMA TS6400 Series"
 :interface "USB"
 :usbid "0x04a9" "0x18d3"
-:status :untested
-:comment "Testers needed!"
+:status :good
+:comment "All resolutions supported (up to 1200DPI). WiFi not tested by Pixma as yet."
 
 :model "PIXMA TS7330 Series"
 :interface "USB WiFi"
@@ -1104,18 +1181,24 @@
 :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 TS7450i Series"
+:interface "USB"
+:usbid "0x04a9" "0x18f7"
+:status :untested
+:comment "Testers needed!"
 
-:model "PIXMA TS8430 Series"
+:model "PIXMA TS7530 Series"
 :interface "USB"
-:usbid "0x04a9" "0x18b5"
+:usbid "0x04a9" "0x18e1"
 :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 supported by Pixma."
+
 :model "PIXMA TS8100 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1821"
@@ -1170,6 +1253,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS8430 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18b5"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8530 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18e0"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS9000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x179f"
@@ -1236,6 +1331,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXUS XK100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18e2"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS XK500 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18df"
+:status :untested
+:comment "Testers needed!"
+
 :model "imageCLASS D420"
 :interface "USB"
 :usbid "0x04a9" "0x26ef"
@@ -1650,6 +1757,12 @@
 :status :complete
 :comment "All resolutions supported (up to 600DPI). Identical with SmartBase MPC200 and PIXUS MP10."
 
+:model "imageRUNNER 1018/1022/1023"
+:interface "USB"
+:usbid "0x04a9" "0x269d"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
+
 :model "imageRUNNER 1020/1024/1025"
 :interface "USB"
 :usbid "0x04a9" "0x26e6"