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

canon_dr backend v37: 

- don't center window when using flatbed
- improve request sense error messages
- enable flatbed for all known models
- ad usb ids for DR-6030C, CR-135i & CR-190i
- moved DR-2020U to unsupported.desc
merge-requests/1/head
m. allan noah 2011-01-26 22:03:09 -05:00
rodzic e237abad17
commit c78f416175
6 zmienionych plików z 69 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
ChangeLog
Wyświetl plik

@ -1,3 +1,13 @@
2011-01-26 m. allan noah <kitno455 at gmail dot com>
* backend/canon_dr.[ch], doc/descriptions/canon_dr.desc,
backend/canon_dr.conf.in, doc/sane-canon_dr.man:
canon_dr backend v37:
- don't center window when using flatbed
- improve request sense error messages
- enable flatbed for all known models
- ad usb ids for DR-6030C, CR-135i & CR-190i
* doc/descriptions/unsupported.desc: moved DR-2020U from canon_dr.desc
2011-01-20 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl646.h: tune resolution
list and add internal values matching them

30
backend/canon_dr.c
Wyświetl plik

@ -251,7 +251,7 @@
- sane_get_params uses intermediate struct instead of user struct
- if scanner stops, clone the last line until the end of buffer
- reset some intermediate params between duplex sides
v35 2010-02-09, MAN
v35 2010-02-09, MAN (SANE 1.0.21)
- cleanup #includes and copyright
- add SANE_I18N to static strings
- don't fail if scsi buffer is too small
@ -262,6 +262,10 @@
- don't send dropout color command on non-color scanners
- initial support for DR-7090C
- update credits
v37 2011-01-26, MAN (SANE 1.0.22)
- don't center window when using flatbed
- improve request sense error messages
- enable flatbed for all known models
SANE FLOW DIAGRAM
@ -310,7 +314,7 @@
#include "canon_dr.h"
#define DEBUG 1
#define BUILD 36
#define BUILD 37
/* values for SANE_DEBUG_CANON_DR env var:
- errors 5
@ -1148,6 +1152,12 @@ init_model (struct scanner *s)
s->has_flatbed = 1;
}
else if (strstr (s->model_name,"DR-4080")
|| strstr (s->model_name,"DR-4580")
|| strstr (s->model_name,"DR-7080")){
s->has_flatbed = 1;
}
else if (strstr (s->model_name,"DR-2580")){
s->invert_tly = 1;
s->rgb_format = 1;
@ -3635,6 +3645,12 @@ set_window (struct scanner *s)
set_WD_width (desc1, s->max_x);
}
/* or they align left */
else if(s->u.source == SOURCE_FLATBED){
set_WD_ULX (desc1, s->s.tl_x);
set_WD_width (desc1, s->s.width * 1200/s->s.dpi_x);
}
/* or we have to center the window ourselves */
else{
set_WD_ULX (desc1, (s->max_x - s->s.page_x) / 2 + s->s.tl_x);
@ -6232,13 +6248,13 @@ do_usb_cmd(struct scanner *s, int runRS, int shortTime,
/* EOF is ok */
ret2 = SANE_STATUS_GOOD;
if(inActual < inLength - s->rs_info){
DBG(5,"in: shorter read than RS, ignoring: %d < %d-%d\n",
(int)inActual,(int)inLength,(int)s->rs_info);
if(inActual <= inLength - s->rs_info){
DBG(5,"in: we read <= RS, ignoring RS: %d <= %d (%d-%d)\n",
(int)inActual,(int)(inLength-s->rs_info),(int)inLength,(int)s->rs_info);
}
else if(s->rs_info){
DBG(5,"in: longer read than RS, updating: %d to %d-%d\n",
(int)inActual,(int)inLength,(int)s->rs_info);
DBG(5,"in: we read > RS, using RS: %d to %d (%d-%d)\n",
(int)inActual,(int)(inLength-s->rs_info),(int)inLength,(int)s->rs_info);
inActual = inLength - s->rs_info;
}
}

9
backend/canon_dr.conf.in
Wyświetl plik

@ -123,3 +123,12 @@ usb 0x1083 0x1624
# DR-6010C
usb 0x1083 0x1626
# CR-190i
usb 0x1083 0x162b
# DR-6030C
usb 0x1083 0x1638
# CR-135i
usb 0x1083 0x1639

27
doc/descriptions/canon_dr.desc
Wyświetl plik

@ -11,7 +11,7 @@
:backend "canon_dr" ; name of backend
:url "http://www.thebility.com/canon/"
:version "35" ; version of backend
:version "37" ; version of backend
:manpage "sane-canon_dr" ; name of manpage (if it exists)
:comment "Backend updated for SANE release 1.0.21, see sane-canon_dr manpage"
:devicetype :scanner ; start of a list of devices....
@ -34,6 +34,12 @@
:status :untested
:comment "Please test!"
:model "CR-135i"
:interface "USB SCSI"
:usbid "0x1083" "0x1639"
:status :untested
:comment "Please test!"
:model "CR-180"
:interface "USB SCSI"
:usbid "0x04a9" "0x1602"
@ -46,6 +52,12 @@
:status :untested
:comment "Same as CR-180? Please test!"
:model "CR-190i"
:interface "USB SCSI"
:usbid "0x1083" "0x162b"
:status :untested
:comment "Please test!"
:model "DR-1210C"
:interface "USB"
:usbid "0x04a9" "0x2222"
@ -69,11 +81,6 @@
:status :untested
:comment "Mac version of DR-2010C? Please test!"
:model "DR-2020U"
:interface "USB"
:status :untested
:comment "Please test!"
:model "DR-2050C"
:interface "USB"
:usbid "0x04a9" "0x160a"
@ -186,6 +193,12 @@
:status :untested
:comment "Please test!"
:model "DR-6030C"
:interface "USB SCSI"
:usbid "0x1083" "0x1638"
:status :untested
:comment "Please test!"
:model "DR-6050C"
:interface "USB SCSI"
:usbid "0x1083" "0x1624"
@ -208,7 +221,7 @@
:interface "USB SCSI"
:usbid "0x1083" "0x1620"
:status :good
:comment "ADF works, Flatbed does not"
:comment "ADF and flatbed work"
:model "DR-7550C"
:interface "USB SCSI"

5
doc/descriptions/unsupported.desc
Wyświetl plik

@ -533,6 +533,11 @@
:status :unsupported
:comment "Probably not supported. See link for details."
:model "DR-2020U"
:interface "USB"
:status :unsupported
:comment "GL84x?"
;********************************************************************************************
:mfg "Chinon"

4
doc/sane-canon_dr.man
Wyświetl plik

@ -1,4 +1,4 @@
.TH sane\-canon_dr 5 "18 Jan 2011" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.TH sane\-canon_dr 5 "26 Jan 2011" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-canon_dr
.SH NAME
@ -10,7 +10,7 @@ The
library implements a SANE (Scanner Access Now Easy) backend which
provides access to some Canon DR-series scanners.
This document describes backend version 36, which shipped with SANE 1.0.22.
This document describes backend version 37, which shipped with SANE 1.0.22.
.SH SUPPORTED HARDWARE
This version has only been tested with a few scanner models. Please see