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

pixma: fix definitions for PIXMA G4000

merge-requests/1/head
Rolf Bensch 2017-09-01 12:07:57 +02:00
rodzic d78013afc6
commit 61ca162fc0
3 zmienionych plików z 10 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
backend/pixma_mp150.c
Wyświetl plik

@ -241,7 +241,9 @@
#define TS5000_PID 0x1802 #define TS5000_PID 0x1802
#define MG3000_PID 0x180b #define MG3000_PID 0x180b
#define E470_PID 0x180c #define E470_PID 0x180c
#define G3000_PID 0x181d
/* 2017 new devices (untested) */
#define G4000_PID 0x181d
/* Generation 4 XML messages that encapsulates the Pixma protocol messages */ /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
#define XML_START_1 \ #define XML_START_1 \
@ -1861,7 +1863,9 @@ const pixma_config_t pixma_mp150_devices[] = {
DEVICE ("Canon PIXMA TS5000 Series", "TS5000", TS5000_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA TS5000 Series", "TS5000", TS5000_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MG3000 Series", "MG3000", MG3000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA MG3000 Series", "MG3000", MG3000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA E470 Series", "E470", E470_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA E470 Series", "E470", E470_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA G4000 Series", "G3000", G3000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
/* Latest devices (2017) Generation 5 CIS */
DEVICE ("Canon PIXMA G4000", "G4000", G4000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
END_OF_DEVICE_LIST END_OF_DEVICE_LIST
}; };

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

@ -76,8 +76,8 @@
:status :untested :status :untested
:comment "Testers needed!" :comment "Testers needed!"
:model "PIXMA G3000" :model "PIXMA G4000"
:interface "USB WIFI" :interface "USB WiFi"
:usbid "0x04a9" "0x181d" :usbid "0x04a9" "0x181d"
:status :untested :status :untested
:comment "Testers needed!" :comment "Testers needed!"

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

@ -1,4 +1,4 @@
.TH "sane\-pixma" "5" "10 Jul 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .TH "sane\-pixma" "5" "01 Sep 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-pixma .IX sane\-pixma
.SH NAME .SH NAME
sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@ -93,7 +93,7 @@ PIXMA MP375R, MP493, MP495, MP740
.br .br
PIXMA MX320, MX390, MX430, MX450, MX490, MX710 PIXMA MX320, MX390, MX430, MX450, MX490, MX710
.br .br
PIXMA G3000 PIXMA G4000
.br .br
PIXMA TS6000, TS9000 PIXMA TS6000, TS9000
.br .br