Merge branch 'canon-add-new-model-2024' into 'master'

PIXMA: Addition of 3 new models and updating of 2 models

See merge request sane-project/backends!841

backend/pixma/pixma_mp150.c

@@ -363,6 +363,12 @@
 #define TS7700A_PID 0x1111
 #define GX6500_PID 0x1148
 
+/* 2024 new device (untested) */
+#define TS3600_PID 0x1156
+#define TS3700_PID 0x1158
+#define E3600_PID 0x1157
+
+
 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
 #define XML_START_1   \
 "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\
@@ -2017,5 +2023,9 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA TS7700A series", "TS7700A", TS7700A_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA GX6500 series", "GX6500", GX6500_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
 
+  DEVICE ("Canon PIXMA TS3600 Series", "TS3600", TS2400_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS3700 Series", "TS3700", TS2600_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA E3400 Series", "E3400", E3400_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+
   END_OF_DEVICE_LIST
 };

doc/descriptions/pixma.desc

@@ -100,6 +100,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA E3600 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1157"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA E4200 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1855"
@@ -1139,6 +1145,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS3600 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1156"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS3700 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1158"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS5000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1802"
@@ -1146,7 +1164,13 @@
 :comment "All resolutions supported (up to 1200DPI). WiFi not working."
 
 :model "PIXMA TS5100 Series"
-:interface "USB WiFi"
+:interface "USB"
+:usbid "0x04a9" "0x1825"
+:status :good
+:comment "All resolutions supported (up to 1200DPI). WiFi not working."
+
+:model "PIXMA TS5150 Series"
+:interface "USB"
 :usbid "0x04a9" "0x1825"
 :status :good
 :comment "All resolutions supported (up to 1200DPI). WiFi not working."

doc/sane-pixma.man

@@ -17,7 +17,7 @@ Currently, the following models work with this backend:
 
 .PP
 .RS
-PIXMA E410, E510, E4500
+PIXMA E410, E510, E3600, E4500
 .br
 PIXMA G600, G2000, G2010, G2030, G2070, G2100, G3030, G3070, G4000, G4070, G4511
 .br
@@ -61,9 +61,13 @@ PIXMA TR4500, TR4600, TR4700
 .br
 PIXMA TS2400, TS2600, TS3100, TS3300, TS3450, TS3451, TS3452
 .br
-PIXMA TS3500, TS5000, TS5100, TS5350i, TS5400, TS6100, TS6200
+PIXMA TS3500, TS3600, TS3700, TS5000, TS5100, TS5150, TS5350i
 .br
-PIXMA TS7530, TS7450i ,TS8000, TS8200, TS8530, TS8630, TS8630
+PIXMA TS5400, TS6100, TS6200, TS7530, TS7450i ,TS8000, TS8200
+.br
+PIXMA TS8530, TS8630
+.br
+PIXMA TS8630
 .br
 PIXUS MP10
 .br