Commit 7bbc9bf1 authored by Rolf Bensch's avatar Rolf Bensch

pixma: new scanner CanoScan LIDE 300

See issue website#18
parent 0d193b83
......@@ -262,6 +262,7 @@
#define TR7500_PID 0x1824
#define TS9500_PID 0x185c
#define LIDE400_PID 0x1912 /* tested */
#define LIDE300_PID 0x1913 /* tested */
/* Generation 4 XML messages that encapsulates the Pixma protocol messages */
#define XML_START_1 \
......@@ -1021,7 +1022,8 @@ handle_interrupt (pixma_t * s, int timeout)
if (buf[7] & 2)
s->events = PIXMA_EV_BUTTON2 | buf[11] | buf[10]<<8 | buf[12]<<16; /* b/w scan */
}
else if (s->cfg->pid == LIDE400_PID)
else if (s->cfg->pid == LIDE300_PID
|| s->cfg->pid == LIDE400_PID)
/* unknown value in buf[4]
* target in buf[0x13]
* always set button-1 */
......@@ -1390,7 +1392,9 @@ mp150_check_param (pixma_t * s, pixma_scan_param_t * sp)
if ((s->cfg->cap & PIXMA_CAP_ADF) && sp->source == PIXMA_SOURCE_FLATBED)
sp->h = MIN (sp->h, 877 * sp->xdpi / 75);
if (sp->source == PIXMA_SOURCE_TPU || s->cfg->pid == LIDE400_PID)
if (sp->source == PIXMA_SOURCE_TPU
|| s->cfg->pid == LIDE300_PID
|| s->cfg->pid == LIDE400_PID)
{
uint8_t k;
......@@ -1951,6 +1955,7 @@ const pixma_config_t pixma_mp150_devices[] = {
DEVICE ("Canon PIXMA TR7500 Series", "TR7500", TR7500_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA TS9500 Series", "TS9500", TS9500_PID, 1200, 0, 600, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("CanoScan LiDE 400", "LIDE400", LIDE400_PID, 4800, 0, 0, 638, 877, PIXMA_CAP_CIS),
DEVICE ("CanoScan LiDE 300", "LIDE300", LIDE300_PID, 4800, 0, 0, 638, 877, PIXMA_CAP_CIS),
END_OF_DEVICE_LIST
};
......@@ -1295,6 +1295,12 @@
:status :complete
:comment "Full flatbed support up to 4800DPI (Note: flatbed does not have 9600DPI capability). Full TPU support (negatives, slides and infrared) up to 9600DPI."
:model "CanoScan LiDE 300"
:interface "USB"
:usbid "0x04a9" "0x1913"
:status :complete
:comment "Support up to 4800DPI (Note: does not have less than 300DPI support)"
:model "CanoScan LiDE 400"
:interface "USB"
:usbid "0x04a9" "0x1912"
......
.TH "sane\-pixma" "5" "01 Jan 2019" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.TH "sane\-pixma" "5" "20 Feb 2019" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-pixma
.SH NAME
sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
......@@ -73,7 +73,7 @@ imageRUNNER 1020/1024/1025
.br
CanoScan 8800F, 9000F, 9000F Mark II
.br
CanoScan LiDE 400
CanoScan LiDE 300, 400
.br
MAXIFY MB2000, MB2100, MB2300, MB2700, MB5000
.RE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment