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

pixma: add 2021 models. 

Fix white space

Fix build

Add descriptions

Reduces the length of the line
merge-requests/671/head
Ordissimo 2021-12-26 15:49:21 +01:00 zatwierdzone przez Povilas Kanapickas
rodzic 8d028fe398
commit 584f16e2ee
3 zmienionych plików z 131 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -316,6 +316,22 @@
#define TS6400_PID 0x18D3
#define TS7400_PID 0x18D7
/* 2021 new device (untested) */
#define TS5350i_PID 0x18D9
#define G600_PID 0x18D5
#define TS3500_PID 0x18D4
#define TR4600_PID 0x18DA
#define E4500_PID 0x18DB
#define TR4700_PID 0x18DC
#define XK500_PID 0x18DF
#define TS8530_PID 0x18E0
#define XK100_PID 0x18E2
#define TS7530_PID 0x18E1
#define TS7450i_PID 0x18F7
#define GX6000_PID 0x18A6
#define GX7000_PID 0x18A8
#define TS5400_PID 0x18D8
/* Generation 4 XML messages that encapsulates the Pixma protocol messages */
#define XML_START_1 \
"<?xml version=\"1.0\" encoding=\"utf-8\" ?>\
@ -1926,6 +1942,22 @@ const pixma_config_t pixma_mp150_devices[] = {
DEVICE ("Canon PIXMA TS7400 Series", "TS7400", TS7400_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA G7080 Series", "G7080", G7080_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA GM4080", "GM4080", GM4080_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA TS5350i Series", "TS5350i", TS5350i_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA G600", "G600", G600_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA TS3500 Series", "TS3500", TS3500_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
/* ToDo: max. scan resolution = 600x1200dpi */
DEVICE ("Canon PIXMA TR4600 Series", "TR4600", TR4600_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF | PIXMA_CAP_ADF_JPEG),
/* ToDo: max. scan resolution = 600x1200dpi */
DEVICE ("Canon PIXMA TR4700 Series", "TR4700", TR4700_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF | PIXMA_CAP_ADF_JPEG),
DEVICE ("Canon PIXMA E4500 Series", "E4500", E4500_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXUS XK500 Series", "XK500", XK500_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA TS8530 Series", "TS8530", TS8530_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXUS XK100 Series", "XK100", XK100_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA TS7530 Series", "TS7530", TS7530_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA TS7450i Series", "TS7450i", TS7450i_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
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),
END_OF_DEVICE_LIST
};

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

@ -106,6 +106,18 @@
:status :untested
:comment "Testers needed!"
:model "PIXMA E4500 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x18DB"
:status :untested
:comment "Testers needed!"
:model "PIXMA G600"
:interface "USB"
:usbid "0x04a9" "0x18D5"
:status :complete
:comment "All resolutions supported (up to 600DPI)."
:model "PIXMA G2000"
:interface "USB"
:usbid "0x04a9" "0x1795"
@ -214,6 +226,18 @@
:status :untested
:comment "Testers needed!"
:model "PIXMA GX6000 Series"
:interface "USB Ethernet WiFi"
:usbid "0x04a9" "0x18A6"
:status :untested
:comment "Testers needed!"
:model "PIXMA GX7000"
:interface "USB"
:usbid "0x04a9" "0x18A8"
:status :untested
:comment "Testers needed!"
:model "PIXMA MG2100 Series"
:interface "USB"
:usbid "0x04a9" "0x1751"
@ -917,6 +941,17 @@
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
:model "PIXMA TR4600 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x18DA"
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
:model "PIXMA TR4700 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x18DC"
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
:model "PIXMA TR7000 Series"
:interface "USB"
@ -996,6 +1031,12 @@
:status :untested
:comment "Testers needed!"
:model "PIXMA TS3500 Series"
:interface "USB"
:usbid "0x04a9" "0x18D4"
:status :untested
:comment "Testers needed!"
:model "PIXMA TS5000 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x1802"
@ -1014,12 +1055,24 @@
:status :untested
:comment "Testers needed!"
:model "PIXMA TS5350i Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x18D9"
:status :untested
:comment "Testers needed!"
:model "PIXMA TS5380 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x188c"
:status :untested
:comment "Testers needed!"
:model "PIXMA TS5400 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x18D8"
:status :untested
:comment "Testers needed!"
:model "PIXMA TS6000 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x1801"
@ -1104,18 +1157,24 @@
:status :untested
:comment "Testers needed!"
:model "PIXMA TS7450i Series"
:interface "USB"
:usbid "0x04a9" "0x18F7"
:status :untested
:comment "Testers needed!"
:model "PIXMA TS7530 Series"
:interface "USB"
:usbid "0x04a9" "0x18E1"
:status :untested
:comment "Testers needed!"
:model "PIXMA TS8000 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x1800"
:status :good
:comment "All resolutions supported (up to 2400DPI). WiFi not supported by Pixma."
:model "PIXMA TS8430 Series"
:interface "USB"
:usbid "0x04a9" "0x18b5"
:status :untested
:comment "Testers needed!"
:model "PIXMA TS8100 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x1821"
@ -1170,6 +1229,18 @@
:status :untested
:comment "Testers needed!"
:model "PIXMA TS8430 Series"
:interface "USB"
:usbid "0x04a9" "0x18b5"
:status :untested
:comment "Testers needed!"
:model "PIXMA TS8530 Series"
:interface "USB"
:usbid "0x04a9" "0x18E0"
:status :untested
:comment "Testers needed!"
:model "PIXMA TS9000 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x179f"
@ -1236,6 +1307,18 @@
:status :untested
:comment "Testers needed!"
:model "PIXUS XK100 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x18E2"
:status :untested
:comment "Testers needed!"
:model "PIXUS XK500 Series"
:interface "USB WiFi"
:usbid "0x04a9" "0x18DF"
:status :untested
:comment "Testers needed!"
:model "imageCLASS D420"
:interface "USB"
:usbid "0x04a9" "0x26ef"

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

@ -13,11 +13,15 @@ The backend implements both the USB interface and network interface
over IPv4 as well as IPv6 (MFNP over IPv6 is untested).
.PP
Currently, the following models work with this backend:
.PP
.RS
PIXMA E410, E510
PIXMA E410, E510, E4500
.br
PIXMA G2000, G2010, G2100, G4000, G4511
PIXMA G600, G2000, G2010, G2100, G4000, G4511
.br
PIXMA GX6000, GX7000
.br
PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3000, MG3100
.br
@ -51,11 +55,11 @@ PIXMA MX410, MX420, MX470, MX510, MX520, MX530, MX700, MX720
.br
PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600
.br
PIXMA TR4500
PIXMA TR4500, TR4600, TR4700
.br
PIXMA TS3100, TS3300, TS5000, TS5100, TS6100, TS6200, TS8000
PIXMA TS3100, TS3300, TS3500, TS5000, TS5100, TS5350i, TS5400
.br
PIXMA TS8200
PIXMA TS6100, TS6200, TS7530, TS7450i, TS8000, TS8530, TS8200
.br
PIXUS MP10
.br
@ -129,7 +133,7 @@ PIXMA TS8130, TS8180, TS8230, TS8280, TS8300, TS8330, TS8380, TS9000
.br
PIXMA TS9100, TS9180, TS9500, TS9580
.br
PIXUS MP5, XK50, XK60, XK70, XK80, XK90
PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK500
.br
imageCLASS MF720, MF810/820, MF5630, MF5650, MF5750, MF8170c
.br