From 766162cad6979e25de829bd82df8ea456dd86743 Mon Sep 17 00:00:00 2001 From: Ordissimo Date: Mon, 25 Sep 2023 23:13:59 +0200 Subject: [PATCH 1/2] pixma: add 2023 models --- backend/pixma/pixma_mp150.c | 16 ++++++++++++++ doc/descriptions/pixma.desc | 42 +++++++++++++++++++++++++++++++++++++ doc/sane-pixma.man | 6 ++++-- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/backend/pixma/pixma_mp150.c b/backend/pixma/pixma_mp150.c index dacfad901..93d5efd65 100644 --- a/backend/pixma/pixma_mp150.c +++ b/backend/pixma/pixma_mp150.c @@ -341,6 +341,15 @@ #define GX3000_PID 0x18F1 #define GX4000_PID 0x18F2 +/* 2023 new device (untested) */ +#define G3070_PID 0x18F4 +#define G2070_PID 0x18F5 +#define G4070_PID 0x18F3 +#define G3030_PID 0x1105 +#define G2030_PID 0x1106 +#define TC20M_PID 0x18FC +#define TC5200M_PID 0x18FF + /* Generation 4 XML messages that encapsulates the Pixma protocol messages */ #define XML_START_1 \ "\ @@ -1974,6 +1983,13 @@ const pixma_config_t pixma_mp150_devices[] = { DEVICE ("Canon PIXUS XK110 Series", "XK110", XK110_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA GX3000 Series", "GX3000", GX3000_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), DEVICE ("Canon PIXMA GX4000 Series", "GX4000", GX4000_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), + DEVICE ("Canon PIXMA G3070", "G3070", G3070_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA G2070", "G2070", G2070_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA G4070", "G4070", G4070_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA G3030", "G3030", G3030_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA G2030", "G2030", G2030_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA TC-20M", "TC-20M", TC2OM_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA TC-5200M", "TC-5200M", TC5200M_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), END_OF_DEVICE_LIST }; diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index b6e6a6657..84d8b8f52 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -136,12 +136,24 @@ :status :untested :comment "Testers needed!" +:model "G2030 series" +:interface "USB" +:usbid "0x04a9" "0x1106" +:status :untested +:comment "Testers needed!" + :model "PIXMA G2060" :interface "USB" :usbid "0x04a9" "0x18c1" :status :untested :comment "Testers needed!" +:model "G2070 series" +:interface "USB" +:usbid "0x04a9" "0x18f5" +:status :untested +:comment "Testers needed!" + :model "PIXMA G2100" :interface "USB" :usbid "0x04a9" "0x1795" @@ -166,12 +178,24 @@ :status :untested :comment "Testers needed!" +:model "G3030 series" +:interface "USB" +:usbid "0x04a9" "0x1105" +:status :untested +:comment "Testers needed!" + :model "PIXMA G3060" :interface "USB" :usbid "0x04a9" "0x18c3" :status :untested :comment "Testers needed!" +:model "G3070 series" +:interface "USB" +:usbid "0x04a9" "0x18f4" +:status :untested +:comment "Testers needed!" + :model "PIXMA G4000 Series" :interface "USB WiFi" :usbid "0x04a9" "0x181d" @@ -184,6 +208,12 @@ :status :untested :comment "Testers needed!" +:model "G4070 series" +:interface "USB" +:usbid "0x04a9" "0x18f3" +:status :untested +:comment "Testers needed!" + :model "PIXMA G4511" :interface "USB WiFi" :usbid "0x04a9" "0x183d" @@ -947,6 +977,18 @@ :status :complete :comment "Flatbed and ADF scan. All resolutions supported (up to 4800DPI)" +:model "TC-20M" +:interface "USB" +:usbid "0x04a9" "0x18fc" +:status :untested +:comment "Testers needed!" + +:model "TC-5200M" +:interface "USB" +:usbid "0x04a9" "0x18ff" +:status :untested +:comment "Testers needed!" + :model "PIXMA TR4500 Series" :interface "USB WiFi" :usbid "0x04a9" "0x1854" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index d2b64bed2..540e4f9d1 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -19,7 +19,7 @@ Currently, the following models work with this backend: .RS PIXMA E410, E510, E4500 .br -PIXMA G600, G2000, G2010, G2100, G4000, G4511 +PIXMA G600, G2000, G2010, G2030, G2070, G2100, G3030, G3070, G4000, G4070, G4511 .br PIXMA GX3000, GX4000, GX6000, GX7000 .br @@ -55,13 +55,15 @@ PIXMA MX410, MX420, MX470, MX510, MX520, MX530, MX700, MX720 .br PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600 .br +PIXMA TC-20M, TC-5200M +.br PIXMA TR4500, TR4600, TR4700 .br PIXMA TS2400, TS2600, TS3100, TS3300, TS3450, TS3451, TS3452 .br PIXMA TS3500, TS5000, TS5100, TS5350i, TS5400, TS6100, TS6200 .br -PIXMA TS7530, TS7450i ,TS8000, TS8200, TS8530, TS8630 +PIXMA TS7530, TS7450i ,TS8000, TS8200, TS8530, TS8630, TS8630 .br PIXUS MP10 .br From b1f6bea3948c25e344b477eccec971d5def5c6a6 Mon Sep 17 00:00:00 2001 From: Ordissimo Date: Mon, 25 Sep 2023 23:18:15 +0200 Subject: [PATCH 2/2] pixma: add 2023 models --- backend/pixma/pixma_mp150.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/pixma/pixma_mp150.c b/backend/pixma/pixma_mp150.c index 93d5efd65..0a76e5545 100644 --- a/backend/pixma/pixma_mp150.c +++ b/backend/pixma/pixma_mp150.c @@ -1988,7 +1988,7 @@ const pixma_config_t pixma_mp150_devices[] = { DEVICE ("Canon PIXMA G4070", "G4070", G4070_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA G3030", "G3030", G3030_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA G2030", "G2030", G2030_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), - DEVICE ("Canon PIXMA TC-20M", "TC-20M", TC2OM_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA TC-20M", "TC-20M", TC20M_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA TC-5200M", "TC-5200M", TC5200M_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), END_OF_DEVICE_LIST