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 'master' of ssh://kitno-guest@git.debian.org/git/sane/sane-backends

merge-requests/1/head
m. allan noah 2010-07-02 10:00:03 -04:00
rodzic 19c52ae761 75878ea6d6
commit 6bee8a6930
3 zmienionych plików z 14 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
backend/pixma_mp150.c
Wyświetl plik

@ -148,6 +148,9 @@
#define MX320_PID 0x1736 /* untested */
#define MX330_PID 0x1737
/* PIXMA 2010 vintage */
#define MX340_PID 0x1741
/* Generation 4 */
#define MP250_PID 0x173a
#define MP270_PID 0x173b
@ -1214,6 +1217,7 @@ mp150_check_param (pixma_t * s, pixma_scan_param_t * sp)
s->cfg->pid == MX860_PID ||
s->cfg->pid == MX320_PID ||
s->cfg->pid == MX330_PID ||
s->cfg->pid == MX340_PID ||
s->cfg->pid == MX7600_PID )
&&
sp->source == PIXMA_SOURCE_FLATBED)
@ -1605,6 +1609,9 @@ const pixma_config_t pixma_mp150_devices[] = {
* Not sure if anything's going wrong here, leaving as is
DEVICE ("Canon PIXMA MX860", "MX860", MX860_PID, 2400, 638, 880, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),*/
/* PIXMA 2010 vintage */
DEVICE ("Canon PIXMA MX340", "MX340", MX340_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
/* Generation 4: CIS */
DEVICE ("Canon PIXMA MP640", "MP640", MP640_PID, 4800, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MP560", "MP560", MP560_PID, 2400, 638, 877, PIXMA_CAP_CIS),

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

@ -237,6 +237,12 @@
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)"
:model "PIXMA MX340"
:interface "USB"
:usbid "0x04a9" "0x1741"
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)"
:model "PIXMA MX700"
:interface "USB Ethernet"
:usbid "0x04a9" "0x1729"

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

@ -27,7 +27,7 @@ PIXMA MP600, MP600R, MP610, MP620, MP630, MP640, MP710
.br
PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980, MP990
.br
PIXMA MX300, MX310, MX330, MX700, MX850, MX860, MX7600
PIXMA MX300, MX310, MX330, MX340, MX700, MX850, MX860, MX7600
.br
MultiPASS MP700, MP730, PIXMA MP750 (no grayscale)
.br