Merge branch 'feature/upstream' into develop

1 files changed, 99 insertions, 2 deletions

diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 3b7ac6c..933780f 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -11,9 +11,9 @@
 ; See doc/descriptions.txt for details.
 
 :backend "pixma"                  ; name of backend
-:version "0.28.5"                 ; version of backend (or "unmaintained")
+:version "0.28.6"                 ; version of backend (or "unmaintained")
 :manpage "sane-pixma"             ; name of manpage (if it exists)
-;:comment "Devices marked as experimantal are disabled by default. See the manual page for how to enable them."
+;:comment "Devices marked as experimental are disabled by default. See the manual page for how to enable them."
 
 :devicetype :scanner              ; start of a list of devices....
                                   ; other types:  :stillcam, :vidcam,
@@ -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"