Fix for MP800R network scan and documentation update for MF5770.

- backend/pixma_mp150.c:
  Thanks to Vladimir Andreev patch, fix network scan for MP800R.
- doc/descriptions/pixma.desc and doc/sane-pixma.man:
  . Documentation updates for latest MF5770 changes.
  . Note: MF5770 grayscale mode appears to require some more work.
merge-requests/1/head
Nicolas Martin 2009-06-14 18:37:11 +02:00
rodzic 93be2efc99
commit aa7a54199d
3 zmienionych plików z 8 dodań i 6 usunięć

Wyświetl plik

@ -841,7 +841,9 @@ wait_until_ready (pixma_t * s)
WAIT_INTERRUPT (1000);
if (mp->generation == 3)
RET_IF_ERR (query_status_3 (s));
else if (s->cfg->pid == MP600_PID || s->cfg->pid == MP600R_PID)
else if (s->cfg->pid == MP600_PID ||
s->cfg->pid == MP600R_PID ||
s->cfg->pid == MP800R_PID)
RET_IF_ERR (query_status (s));
if (--tmo == 0)
{

Wyświetl plik

@ -324,8 +324,8 @@
:model "imageCLASS MF5770"
:interface "USB"
:usbid "0x04a9" "0x265f"
:status :untested
:comment "Testers needed!"
:status :good
:comment "All resolutions supported (up to 600DPI) in color. Grayscale not working yet in preview (75 dpi capable ?)."
:model "imageCLASS MF3110"
:interface "USB"

Wyświetl plik

@ -1,4 +1,4 @@
.TH "sane\-pixma" "5" "28 Feb 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.TH "sane\-pixma" "5" "10 Jun 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-pixma
.SH NAME
sane\-pixma \- SANE backend for Canon PIXMA MP series
@ -30,7 +30,7 @@ MultiPASS MP700, MP730, PIXMA MP750 (no grayscale)
.br
ImageCLASS MF4010, MF4018, MF4120, MF4122, MF4140, MF4150
.br
ImageCLASS MF4270
ImageCLASS MF4270, MF5770
.RE
.PP
The following models are not well tested and/or the scanner sometimes hangs
@ -54,7 +54,7 @@ PIXMA MP260
.br
ImageCLASS MF3110, MF3240
.br
ImageCLASS MF5630, MF5650, MF5730, MF5750, MF5770, MF8170c
ImageCLASS MF5630, MF5650, MF5730, MF5750, MF8170c
.RE
.PP
\#The following models may use partly the same Pixma protocol as MPs listed