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 'perillamint/backends-add-canon-pixma-g2010-support' 

pixma: Add support for Canon PIXMA G2010 Series

see merge request sane-project/backends!223
merge-requests/213/head
Rolf Bensch 2019-12-28 13:34:47 +01:00
rodzic bac0c4abce a297073bc9
commit b1ad53fff5
3 zmienionych plików z 9 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/pixma_mp150.c
Wyświetl plik

@ -259,6 +259,7 @@
/* 2019 new devices (untested) */
#define TS8100_PID 0x1821
#define G2010_PID 0x183a
#define G3010_PID 0x183b
#define G4010_PID 0x183d
#define TS9180_PID 0x183e
@ -1760,6 +1761,7 @@ const pixma_config_t pixma_mp150_devices[] = {
/* Latest devices (2019) Generation 5 CIS */
DEVICE ("Canon PIXMA TS8100 Series", "TS8100", TS8100_PID, 0, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA G2010 Series", "G2010", G2010_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA G3010 Series", "G3010", G3010_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA G4010 Series", "G4010", G4010_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA TS9180 Series", "TS9180", TS9180_PID, 0, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),

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

@ -100,6 +100,12 @@
:status :complete
:comment "All resolutions supported (up to 600DPI)."
:model "PIXMA G2010 Series"
:interface "USB"
:usbid "0x04a9" "0x183a"
:status :complete
:comment "All resolutions supported (up to 600DPI)."
:model "PIXMA G2100"
:interface "USB"
:usbid "0x04a9" "0x1795"

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

@ -17,7 +17,7 @@ Currently, the following models work with this backend:
.RS
PIXMA E510
.br
PIXMA G2000, G2100
PIXMA G2000, G2010, G2100
.br
PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3000, MG3100
.br