mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'pixma-add-model' into 'master' 

pixma:  add 2023 model

See merge request sane-project/backends!795
707-xerox_mfp-scx-4521-fixes-are-not-merged
Ralph Little 2023-09-26 15:32:00 +00:00
rodzic 3094f4a0dc b1f6bea394
commit 2fb8eb90cf
3 zmienionych plików z 62 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
backend/pixma/pixma_mp150.c
Wyświetl plik

@ -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 \
"<?xml version=\"1.0\" encoding=\"utf-8\" ?>\
@ -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", 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
};

42
doc/descriptions/pixma.desc
Wyświetl plik

@ -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"

6
doc/sane-pixma.man
Wyświetl plik

@ -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