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-adding-models' into 'master' 

pixma: add 2 models

See merge request sane-project/backends!745
sanei_thread_fixup
Povilas Kanapickas 2022-08-16 17:28:50 +00:00
rodzic ba463b8966 7ec4074fbd
commit f1413cbc16
3 zmienionych plików z 22 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

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

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

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

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

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