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

pixma: added I-SENSYS MF4320d and updated doc, for this model and MP390.

merge-requests/1/head
Nicolas Martin 2009-10-21 21:39:27 +02:00
rodzic d145e87f27
commit a18c3fd41a
4 zmienionych plików z 17 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,3 +1,7 @@
2009-10-21 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_imageclass.c, doc/sane-pixma.man:
pixma: added I-SENSYS MF4320d and updated doc, for this model and MP390.
2009-10-20 Louis Lagendijk <louis@lagendijk.xs4all.nl> 2009-10-20 Louis Lagendijk <louis@lagendijk.xs4all.nl>
* backend/pixma_io_sanei.c: * backend/pixma_io_sanei.c:
Allow for ranges in model returned from device (allow -) Allow for ranges in model returned from device (allow -)

10
backend/pixma_imageclass.c
Wyświetl plik

@ -72,8 +72,9 @@
#define MF4100_PID 0x26a3 #define MF4100_PID 0x26a3
#define MF4600_PID 0x26b0 #define MF4600_PID 0x26b0
#define MF4010_PID 0x26b4 #define MF4010_PID 0x26b4
#define D480_PID 0x26ed
#define MF4360_PID 0x26ec #define MF4360_PID 0x26ec
#define D480_PID 0x26ed
#define MF4320_PID 0x26ee
/* the following are all untested */ /* the following are all untested */
#define MF5630_PID 0x264e #define MF5630_PID 0x264e
#define MF5650_PID 0x264f #define MF5650_PID 0x264f
@ -691,13 +692,14 @@ const pixma_config_t pixma_iclass_devices[] = {
DEV ("Canon imageCLASS MF4150", "MF4100", MF4100_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS MF4150", "MF4100", MF4100_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF4690", "MF4690", MF4600_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS MF4690", "MF4690", MF4600_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS D480", "D480", D480_PID, 600, 640, 877, PIXMA_CAP_ADFDUP), DEV ("Canon imageCLASS D480", "D480", D480_PID, 600, 640, 877, PIXMA_CAP_ADFDUP),
DEV ("Canon imageCLASS MF4360", "MF4360", MF4360_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS MF4360", "MF4360", MF4360_PID, 600, 640, 877, PIXMA_CAP_ADFDUP),
/* FIXME: the following capabilities all need updating/verifying */ DEV ("Canon imageCLASS MF4320", "MF4320", MF4320_PID, 600, 640, 877, 0),
DEV ("Canon imageCLASS MF4010", "MF4010", MF4010_PID, 600, 640, 877, 0),
/* FIXME: the following capabilities all need updating/verifying */
DEV ("Canon imageCLASS MF5630", "MF5630", MF5630_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS MF5630", "MF5630", MF5630_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon laserBase MF5650", "MF5650", MF5650_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon laserBase MF5650", "MF5650", MF5650_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF8170c", "MF8170c", MF8100_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageCLASS MF8170c", "MF8170c", MF8100_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF3240", "MF3240", MF3200_PID, 600, 640, 877, 0), DEV ("Canon imageCLASS MF3240", "MF3240", MF3200_PID, 600, 640, 877, 0),
DEV ("Canon imageClass MF6500", "MF6500", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon imageClass MF6500", "MF6500", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF4010", "MF4010", MF4010_PID, 600, 640, 877, 0),
DEV (NULL, NULL, 0, 0, 0, 0, 0) DEV (NULL, NULL, 0, 0, 0, 0, 0)
}; };

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

@ -169,7 +169,7 @@
:interface "USB Ethernet" :interface "USB Ethernet"
:usbid "0x04a9" "0x1726" :usbid "0x04a9" "0x1726"
:status :good :status :good
:comment "All resolutions supported (up to 4800DPI). Full TPU support (negativa and slides) at 24 or 48 bits." :comment "All resolutions supported (up to 4800DPI). Full TPU support (negative and slides) at 24 or 48 bits."
:model "SmartBase MP360" :model "SmartBase MP360"
:interface "USB" :interface "USB"
@ -186,8 +186,8 @@
:model "SmartBase MP390" :model "SmartBase MP390"
:interface "USB" :interface "USB"
:usbid "0x04a9" "0x263e" :usbid "0x04a9" "0x263e"
:status :minimal :status :good
:comment "The scanner locks up sometimes." :comment "All resolutions supported (up to 1200DPI)."
:model "MultiPASS MP700" :model "MultiPASS MP700"
:interface "USB" :interface "USB"

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

@ -33,13 +33,15 @@ ImageCLASS MF3110, MF4010, MF4018, MF4120, MF4122, MF4140
ImageCLASS MF4150, MF4270, MF4380dn, MF4660, MF4690, MF5770 ImageCLASS MF4150, MF4270, MF4380dn, MF4660, MF4690, MF5770
.br .br
ImageCLASS D480 ImageCLASS D480
.br
SmartBASE MP390
.RE .RE
.PP .PP
The following models are not well tested and/or the scanner sometimes hangs The following models are not well tested and/or the scanner sometimes hangs
and must be switched off and on. and must be switched off and on.
.PP .PP
.RS .RS
SmartBase MP360, MP370, MP390 SmartBase MP360, MP370
.br .br
MultiPASS PIXMA MP760, PIXMA MP780 MultiPASS PIXMA MP760, PIXMA MP780
.RE .RE
@ -156,7 +158,7 @@ the verbosity.
.TP .TP
.B PIXMA_EXPERIMENT .B PIXMA_EXPERIMENT
Setting to a non-zero value will enable the support for experimental models. Setting to a non-zero value will enable the support for experimental models.
You should also set SANE_DEBUG_PIXMA to 10. You should also set SANE_DEBUG_PIXMA to 11.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR sane (7), .BR sane (7),
.BR sane\-dll (5), .BR sane\-dll (5),