pixma: declared Pixma MP550 (yet untested), updated docs.

modified:   ChangeLog
	modified:   backend/pixma_mp150.c
	modified:   doc/descriptions/pixma.desc
	modified:   doc/sane-pixma.man
merge-requests/1/head
Nicolas Martin 2009-10-28 23:49:13 +01:00
rodzic f2c663ffb1
commit db1a049706
4 zmienionych plików z 13 dodań i 5 usunięć

Wyświetl plik

@ -1,9 +1,9 @@
2009-10-22 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, doc/descriptions/pixma.desc:
pixma: fix MP830 ADF shifted lines, add support for I-SENSYS MF4320d to descriptions.
2009-10-28 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
pixma: declared Pixma MP550 (yet untested), updated docs.
2009-10-22 Louis Lagendijk <llagendijk at users.alioth.debian.org>
* doc/sane-pixma.man
* doc/sane-pixma.man:
Added networking details to doc/sane-pixma.man
2009-10-21 Nicolas Martin <nicols-guest at users.alioth.debian.org>

Wyświetl plik

@ -149,6 +149,7 @@
#define MP250_PID 0x173a /* untested */
#define MP270_PID 0x173b
#define MP490_PID 0x173c /* untested */
#define MP550_PID 0x173d /* untested */
#define MP560_PID 0x173e /* untested */
#define MP640_PID 0x173f
#define MP990_PID 0x1740 /* untested */
@ -1547,6 +1548,7 @@ const pixma_config_t pixma_mp150_devices[] = {
/* 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),
DEVICE ("Canon PIXMA MP550", "MP550", MP550_PID, 2400, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MP490", "MP490", MP490_PID, 1200, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MP250", "MP250", MP250_PID, 600, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MP270", "MP270", MP270_PID, 1200, 638, 877, PIXMA_CAP_CIS),

Wyświetl plik

@ -297,6 +297,12 @@
:status :untested
:comment "Same protocol as Pixma Generation 3? Testers needed!"
:model "PIXMA MP550"
:interface "USB"
:usbid "0x04a9" "0x173d"
:status :untested
:comment "Same protocol as Pixma Generation 3? Testers needed!"
:model "PIXMA MP540"
:interface "USB"
:usbid "0x04a9" "0x1730"

Wyświetl plik

@ -54,7 +54,7 @@ Feedback in the Sane-dev mailing list welcome.
.RS
PIXMA MP740
.br
PIXMA MX320, MX330, MP250, MP490, MP560, MP990
PIXMA MX320, MX330, MP250, MP490, MP550, MP560, MP990
.br
ImageCLASS MF3240, MF5630, MF5650, MF5730, MF5750, MF8170c
.RE