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

new scanner Canon PIXMA MX360

merge-requests/1/head
Rolf Bensch 2012-02-06 16:48:00 +01:00
rodzic 974ee17cf4
commit 2ffa16dcdd
4 zmienionych plików z 14 dodań i 1 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 @@
2012-02-06 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma_mp150, doc/descriptions/pixma.desc, doc/sane-pixma.man:
New scanner Canon PIXMA MX360.
2012-02-03 Rolf Bensch <rolf at bensch hyphen online dot de> 2012-02-03 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.[ch], backend/pixma_common.[ch], * backend/pixma.[ch], backend/pixma_common.[ch],
backend/pixma_sane_options.[ch], backend/pixma_mp{150,810}.c: backend/pixma_sane_options.[ch], backend/pixma_mp{150,810}.c:

3
backend/pixma_mp150.c
Wyświetl plik

@ -160,6 +160,7 @@
#define MG5100_PID 0x1748 #define MG5100_PID 0x1748
#define MG5200_PID 0x1749 #define MG5200_PID 0x1749
#define MG6100_PID 0x174a #define MG6100_PID 0x174a
#define MX360_PID 0x174d
/* PIXMA 2011 vintage */ /* PIXMA 2011 vintage */
#define MX880_PID 0x1750 #define MX880_PID 0x1750
@ -1195,6 +1196,7 @@ mp150_check_param (pixma_t * s, pixma_scan_param_t * sp)
s->cfg->pid == MX330_PID || s->cfg->pid == MX330_PID ||
s->cfg->pid == MX340_PID || s->cfg->pid == MX340_PID ||
s->cfg->pid == MX350_PID || s->cfg->pid == MX350_PID ||
s->cfg->pid == MX360_PID ||
s->cfg->pid == MX7600_PID ) s->cfg->pid == MX7600_PID )
&& &&
sp->source == PIXMA_SOURCE_FLATBED) sp->source == PIXMA_SOURCE_FLATBED)
@ -1587,6 +1589,7 @@ const pixma_config_t pixma_mp150_devices[] = {
/* PIXMA 2010 vintage */ /* PIXMA 2010 vintage */
DEVICE ("Canon PIXMA MX340", "MX340", MX340_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF), DEVICE ("Canon PIXMA MX340", "MX340", MX340_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX350", "MX350", MX350_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF), DEVICE ("Canon PIXMA MX350", "MX350", MX350_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX360", "MX360", MX350_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX870", "MX870", MX870_PID, 2400, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP), DEVICE ("Canon PIXMA MX870", "MX870", MX870_PID, 2400, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
/* PIXMA 2011 vintage */ /* PIXMA 2011 vintage */

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

@ -259,6 +259,12 @@
:status :complete :status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)" :comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)"
:model "PIXMA MX360"
:interface "USB"
:usbid "0x04a9" "0x174d"
:status :complete
:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)"
:model "PIXMA MX700" :model "PIXMA MX700"
:interface "USB Ethernet" :interface "USB Ethernet"
:usbid "0x04a9" "0x1729" :usbid "0x04a9" "0x1729"

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

@ -29,7 +29,7 @@ PIXMA MP600, MP600R, MP610, MP620, MP630, MP640, MP710
.br .br
PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980, MP990 PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980, MP990
.br .br
PIXMA MX300, MX310, MX330, MX340, MX350 PIXMA MX300, MX310, MX330, MX340, MX350, MX360
.br .br
PIXMA MX700, MX850, MX860, MX870, MX7600 PIXMA MX700, MX850, MX860, MX870, MX7600
.br .br