Merge branch 'feature/upstream' into develop

14 files changed, 187 insertions, 33 deletions

diff --git a/doc/descriptions/avision.desc b/doc/descriptions/avision.desc
index 780d7e6..b694e89 100644
--- a/doc/descriptions/avision.desc
+++ b/doc/descriptions/avision.desc
@@ -89,6 +89,18 @@
 :comment "sheetfed scanner"
 :status :complete
 
+:model "AV186+"
+:interface "USB"
+:usbid "0x0638" "0x1a33"
+:comment "sheetfed scanner"
+:status :good
+
+:model "AV188"
+:interface "USB"
+:usbid "0x0638" "0x2ad9"
+:comment "sheetfed scanner"
+:status :untested
+
 :model "AV210D2+"
 :interface "USB"
 :usbid "0x0638" "0x1a35"
diff --git a/doc/descriptions/canon_dr.desc b/doc/descriptions/canon_dr.desc
index a767cdb..d43b1ea 100644
--- a/doc/descriptions/canon_dr.desc
+++ b/doc/descriptions/canon_dr.desc
@@ -11,9 +11,9 @@
 
 :backend "canon_dr"              ; name of backend
 :url "http://www.thebility.com/canon/"
-:version "57"                    ; version of backend
+:version "60"                    ; version of backend
 :manpage "sane-canon_dr"         ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.28, see sane-canon_dr manpage"
+:comment "Backend updated for SANE release 1.0.32, see sane-canon_dr manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
@@ -268,7 +268,8 @@
 :model "DR-C120"
 :interface "USB"
 :usbid "0x1083" "0x1651"
-:status :untested
+:status :basic
+:comment "Gray and color work, may always scan in duplex, lower edge may be cropped"
 
 :model "DR-C125"
 :interface "USB"
@@ -279,12 +280,13 @@
 :interface "USB"
 :usbid "0x1083" "0x164a"
 :status :untested
+:comment "May be compatible with DR-C120"
 
 :model "DR-C225"
 :interface "USB"
 :usbid "0x1083" "0x1658"
-:status :untested
-:comment ""
+:status :basic
+:comment "Calibration is poor, grayscale mode may crash. DR-C225ii is the same device."
 
 :model "DR-F120"
 :interface "USB"
diff --git a/doc/descriptions/canon_lide70.desc b/doc/descriptions/canon_lide70.desc
index 6b50fe4..3c1dc64 100644
--- a/doc/descriptions/canon_lide70.desc
+++ b/doc/descriptions/canon_lide70.desc
@@ -24,6 +24,21 @@
 ;==================================================
 :model "CanoScan LiDE 70"
 :interface "USB"
+:url "http://www.juergen-ernst.de/info_sane.html"
 :usbid "0x04a9" "0x2225"
 :status :basic
 :comment "Please test!"
