From b5e92b8b8de83985f25484adcdeb5b2a4ecd0df9 Mon Sep 17 00:00:00 2001
From: Rolf Bensch <rolf@bensch-online.de>
Date: Mon, 8 Oct 2018 21:24:04 +0200
Subject: [PATCH] pixma: new scanners Canon PIXMA TR7500, TR8500, TS3100,
 TS5100, TS9100 Series

---
 backend/pixma_mp150.c       | 14 +++++++++++
 doc/descriptions/pixma.desc | 48 ++++++++++++++++++++++++++++++-------
 doc/sane-pixma.man          |  4 ++--
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index 258810955..1b2980365 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -250,8 +250,15 @@
 /* 2017 new devices (untested) */
 #define G4000_PID 0x181d
 #define TS6100_PID 0x1822
+#define TS5100_PID 0x1825
+#define TS3100_PID 0x1827
 #define E3100_PID 0x1828
 
+/* 2018 new devices (untested) */
+#define TS9100_PID 0x1820
+#define TR8500_PID 0x1823
+#define TR7500_PID 0x1824
+
 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
 #define XML_START_1   \
 "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\
@@ -1918,7 +1925,14 @@ const pixma_config_t pixma_mp150_devices[] = {
   /* Latest devices (2017) Generation 5 CIS */
   DEVICE ("Canon PIXMA G4000", "G4000", G4000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA TS6100 Series", "TS6100", TS6100_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS5100 Series", "TS5100", TS5100_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS3100 Series", "TS3100", TS3100_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA E3100 Series", "E3100", E3100_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
 
+  /* Latest devices (2018) Generation 5 CIS */
+  DEVICE ("Canon PIXMA TS9100 Series", "TS9100", TS9100_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TR8500 Series", "TR8500", TR8500_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA TR7500 Series", "TR7500", TR7500_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+
   END_OF_DEVICE_LIST
 };
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index bb3d81639..930124210 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -815,17 +815,35 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 4800DPI)"
 
-:model "PIXMA TS9000 Series"
-:interface "USB Ethernet WiFi"
-:usbid "0x04a9" "0x179f"
+:model "PIXMA TR7500 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1824"
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA TS8000 Series"
+:model "PIXMA TR8500 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1823"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS3100 Series"
 :interface "USB WiFi"
-:usbid "0x04a9" "0x1800"
+:usbid "0x04a9" "0x1827"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS5000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1802"
 :status :good
-:comment "All resolutions supported (up to 2400DPI). WiFi not working."
+: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"
@@ -839,11 +857,23 @@
 :status :good
 :comment "All resolutions supported (up to 2400DPI). WiFi not working."
 
-:model "PIXMA TS5000 Series"
+:model "PIXMA TS8000 Series"
 :interface "USB WiFi"
-:usbid "0x04a9" "0x1802"
+:usbid "0x04a9" "0x1800"
 :status :good
-:comment "All resolutions supported (up to 1200DPI). WiFi not working."
+:comment "All resolutions supported (up to 2400DPI). WiFi not working."
+
+:model "PIXMA TS9000 Series"
+:interface "USB Ethernet 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 "imageCLASS D420"
 :interface "USB"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 158c36407..e2810b9e3 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "29 Sep 2018" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "08 Oct 2018" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -99,7 +99,7 @@ PIXMA MX320, MX390, MX430, MX450, MX490, MX710
 .br
 PIXMA G2000, G3000, G4000
 .br
-PIXMA TS6000, TS9000
+PIXMA TR7500, TR8500, TS3100, TS5100, TS6000, TS9000, TS9100
 .br
 PIXUS MP5
 .br