Merge branch 'master' into mikef-MF733C

merge-requests/39/head
Mike Ferrara 2019-02-22 10:40:29 -08:00
commit eadd663676
4 zmienionych plików z 47 dodań i 12 usunięć

Wyświetl plik

@ -116,7 +116,7 @@ typedef uint32_t uint32_t;
/** \name Version of the driver */ /** \name Version of the driver */
/**@{*/ /**@{*/
#define PIXMA_VERSION_MAJOR 0 #define PIXMA_VERSION_MAJOR 0
#define PIXMA_VERSION_MINOR 20 #define PIXMA_VERSION_MINOR 21
#define PIXMA_VERSION_BUILD 0 #define PIXMA_VERSION_BUILD 0
/**@}*/ /**@}*/

Wyświetl plik

@ -261,6 +261,8 @@
#define TR8500_PID 0x1823 #define TR8500_PID 0x1823
#define TR7500_PID 0x1824 #define TR7500_PID 0x1824
#define TS9500_PID 0x185c #define TS9500_PID 0x185c
#define LIDE400_PID 0x1912 /* tested */
#define LIDE300_PID 0x1913 /* tested */
/* Generation 4 XML messages that encapsulates the Pixma protocol messages */ /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
#define XML_START_1 \ #define XML_START_1 \
@ -1020,6 +1022,15 @@ handle_interrupt (pixma_t * s, int timeout)
if (buf[7] & 2) if (buf[7] & 2)
s->events = PIXMA_EV_BUTTON2 | buf[11] | buf[10]<<8 | buf[12]<<16; /* b/w scan */ s->events = PIXMA_EV_BUTTON2 | buf[11] | buf[10]<<8 | buf[12]<<16; /* b/w scan */
} }
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 */
{
if (buf[0x13])
s->events = PIXMA_EV_BUTTON1 | buf[0x13];
}
else else
/* button no. in buf[0] /* button no. in buf[0]
* original in buf[0] * original in buf[0]
@ -1381,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) if ((s->cfg->cap & PIXMA_CAP_ADF) && sp->source == PIXMA_SOURCE_FLATBED)
sp->h = MIN (sp->h, 877 * sp->xdpi / 75); sp->h = MIN (sp->h, 877 * sp->xdpi / 75);
if (sp->source == PIXMA_SOURCE_TPU) if (sp->source == PIXMA_SOURCE_TPU
|| s->cfg->pid == LIDE300_PID
|| s->cfg->pid == LIDE400_PID)
{ {
uint8_t k; uint8_t k;
@ -1941,6 +1954,8 @@ const pixma_config_t pixma_mp150_devices[] = {
DEVICE ("Canon PIXMA TR8500 Series", "TR8500", TR8500_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), DEVICE ("Canon PIXMA TR8500 Series", "TR8500", TR8500_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA TR7500 Series", "TR7500", TR7500_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), 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 ("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 END_OF_DEVICE_LIST
}; };

Wyświetl plik

@ -11,7 +11,7 @@
; See doc/descriptions.txt for details. ; See doc/descriptions.txt for details.
:backend "pixma" ; name of backend :backend "pixma" ; name of backend
:version "0.20.0" ; version of backend (or "unmaintained") :version "0.21.0" ; version of backend (or "unmaintained")
:manpage "sane-pixma" ; name of manpage (if it exists) :manpage "sane-pixma" ; name of manpage (if it exists)
;:comment "Devices marked as experimantal are disabled by default. See the manual page for how to enable them." ;:comment "Devices marked as experimantal are disabled by default. See the manual page for how to enable them."
@ -91,8 +91,14 @@
:model "PIXMA G2000" :model "PIXMA G2000"
:interface "USB" :interface "USB"
:usbid "0x04a9" "0x1795" :usbid "0x04a9" "0x1795"
:status :untested :status :complete
:comment "Testers needed!" :comment "All resolutions supported (up to 600DPI)."
:model "PIXMA G2100"
:interface "USB"
:usbid "0x04a9" "0x1795"
:status :complete
:comment "All resolutions supported (up to 600DPI)."
:model "PIXMA G3000" :model "PIXMA G3000"
:interface "USB WiFi" :interface "USB WiFi"
@ -1233,8 +1239,8 @@ model "imageCLASS MF733Cdw Color Laser MFP"
:model "imageRUNNER 1133" :model "imageRUNNER 1133"
:interface "USB" :interface "USB"
:usbid "0x04a9" "0x2742" :usbid "0x04a9" "0x2742"
:status :untested :status :complete
:comment "Testers needed!" :comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
:model "MAXIFY MB2000 Series" :model "MAXIFY MB2000 Series"
:interface "USB WiFi" :interface "USB WiFi"
@ -1301,3 +1307,15 @@ model "imageCLASS MF733Cdw Color Laser MFP"
:usbid "0x04a9" "0x190d" :usbid "0x04a9" "0x190d"
:status :complete :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." :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"
:status :complete
:comment "Support up to 4800DPI (Note: does not have less than 300DPI support)"

Wyświetl plik

@ -1,4 +1,4 @@
.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 .IX sane\-pixma
.SH NAME .SH NAME
sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@ -17,6 +17,8 @@ Currently, the following models work with this backend:
.RS .RS
PIXMA E510 PIXMA E510
.br .br
PIXMA G2000, G2100
.br
PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3100, MG3200 PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3100, MG3200
.br .br
PIXMA MG3500, MG3600, MG4200, MG5100, MG5200, MG5300, MG5400 PIXMA MG3500, MG3600, MG4200, MG5100, MG5200, MG5300, MG5400
@ -71,10 +73,12 @@ i-SENSYS MF4330d, MF4500, MF4700, MF4800, MF6100, MF8030
.br .br
i-SENSYS MF8200C, MF8300 i-SENSYS MF8200C, MF8300
.br .br
imageRUNNER 1020/1024/1025 imageRUNNER 1020/1024/1025, 1133
.br .br
CanoScan 8800F, 9000F, 9000F Mark II CanoScan 8800F, 9000F, 9000F Mark II
.br .br
CanoScan LiDE 300, 400
.br
MAXIFY MB2000, MB2100, MB2300, MB2700, MB5000 MAXIFY MB2000, MB2100, MB2300, MB2700, MB5000
.RE .RE
.PP .PP
@ -101,7 +105,7 @@ PIXMA MP375R, MP493, MP495, MP740
.br .br
PIXMA MX320, MX390, MX430, MX450, MX490, MX710 PIXMA MX320, MX390, MX430, MX450, MX490, MX710
.br .br
PIXMA G2000, G3000, G4000 PIXMA G3000, G4000
.br .br
PIXMA TR7500, TR8500, TS5100, TS6000, TS9000, TS9100, TS9500 PIXMA TR7500, TR8500, TS5100, TS6000, TS9000, TS9100, TS9500
.br .br
@ -111,8 +115,6 @@ imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8170c
.br .br
imageCLASS MPC190, D550, D570 imageCLASS MPC190, D550, D570
.br .br
imageRUNNER 1133
.br
i-SENSYS MF220, MF410, MF630, MF731/733, MF5880dn, MF5900 i-SENSYS MF220, MF410, MF630, MF731/733, MF5880dn, MF5900
.br .br
i-SENSYS MF6680dn, MF8500C i-SENSYS MF6680dn, MF8500C