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-new-models-2024-2' into 'master' 

Pixma: add new models 2024 2

See merge request sane-project/backends!858
merge-requests/860/head
Ralph Little 2024-12-09 03:09:26 +00:00
rodzic c43485dd21 5ef1064bc7
commit 0750d0c088
3 zmienionych plików z 60 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -368,6 +368,12 @@
#define TS3700_PID 0x1158
#define E3600_PID 0x1157
#define G4090_PID 0x114A
#define G4080_PID 0x114B
#define G3090_PID 0x114C
#define G3080_PID 0x114D
#define TS8800_PID 0x1159
#define XK130_PID 0x115A
/* Generation 4 XML messages that encapsulates the Pixma protocol messages */
#define XML_START_1 \
@ -2023,9 +2029,17 @@ 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),
DEVICE ("Canon PIXMA TS3600 Series", "TS3600", TS3600_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA TS3700 Series", "TS3700", TS3700_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA E3600 Series", "E3600", E3600_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA G4090", "G4090", G4090_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA G4080", "G4080", G4080_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA G3090", "G3090", G3090_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA G3080", "G3080", G3080_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA TS8800 series", "TS8800", TS8800_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA XK130 series", "XK130", XK130_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
END_OF_DEVICE_LIST
};

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

@ -202,6 +202,18 @@
:status :untested
:comment "Testers needed!"
:model "G3080 series"
:interface "USB"
:usbid "0x04a9" "0x114d"
:status :untested
:comment "Testers needed!"
:model "G3090 series"
:interface "USB"
:usbid "0x04a9" "0x114c"
:status :untested
:comment "Testers needed!"
:model "PIXMA G4000 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x181d"
@ -220,6 +232,18 @@
:status :untested
:comment "Testers needed!"
:model "G4070 series"
:interface "USB"
:usbid "0x04a9" "0x18f3"
:status :untested
:comment "Testers needed!"
:model "G4090 series"
:interface "USB"
:usbid "0x04a9" "0x114b"
:status :untested
:comment "Testers needed!"
:model "PIXMA G4511"
:interface "USB WiFi"
:usbid "0x04a9" "0x183d"
@ -1415,6 +1439,12 @@
:status :untested
:comment "Testers needed!"
:model "PIXMA TS8800 series"
:interface "USB WiFi"
:usbid "0x04a9" "0x1159"
:status :untested
:comment "Testers needed!"
:model "PIXMA TS9000 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x179f"
@ -1499,6 +1529,12 @@
:status :untested
:comment "Testers needed!"
:model "PIXUS XK130 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x115a"
:status :untested
:comment "Testers needed!"
:model "PIXUS XK500 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x18df"

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

@ -19,7 +19,9 @@ Currently, the following models work with this backend:
.RS
PIXMA E410, E510, E3600, E4500
.br
PIXMA G600, G2000, G2010, G2030, G2070, G2100, G3030, G3070, G4000, G4070, G4511
PIXMA G600, G2000, G2010, G2030, G2070, G2100, G3030, G3070
.br
PIXMA G3080, G3090, G4000, G4070, G4080, G4511
.br
PIXMA GX1000, GX2000, GX3000, GX4000, GX6000, GX6500, GX7000
.br
@ -65,9 +67,7 @@ PIXMA TS3500, TS3600, TS3700, TS5000, TS5100, TS5150, TS5350i
.br
PIXMA TS5400, TS6100, TS6200, TS7530, TS7450i ,TS8000, TS8200
.br
PIXMA TS8530, TS8630
.br
PIXMA TS8630
PIXMA TS8530, TS8630, TS8800
.br
PIXUS MP10
.br
@ -143,7 +143,9 @@ PIXMA TS8180, TS8230, TS8280, TS8300, TS8330, TS8380, TS8700, TS9000
.br
PIXMA TS9100, TS9180, TS9500, TS9580
.br
PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK110, XK120, XK500
PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK110, XK120, XK130
.br
PIXUS XK500
.br
imageCLASS MF720, MF810/820, MF5630, MF5650, MF5750, MF8170c
.br