new scanners Canon PIXUS MP5/SmartBase MPC190/imageCLASS MPC190 and Canon MP10/SmartBase MPC200/imageCLASS MPC200

merge-requests/1/head
Rolf Bensch 2015-10-14 19:02:43 +02:00
rodzic 06b865cfd2
commit 3095ab46c4
3 zmienionych plików z 48 dodań i 6 usunięć

Wyświetl plik

@ -63,13 +63,17 @@
#define IMAGE_BLOCK_SIZE (0xc000)
#define CMDBUF_SIZE 512
#define MP10_PID 0x261f
#define MP730_PID 0x262f
#define MP700_PID 0x2630
#define MP5_PID 0x2635 /* untested */
#define MP360_PID 0x263c
#define MP370_PID 0x263d
#define MP390_PID 0x263e
#define MP375R_PID 0x263f /* untested */
#define MP375R_PID 0x263f /* untested */
#define MP740_PID 0x264c /* Untested */
#define MP710_PID 0x264d
@ -341,6 +345,8 @@ handle_interrupt (pixma_t * s, int timeout)
s->events = PIXMA_EV_BUTTON1; /* color scan */
break;
case MP5_PID:
case MP10_PID:
case MP700_PID:
case MP730_PID:
case MP710_PID:
@ -537,7 +543,9 @@ calc_raw_width (pixma_t * s, const pixma_scan_param_t * sp)
{
if (sp->depth == 8) /* grayscale */
{
if (s->cfg->pid == MP700_PID ||
if (s->cfg->pid == MP5_PID ||
s->cfg->pid == MP10_PID ||
s->cfg->pid == MP700_PID ||
s->cfg->pid == MP730_PID ||
s->cfg->pid == MP360_PID ||
s->cfg->pid == MP370_PID ||
@ -566,8 +574,10 @@ mp730_check_param (pixma_t * s, pixma_scan_param_t * sp)
{
sp->depth=8;
}
/* for MP360/370, MP700/730 in grayscale & lineart modes, max scan res is 600 dpi */
if (s->cfg->pid == MP700_PID ||
/* for MP5, MP10, MP360/370, MP700/730 in grayscale & lineart modes, max scan res is 600 dpi */
if (s->cfg->pid == MP5_PID ||
s->cfg->pid == MP10_PID ||
s->cfg->pid == MP700_PID ||
s->cfg->pid == MP730_PID ||
s->cfg->pid == MP360_PID ||
s->cfg->pid == MP370_PID ||
@ -808,6 +818,8 @@ static const pixma_scan_ops_t pixma_mp730_ops = {
}
const pixma_config_t pixma_mp730_devices[] = {
/* TODO: check area limits */
DEVICE ("PIXUS MP5/SmartBase MPC190/imageCLASS MPC190","MP5", MP5_PID, 600, 636, 868, PIXMA_CAP_LINEART),/* color scan can do 600x1200 */
DEVICE ("PIXUS MP10/SmartBase MPC200/imageCLASS MPC200","MP10", MP10_PID, 600, 636, 868, PIXMA_CAP_LINEART),/* color scan can do 600x1200 */
DEVICE ("PIXMA MP360", "MP360", MP360_PID, 1200, 636, 868, PIXMA_CAP_LINEART),
DEVICE ("PIXMA MP370", "MP370", MP370_PID, 1200, 636, 868, PIXMA_CAP_LINEART),
DEVICE ("PIXMA MP375R", "MP375R", MP375R_PID, 1200, 636, 868, PIXMA_CAP_LINEART),

Wyświetl plik

@ -232,6 +232,18 @@
:status :complete
:comment "All resolutions supported (up to 4800DPI)."
:model "PIXUS MP5"
:interface "USB"
:usbid "0x04a9" "0x2635"
:status :untested
:comment "Testers needed! Identical with imageCLASS MPC190."
:model "PIXUS MP10"
:interface "USB"
:usbid "0x04a9" "0x261f"
:status :complete
:comment "All resolutions supported (up to 600DPI). Identical with imageCLASS MPC200."
:model "PIXMA MP140"
:interface "USB"
:usbid "0x04a9" "0x172b"
@ -1007,6 +1019,18 @@
:status :untested
:comment "Same protocol as MF8200C Series? Testers needed!"
:model "imageCLASS MPC190"
:interface "USB"
:usbid "0x04a9" "0x2635"
:status :untested
:comment "Testers needed! Identical with SmartBase MPC190 and PIXUS MP5."
:model "imageCLASS MPC200"
:interface "USB"
:usbid "0x04a9" "0x261f"
:status :complete
:comment "All resolutions supported (up to 600DPI). Identical with SmartBase MPC200 and PIXUS MP10."
:model "imageRUNNER 1020/1024/1025"
:interface "USB"
:usbid "0x04a9" "0x26e6"

Wyświetl plik

@ -1,4 +1,4 @@
.TH "sane\-pixma" "5" "30 Sep 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.TH "sane\-pixma" "5" "14 Oct 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-pixma
.SH NAME
sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@ -45,6 +45,8 @@ PIXMA MX410, MX420, MX470, MX510, MX520, MX530, MX700, MX720
.br
PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600
.br
PIXUS MP10
.br
imageCLASS MF3110, MF3240, MF4010, MF4018
.br
imageCLASS MF4120, MF4122, MF4140, MF4150
@ -53,7 +55,7 @@ imageCLASS MF4270, MF4350d, MF4370dn, MF4380dn
.br
imageCLASS MF4410, MF4430, MF4570dw, MF4660, MF4690
.br
imageCLASS MF5730, MF5770, MF6550, D420, D480, D530
imageCLASS MF5730, MF5770, MF6550, MPC200, D420, D480, D530
.br
i-SENSYS MF3010, MF4320d, MF4330d, MF4500 Series
.br
@ -87,8 +89,12 @@ PIXMA MP375R, MP493, MP495, MP740
.br
PIXMA MX320, MX390, MX430, MX450, MX490, MX710
.br
PIXUS MP5
.br
imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8030, MF8170c
.br
imageCLASS MPC190
.br
imageRUNNER 1133
.br
i-SENSYS MF210 Series, MF220 Series, MF5880dn, MF5900 Series