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/new_scanners' into 'master' 

Pixma: new scanners

See merge request sane-project/backends!354
fix-build-obselete-jpeg
Rolf Bensch 2020-03-11 12:14:42 +00:00
rodzic 7322b5aff0 c4af131848
commit dbc966e97e
4 zmienionych plików z 26 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/pixma/pixma_imageclass.c
Wyświetl plik

@ -105,6 +105,7 @@
#define MF220_PID 0x27a8
#define MF210_PID 0x27a9
#define MF620_PID 0x27b4
#define MF720_PID 0x27b5
#define MF410_PID 0x27c0
#define MF510_PID 0x27c2
#define MF230_PID 0x27d1
@ -962,6 +963,7 @@ const pixma_config_t pixma_iclass_devices[] = {
DEV ("Canon i-SENSYS MF220 Series", "MF220", MF220_PID, 600, 0, 637, 1050, PIXMA_CAP_ADFDUP), /* max. w = 216mm */
DEV ("Canon i-SENSYS MF210 Series", "MF210", MF210_PID, 600, 0, 637, 1050, PIXMA_CAP_ADF), /* max. w = 216mm */
DEV ("Canon i-SENSYS MF620 Series", "MF620", MF620_PID, 600, 0, 637, 1050, PIXMA_CAP_ADF),
DEV ("Canon i-SENSYS MF720 Series", "MF720", MF720_PID, 600, 300, 637, 877, PIXMA_CAP_ADFDUP),
DEV ("Canon i-SENSYS MF410 Series", "MF410", MF410_PID, 600, 0, 637, 1050, PIXMA_CAP_ADFDUP), /* max. w = 216mm */
DEV ("Canon i-SENSYS MF510 Series", "MF510", MF510_PID, 600, 0, 640, 1050, PIXMA_CAP_ADFDUP),
DEV ("Canon i-SENSYS MF230 Series", "MF230", MF230_PID, 600, 0, 637, 1050, PIXMA_CAP_ADF), /* max. w = 216mm */

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

@ -282,8 +282,10 @@
#define TS8230_PID 0x185b
#define TS9580_PID 0x185d
#define TR9530_PID 0x185e
#define G7000_PID 0x1863
#define G6000_PID 0x1865
#define G6080_PID 0x1866
#define GM4000_PID 0x1869
#define XK80_PID 0x1873
#define TS5300_PID 0x188b
#define TS5380_PID 0x188c
@ -1798,8 +1800,10 @@ const pixma_config_t pixma_mp150_devices[] = {
DEVICE ("Canon PIXMA TS8230 Series", "TS8230", TS8230_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA TS9580 Series", "TS9580", TS9580_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA TR9530 Series", "TR9530", TR9530_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA G7000 Series", "G7000", G7000_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), /* ToDo: ADF has legal paper length */
DEVICE ("Canon PIXMA G6000 Series", "G6000", G6000_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA G6080 Series", "G6080", G6080_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA GM4000 Series", "GM4000", GM4000_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), /* ToDo: ADF has legal paper length */
DEVICE ("Canon PIXUS XK80 Series", "XK80", XK80_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA TS5300 Series", "TS5300", TS5300_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA TS5380 Series", "TS5380", TS5380_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),

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

@ -154,6 +154,18 @@
:status :untested
:comment "Testers needed!"
:model "PIXMA G7000 Series"
:interface "USB Ethernet WiFi"
:usbid "0x04a9" "0x1863"
:status :untested
:comment "Testers needed!"
:model "PIXMA GM4000 Series"
:interface "USB Ethernet WiFi"
:usbid "0x04a9" "0x1869"
:status :untested
:comment "Testers needed!"
:model "PIXMA MG2100 Series"
:interface "USB"
:usbid "0x04a9" "0x1751"
@ -1247,6 +1259,12 @@
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
:model "i-SENSYS MF720 Series"
:interface "USB Ethernet WiFi"
:usbid "0x04a9" "0x27b5"
:status :untested
:comment "Testers needed!"
:model "i-SENSYS MF730 Series"
:interface "USB Ethernet WiFi"
:usbid "0x04a9" "0x27e4"

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

@ -109,7 +109,7 @@ PIXMA MP375R, MP493, MP495, MP740
.br
PIXMA MX320, MX390, MX430, MX450, MX490, MX710
.br
PIXMA G3000, G3010, G4000, G4010, G6000, G6080
PIXMA G3000, G3010, G4000, G4010, G6000, G6080, G7000, GM4000
.br
PIXMA TR4500, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530
.br
@ -123,7 +123,7 @@ PIXMA TS9500, TS9580
.br
PIXUS MP5, XK50, XK60, XK70, XK80
.br
imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8170c
imageCLASS MF720, MF810/820, MF5630, MF5650, MF5750, MF8170c
.br
imageCLASS MPC190, D550
.br