From 7ec4074fbd7500f295777615a7cf8c33bf3a96a8 Mon Sep 17 00:00:00 2001
From: thierry1970 <thierry@ordissimo.com>
Date: Tue, 16 Aug 2022 11:20:02 +0200
Subject: [PATCH] pixma: add 2 models

---
 backend/pixma/pixma_mp150.c |  7 +++++++
 doc/descriptions/pixma.desc | 12 ++++++++++++
 doc/sane-pixma.man          |  6 +++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/backend/pixma/pixma_mp150.c b/backend/pixma/pixma_mp150.c
index 1a91bf38a..2305e9d90 100644
--- a/backend/pixma/pixma_mp150.c
+++ b/backend/pixma/pixma_mp150.c
@@ -332,6 +332,11 @@
 #define GX7000_PID 0x18A8
 #define TS5400_PID 0x18D8
 
+/* 2022 new device (untested) */
+#define TS2400_PID 0x1108
+#define TS2600_PID 0x1107
+
+
 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
 #define XML_START_1   \
 "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\
@@ -1958,6 +1963,8 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA GX6000 Series", "GX6000", GX6000_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA GX7000 Series", "GX7000", GX7000_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA TS5400 Series", "TS5400", TS5400_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS2400 Series", "TS2400", TS2400_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS2600 Series", "TS2600", TS2600_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
 
   END_OF_DEVICE_LIST
 };
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 0a1337461..4045c2fb2 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -1013,6 +1013,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS2400 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1108"
+:status :good
+:comment "All resolutions supported (up to 600DPI). WiFi not working."
+
+:model "PIXMA TS2600 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1107"
+:status :good
+:comment "All resolutions supported (up to 600DPI). WiFi not working."
+
 :model "PIXMA TS3100 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1827"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 805761519..fb4fafb06 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -57,11 +57,11 @@ PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600
 .br
 PIXMA TR4500, TR4600, TR4700
 .br
-PIXMA TS3100, TS3300, TS3450, TS3451, TS3452, TS3500, TS5000
+PIXMA TS2400, TS2600, TS3100, TS3300, TS3450, TS3451, TS3452
 .br
-PIXMA TS5100, TS5350i, TS5400, TS6100, TS6200, TS7530, TS7450i
+PIXMA TS3500, TS5000, TS5100, TS5350i, TS5400, TS6100, TS6200
 .br
-PIXMA TS8000, TS8530, TS8200
+PIXMA TS7530, TS7450i ,TS8000, TS8530, TS8200
 .br
 PIXUS MP10
 .br