diff --git a/backend/pixma_imageclass.c b/backend/pixma_imageclass.c index 265ba43a3..dc6e39df3 100644 --- a/backend/pixma_imageclass.c +++ b/backend/pixma_imageclass.c @@ -83,6 +83,7 @@ #define MF4550_PID 0x2736 #define MF4410_PID 0x2737 #define MF3010_PID 0x2759 +#define MF4800_PID 0x2773 #define MF4700_PID 0x2774 /* the following are all untested */ #define MF5630_PID 0x264e @@ -93,7 +94,6 @@ #define MF8030_PID 0x2707 #define IR1133_PID 0x2742 #define MF4570_PID 0x275a -#define MF4800_PID 0x2773 enum iclass_state_t @@ -775,6 +775,7 @@ const pixma_config_t pixma_iclass_devices[] = { DEV ("Canon i-SENSYS MF4550d", "MF4550", MF4550_PID, 600, 640, 877, PIXMA_CAP_ADF), DEV ("Canon i-SENSYS MF3010", "MF3010", MF3010_PID, 600, 640, 877, 0), DEV ("Canon i-SENSYS MF4700 Series", "MF4700", MF4700_PID, 600, 640, 1050, PIXMA_CAP_ADF), + DEV ("Canon i-SENSYS MF4800 Series", "MF4800", MF4800_PID, 600, 640, 1050, 0), /* FIXME: the following capabilities all need updating/verifying */ 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), @@ -784,6 +785,5 @@ const pixma_config_t pixma_iclass_devices[] = { DEV ("Canon i-SENSYS MF6680dn", "MF6680", MF6680_PID, 600, 640, 877, PIXMA_CAP_ADFDUP), DEV ("Canon imageCLASS MF4570dw", "MF4570dw", MF4570_PID, 600, 640, 877, 0), DEV ("Canon imageRUNNER 1133", "iR1133", IR1133_PID, 600, 637, 877, PIXMA_CAP_ADFDUP), - DEV ("Canon i-SENSYS MF4800 Series", "MF4800", MF4800_PID, 600, 640, 1050, 0), DEV (NULL, NULL, 0, 0, 0, 0, 0) }; diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index fbae96cba..7784ba873 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -814,8 +814,8 @@ :model "i-SENSYS MF4800 Series" :interface "USB Ethernet" :usbid "0x04a9" "0x2773" -:status :untested -:comment "Testers needed!" +:status :good +:comment "Flatbed scan. All resolutions supported (up to 600DPI). ADF buggy." :model "imageCLASS MF5630" :interface "USB" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index e65cacadf..467bedf3d 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -1,4 +1,4 @@ -.TH "sane\-pixma" "5" "16 Dec 2013" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH "sane\-pixma" "5" "27 Dec 2013" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane\-pixma .SH NAME sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners @@ -53,7 +53,9 @@ imageCLASS MF4410, MF4430, MF4660, MF4690 .br imageCLASS MF5730, MF5770, MF6550, D420, D480 .br -i-SENSYS MF3010, MF4320d, MF4330d, MF4550d, MF4700 Series +i-SENSYS MF3010, MF4320d, MF4330d, MF4550d +.br +i-SENSYS MF4700 Series, MF4800 Series .br imageRUNNER 1020/1024/1025 .br @@ -91,7 +93,7 @@ imageCLASS MF4570dw, MF5630, MF5650, MF5750, MF8030, MF8170c .br imageRUNNER 1133 .br -i-SENSYS MF4800 Series, MF5880dn, MF6680dn +i-SENSYS MF5880dn, MF6680dn .RE .PP \#The following models may use partly the same Pixma protocol as other devices