Merge branch 'feature/upstream' into develop

1 files changed, 390 insertions, 40 deletions

diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index ad33faa..be2ec1d 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -11,7 +11,7 @@
 ; See doc/descriptions.txt for details.
 
 :backend "pixma"                  ; name of backend
-:version "0.17.37"                ; version of backend (or "unmaintained")
+:version "0.23.0"                 ; 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."
 
@@ -28,8 +28,14 @@
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA E460 Series"
+:model "PIXMA E410 Series"
 :interface "USB"
+:usbid "0x04a9" "0x181e"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA E460 Series"
+:interface "USB Ethernet"
 :usbid "0x04a9" "0x1788"
 :status :untested
 :comment "Testers needed!"
@@ -55,8 +61,8 @@
 :model "PIXMA E510"
 :interface "USB"
 :usbid "0x04a9" "0x1761"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 1200DPI)."
 
 :model "PIXMA E560"
 :interface "USB"
@@ -76,12 +82,54 @@
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA G3000"
-:interface "USB WIFI"
+:model "PIXMA E3100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1828"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA E4200 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1855"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G2000"
+:interface "USB"
+:usbid "0x04a9" "0x1795"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)."
+
+:model "PIXMA G2100"
+:interface "USB"
+:usbid "0x04a9" "0x1795"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)."
+
+:model "PIXMA G3000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1794"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G3010 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x183b"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G4000 Series"
+:interface "USB WiFi"
 :usbid "0x04a9" "0x181d"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA G4010 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x183d"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG2100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1751"
@@ -245,7 +293,7 @@
 :comment "Testers needed!"
 
 :model "PIXMA MG7100 Series"
-:interface "USB"
+:interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x1772"
 :status :complete
 :comment "All resolutions supported (up to 2400DPI)."
@@ -274,18 +322,6 @@
 :status :complete
 :comment "All resolutions supported (up to 4800DPI)."
 
-:model "PIXUS MP5"
-:interface "USB"
-:usbid "0x04a9" "0x2635"
-:status :untested
-:comment "Testers needed! Identical with imageCLASS MPC190."
-
-:model "PIXUS MP10"
-:interface "USB"
-:usbid "0x04a9" "0x261f"
-:status :complete
-:comment "All resolutions supported (up to 600DPI). Identical with imageCLASS MPC200."
-
 :model "PIXMA MP140"
 :interface "USB"
 :usbid "0x04a9" "0x172b"
@@ -791,27 +827,207 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 4800DPI)"
 
-:model "PIXMA TS9000 Series"
+:model "PIXMA TR4500 Series"
 :interface "USB WiFi"
-:usbid "0x04a9" "0x179f"
+:usbid "0x04a9" "0x1854"
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA TS8000 Series"
+:model "PIXMA TR7500 Series"
 :interface "USB WiFi"
-:usbid "0x04a9" "0x1800"
+:usbid "0x04a9" "0x1824"
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA TS6000 Series"
+:model "PIXMA TR7530 Series"
 :interface "USB WiFi"
-:usbid "0x04a9" "0x1801"
+:usbid "0x04a9" "0x1845"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TR8500 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1823"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TR8530 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1844"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TR8580 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1841"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TR9530 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x185e"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS3100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1827"
+:status :good
+:comment "All resolutions supported (up to 600DPI). WiFi not working."
+
 :model "PIXMA TS5000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1802"
+:status :good
+:comment "All resolutions supported (up to 1200DPI). WiFi not working."
+
+:model "PIXMA TS5100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1825"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1801"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1822"
+:status :good
+:comment "All resolutions supported (up to 2400DPI). WiFi not working."
+
+:model "PIXMA TS6130 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1843"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6180 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1840"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6200 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1856"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6230 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1858"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6280 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1857"
+: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 TS8100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1821"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8130 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1842"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8180 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x183f"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8200 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1859"
+:status :good
+:comment "All resolutions supported (up to 1200DPI). WiFi not working."
+
+:model "PIXMA TS8230 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x185b"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8280 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x185a"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS9000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x179f"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS9100 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1820"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS9180 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x183e"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS9500 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x185c"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS9580 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x185d"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS MP5"
+:interface "USB"
+:usbid "0x04a9" "0x2635"
+:status :untested
+:comment "Testers needed! Identical with imageCLASS MPC190."
+
+:model "PIXUS MP10"
+:interface "USB"
+:usbid "0x04a9" "0x261f"
+:status :complete
+:comment "All resolutions supported (up to 600DPI). Identical with imageCLASS MPC200."
+
+:model "PIXUS XK50 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1846"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS XK70 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1847"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS XK80 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1873"
 :status :untested
 :comment "Testers needed!"
 