+
+:model "CanoScan LiDE 600"
+:interface "USB"
+:url "http://www.juergen-ernst.de/info_sane.html"
+:usbid "0x04a9" "0x2224"
+:status :basic
+:comment "Please test!"
+
+:model "CanoScan LiDE 600F"
+:interface "USB"
+:url "http://www.juergen-ernst.de/info_sane.html"
+:usbid "0x04a9" "0x2224"
+:status :basic
+:comment "Please test!"
diff --git a/doc/descriptions/dmc.desc b/doc/descriptions/dmc.desc
index 08a01bb..5f14fe6 100644
--- a/doc/descriptions/dmc.desc
+++ b/doc/descriptions/dmc.desc
@@ -1,5 +1,3 @@
-; $Id$
-;
 ; SANE Backend specification file (Matto Marjanovic's format)
 ;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.
diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
index d1f3bed..1af191f 100644
--- a/doc/descriptions/epson2.desc
+++ b/doc/descriptions/epson2.desc
@@ -528,6 +528,11 @@
 :status     :good
 :comment    "network interface supported via DFSG non-free iscan-network-nt package"
 
+:model      "ET-2600"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :good
+
 :model      "ET-2650"
 :interface  "USB Ethernet"
 :usbid      "0x04b8" "0x1121"
@@ -1745,12 +1750,14 @@
 
 :model      "Perfection 1640SU"		; command spec
 :interface  "SCSI USB"
+:scsi       "EPSON" "Perfection1640" "processor"
 :usbid      "0x04b8" "0x010a"
 :status     :complete
 :comment    "overseas version of the GT-8700"
 
 :model      "Perfection 1640SU PHOTO"
 :interface  "SCSI USB"
+:scsi       "EPSON" "Perfection1640" "processor"
 :usbid      "0x04b8" "0x010a"
 :status     :good
 :comment    "overseas version of the GT-8700F"
diff --git a/doc/descriptions/escl.desc b/doc/descriptions/escl.desc
index 798f906..88f0fdb 100644
--- a/doc/descriptions/escl.desc
+++ b/doc/descriptions/escl.desc
@@ -13,9 +13,19 @@
 :status :good
 :comment "All resolutions supported."
 
+:model "HL-L258DW"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :mfg "Canon"
 :url "https://www.canon-europe.com/support/"
 
+:model "PIXMA MG5765"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "PIXMA G7050"
 :interface "Ethernet WiFi"
 :status :untested
@@ -36,6 +46,11 @@
 :status :good
 :comment "All resolutions supported."
 
+:model "PIXMA TS5351"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "PIXMA TS6150"
 :interface "Wifi"
 :status :untested
@@ -82,11 +97,36 @@
 :mfg "HP"
 :url "https://support.hp.com/us-en/drivers/printers"
 
+:model "DeskJet 2710"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported"
+
+:model "DeskJet 2723"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "DeskJet 3760"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "LaserJet MFP M28w"
 :interface "WiFi"
 :status :untested
 :comment "Testers needed!"
 
+:model "LaserJet FlowMFP M578"
+:interface "WiFi"
+:status :basic
+:comment "Issues with duplex ADF"
+
+:model "LaserJet MFP M630"
+:interface "WiFi"
+:status :basic
+:comment "Issues with duplex ADF"
+
 :model "OfficeJet 4630"
 :interface "WiFi"
 :status :untested
diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc
index e809d4b..33fe735 100644
--- a/doc/descriptions/genesys.desc
+++ b/doc/descriptions/genesys.desc
@@ -232,8 +232,8 @@
 :model "CanoScan 4400F"
 :interface "USB"
 :usbid "0x04a9" "0x2228"
-:status :complete
-:comment "300, 600, 1200 dpi resolutions are supported in flatbed mode; 1200, 2400, 4800 dpi resolutions are supported in transparency scanning mode"
+:status :untested
+:comment "Physical damage due to overheating reported.  Enable in genesys.conf at your own risk.  See https://gitlab.com/sane-project/backends/-/issues/436.  300, 600, 1200 dpi resolutions are supported in flatbed mode; 1200, 2400, 4800 dpi resolutions are supported in transparency scanning mode"
 
 :model "CanoScan 5600F"
 :interface "USB"
diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc
index f101cd1..b911e98 100644
--- a/doc/descriptions/gt68xx.desc
+++ b/doc/descriptions/gt68xx.desc
@@ -473,6 +473,6 @@
 :interface "USB"
 :usbid "0x04a7" "0x0444"
 :status :good
-:comment "Works upto 1200 dpi and 12 bits/color."
+:comment "Works up to 1200 dpi and 12 bits/color."
 
 ; -----------------------------------------------------------------------------
diff --git a/doc/descriptions/hp.desc b/doc/descriptions/hp.desc
index 8cf94af..2a7c46b 100644
--- a/doc/descriptions/hp.desc
+++ b/doc/descriptions/hp.desc
@@ -21,7 +21,7 @@
 :url "http://www.hp.com/"
 
 :model "ScanJet Plus"           ; name models for above-specified mfg.
-:interface "Propietary"
+:interface "Proprietary"
 :status :complete
 :comment "Driver for HP parallel interface card required"
 
diff --git a/doc/descriptions/ma1509.desc b/doc/descriptions/ma1509.desc
index 99456b2..2309e41 100644
--- a/doc/descriptions/ma1509.desc
+++ b/doc/descriptions/ma1509.desc
@@ -26,7 +26,7 @@
 :interface "USB"
 :usbid "0x055f" "0x0010"
 :status :good
-:comment "Works upto 600 dpi. No support for TA and ADF yet."
+:comment "Works up to 600 dpi. No support for TA and ADF yet."
 :mfg "Fujitsu"		; name a manufacturer
 :url "http://www.fujitsu.com/"
 
diff --git a/doc/descriptions/niash.desc b/doc/descriptions/niash.desc
index e4b66d9..b85dc10 100644
--- a/doc/descriptions/niash.desc
+++ b/doc/descriptions/niash.desc
@@ -1,4 +1,3 @@
-; $Id$
 ; SANE Backend specification file
 ;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.
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"
diff --git a/doc/descriptions/snapscan.desc b/doc/descriptions/snapscan.desc
index 2943e2d..33d7ec3 100644
--- a/doc/descriptions/snapscan.desc
+++ b/doc/descriptions/snapscan.desc
@@ -1,5 +1,3 @@
-; $Id$
-;
 ; SANE Backend specification file (Matto Marjanovic's format)
 ;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.
diff --git a/doc/descriptions/unsupported.desc b/doc/descriptions/unsupported.desc
index 03788c4..e7c1954 100644
--- a/doc/descriptions/unsupported.desc
+++ b/doc/descriptions/unsupported.desc
@@ -402,20 +402,6 @@
 :status :unsupported
 :comment "GL841 based, to be added to genesys backend"
 
-:model "CanoScan LiDE 600"
-:interface "USB"
-:url "http://www.juergen-ernst.de/info_sane.html"
-:usbid "0x04a9" "0x2224"
-:status :unsupported
-:comment "Philips chip. Backend started, see link"
-
-:model "CanoScan LiDE 600F"
-:interface "USB"
-:url "http://www.juergen-ernst.de/info_sane.html"
-:usbid "0x04a9" "0x2224"
-:status :unsupported
-:comment "Philips chip. Backend started, see link"
-
 :model "FS4000"
 :url "unsupported/canon-fs4000.html"
 :interface "USB SCSI"
@@ -709,7 +695,7 @@
 :interface "USB"
 :usbid "0x06dc" "0x0012"
 :status :unsupported
-:comment "Unsuported. See link for details."
+:comment "Unsupported. See link for details."
 
 :model "ColorPage HR8"
 :url "unsupported/genius-colorpage-hr8.html"
@@ -2255,7 +2241,7 @@
 :interface "Parport"
 :status :unsupported
 :url "http://www.autistici.org/tamarhack/"
-:comment "Unsupported at the moment. See link for a project for that scanner taht may support it in future."
+:comment "Unsupported at the moment. See link for a project for that scanner that may support it in future."
 
 :model "Artiscan 9600 pro 36"                ; name models for above-specified mfg.
 :interface "Parport"