Merge branch 'feature/upstream' into develop

4 files changed, 154 insertions, 1 deletions

diff --git a/doc/descriptions-external/ambir.desc b/doc/descriptions-external/ambir.desc
new file mode 100644
index 0000000..b1a232d
--- /dev/null
+++ b/doc/descriptions-external/ambir.desc
@@ -0,0 +1,35 @@
+;
+; SANE Backend specification file
+;
+; It's basically emacs-lisp --- so ";" indicates comment to end of line.
+; All syntactic elements are keyword tokens, followed by a string or
+;  keyword argument, as specified.
+;
+; ":backend" *must* be specified.
+; All other information is optional (but what good is the file without it?).
+;
+; See doc/descriptions.txt for details.
+
+:backend "pl12x"                  ; name of backend
+;:version ""                      ; version of backend (or "unmaintained")
+;:manpage "sane-template"         ; name of manpage (if it exists)
+:url "https://acct90501.secure.netsuite.com/c.ACCT90501/820ix%20linux%20Driver%205%2031%202022.zip" ; backend's web page
+:comment "External backend supplied by Ambir Technology. As this software contains non-free parts, it can't be included into SANE. If you can't find your model here, please have a look at the Ambir website which contains the latest list."
+                                  ; comment about the backend
+
+:devicetype :scanner              ; start of a list of devices....
+                                  ; other types:  :stillcam, :vidcam,
+                                  ;               :meta, :api
+
+:mfg "Ambir Technology"           ; name a manufacturer
+:url "https://www.ambir.com/"     ; manufacturer's URL
+;:comment ""
+                                  ; comment about the manufacturer
+
+;reports that we have seen
+
+
+:model "ImageScan Pro 820ix"
+:status :complete
+:interface "USB"
+:usbid "0x20ec" "0x820b"
diff --git a/doc/descriptions-external/kyocera.desc b/doc/descriptions-external/kyocera.desc
new file mode 100644
index 0000000..e5a2225
--- /dev/null
+++ b/doc/descriptions-external/kyocera.desc
@@ -0,0 +1,35 @@
+;
+; SANE Backend specification file
+;
+; It's basically emacs-lisp --- so ";" indicates comment to end of line.
+; All syntactic elements are keyword tokens, followed by a string or
+;  keyword argument, as specified.
+;
+; ":backend" *must* be specified.
+; All other information is optional (but what good is the file without it?).
+;
+; See doc/descriptions.txt for details.
+
+:backend "kyocera"               ; name of backend
+;:version ""                   ; version of backend (or "unmaintained")
+;:manpage "sane-template"          ; name of manpage (if it exists)
+:url "https://www.kyoceradocumentsolutions.de/de/support/downloads.html" ; backend's web page
+:comment "External backend made by Kyocera. As this software contains non-free parts, it can't be included into SANE. If you can't find your model here, please have a look at the Kyocera website which contains the latest list."
+                                  ; comment about the backend
+
+:devicetype :scanner              ; start of a list of devices....
+                                  ; other types:  :stillcam, :vidcam,
+                                  ;               :meta, :api
+
+:mfg "Kyocera"                   ; name a manufacturer
+:url "https://www.kyoceradocumentsolutions.de"   ; manufacturer's URL
+;:comment ""
+                                  ; comment about the manufacturer
+
+;reports that we have seen
+
+
+:model "Ecosys M2640idw"
+:status :good
+:interface "Network"
+:comment "Reported to work over Network."
diff --git a/doc/descriptions-external/scangearmp2.desc b/doc/descriptions-external/scangearmp2.desc
index b670144..d9e3b7e 100644
--- a/doc/descriptions-external/scangearmp2.desc
+++ b/doc/descriptions-external/scangearmp2.desc
@@ -11,7 +11,7 @@
 
 :backend "canon_pixma"                 ; name of backend
 ;:version "(external)"             ; version of backend
-:url "https://github.com/Ordissimo/libmfp2-canon/blob/master/README.md"     ; backend's web page
+:url "https://github.com/Ordissimo/scangearmp2/blob/master/README.md"     ; backend's web page
 :comment "External binary-only backend for Linux i386 and x86_64?. See the website for the latest release."
 
 
@@ -28,6 +28,89 @@
 ; Canon MFP2 conf file
 ;
 
+; ---- V440 --------------------------
+
+:model "TS2400 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1108"
+:status :untested
+:comment "Testers needed!"
+
+:model "TS2600 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1107"
+:status :untested
+:comment "Testers needed!"
+
+
+; ---- V420 --------------------------
+:model "TS5350i series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18d9"
+:status :untested
+:comment "Testers needed!"
+
+:model "G600 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18d5"
+:status :untested
+:comment "Testers needed!"
+
+:model "TS3500 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18d4"
+:status :untested
+:comment "Testers needed!"
+
+:model "TR4600 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18da"
+:status :untested
+:comment "Testers needed!"
+
+:model "E4500 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18db"
+:status :untested
+:comment "Testers needed!"
+
+:model "TR4700 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18dc"
+:status :untested
+:comment "Testers needed!"
+
+:model "XK500 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18df"
+:status :untested
+:comment "Testers needed!"
+
+:model "TS8530 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18e0"
+:status :untested
+:comment "Testers needed!"
+
+:model "XK100 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18e2"
+:status :untested
+:comment "Testers needed!"
+
+:model "TS7530 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18e1"
+:status :untested
+:comment "Testers needed!"
+
+:model "TS7450i series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18f7"
+:status :untested
+:comment "Testers needed!"
+
+
 ; ---- V420 --------------------------
 :model "GX6000 series"
 :interface "USB WiFi"
diff --git a/doc/descriptions-external/template.desc. b/doc/descriptions-external/template.desc
index ce5d077..ce5d077 100644
--- a/doc/descriptions-external/template.desc.
+++ b/doc/descriptions-external/template.desc