@@ -833,11 +1049,29 @@
 :status :complete
 :comment "All resolutions supported (up to 600DPI)"
 
+:model "imageCLASS D550"
+:interface "USB"
+:usbid "0x04a9" "0x2738"
+:status :untested
+:comment "Testers needed!"
+
+:model "imageCLASS D570"
+:interface "USB"
+:usbid "0x04a9" "0x27e8"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF110 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27ed"
+:status :untested
+:comment "Testers needed! WiFi only for w Types."
+
 :model "i-SENSYS MF210 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x27a9"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). WiFi only for w Types."
 
 :model "i-SENSYS MF220 Series"
 :interface "USB Ethernet WiFi"
@@ -854,8 +1088,88 @@
 :model "i-SENSYS MF240 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x27d2"
+:status :good
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI, ADF up to 300DPI). 216mm image width buggy, restricted to 215mm."
+
+:model "i-SENSYS MF260 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27f4"
+:status :untested
+:comment "Testers needed! Duplex only for MF269."
+
+:model "i-SENSYS MF410 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27c0"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF420 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27f1"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF510 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27c2"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF520 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27f0"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF620 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27b4"
 :status :complete
-:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). ADF only 300DPI."
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+:model "i-SENSYS MF630 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e1"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF640 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27fe"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF730 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e4"
+:status :good
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). Ethernet and WiFi not tested yet"
+
+
+:model "imageCLASS MF634C"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e2"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+
+:model "imageCLASS MF733Cdw"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e5"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+:model "i-SENSYS MF731/733"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e5"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+:model "i-SENSYS MF740 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27fb"
+:status :untested
+:comment "Testers needed!"
 
 :model "i-SENSYS MF810/820"
 :interface "USB Ethernet"
@@ -1070,8 +1384,8 @@
 :model "imageCLASS MF8030"
 :interface "USB"
 :usbid "0x04a9" "0x2707"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
 :model "imageCLASS MF8170c"
 :interface "USB"
@@ -1118,30 +1432,54 @@
 :model "imageRUNNER 1133"
 :interface "USB"
 :usbid "0x04a9" "0x2742"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
 :model "MAXIFY MB2000 Series"
-:interface "USB"
+:interface "USB WiFi"
 :usbid "0x04a9" "0x1778"
-:status :untested
-:comment "Testers needed!"
+:status :good
+:comment "Flatbed works, All resolutions supported (up to 1200DPI), ADF does not work"
+
+:model "MAXIFY MB2100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1793"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)."
 
 :model "MAXIFY MB2300 Series"
-:interface "USB"
+:interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x1779"
-:status :untested
-:comment "Testers needed!"
+:status :good
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 1200DPI), ADF does not work"
+
+:model "MAXIFY MB2700 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1792"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)."
 
 :model "MAXIFY MB5000 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1776"
-:status :complete
+:status :good
 :comment "Flatbed works, All resolutions supported (up to 1200DPI), ADF does not work"
 
+:model "MAXIFY MB5100 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1790"
+:status :untested
+:comment "Testers needed!"
+
 :model "MAXIFY MB5300 Series"
-:interface "USB"
+:interface "USB Ethernet"
 :usbid "0x04a9" "0x1777"
+:status :good
+:comment "1200dpi scans do not work"
+
+:model "MAXIFY MB5400 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x178f"
 :status :untested
 :comment "Testers needed!"
 
@@ -1162,3 +1500,15 @@
 :usbid "0x04a9" "0x190d"
 :status :complete
 :comment "Full flatbed support up to 4800DPI (Note: flatbed does not have 9600DPI capability). Full TPU support (negatives, slides and infrared) up to 9600DPI."
+
+:model "CanoScan LiDE 300"
+:interface "USB"
+:usbid "0x04a9" "0x1913"
+:status :complete
+:comment "Support up to 4800DPI (Note: does not have less than 300DPI support)"
+
+:model "CanoScan LiDE 400"
+:interface "USB"
+:usbid "0x04a9" "0x1912"
+:status :complete
+:comment "Support up to 4800DPI (Note: does not have less than 300DPI support)"