* backend/fujitsu.[ch]: backend v76

- add independent maximum area values for flatbed
- override said values for fi-4220C, fi-4220C2 and fi-5220C
* doc/descriptions/fujitsu.desc: bump version, add 2 untested scanners
merge-requests/1/head
m. allan noah 2008-08-14 03:56:17 +00:00
rodzic bbc7dbd0c9
commit 852411f3f4
4 zmienionych plików z 43 dodań i 11 usunięć

Wyświetl plik

@ -1,6 +1,8 @@
2008-08-11 Stéphane Voltz <stef.dev@free.fr>
* backend/rts8891.c backend/rts8891.h backend/rts8891_low.h:
improve configuration framework use.
2008-08-13 m. allan noah <kitno455 a t gmail d o t com>
* backend/fujitsu.[ch]: backend v76
- add independent maximum area values for flatbed
- override said values for fi-4220C, fi-4220C2 and fi-5220C
* doc/descriptions/fujitsu.desc: bump version, add 2 untested scanners
2008-08-07 Rene Rebe <rene@exactcode.de>
* backend/fujitsu.c, backend/fujitsu.conf.in,
@ -86,6 +88,10 @@
2008-07-10 Stéphane Voltz <stef.dev@free.fr>
* include/sane/sanei_config.h: doxygen fix for new function
2008-07-10 Stéphane Voltz <stef.dev@free.fr>
* backend/sanei_constrain_value.c: add support for SANE_Bool
in sanei_check_value
* backend/Makefile.in: add sanei_constrain_value.lo to libsane
2008-07-10 Stéphane Voltz <stef.dev@free.fr>
* backend/sanei_constrain_value.c: add support for SANE_Bool
in sanei_check_value
@ -659,10 +665,6 @@
* configure.in, include/sanei.h: bumped version
number to 1.1.0 and enabled 1.1 frame types.
2008-02-18 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma.c, backend/pixma.h, backend/pixma_common.c,
backend/pixma_io_sanei.c, backend/pixma_mp150.c,
backend/pixma_mp730.c, backend/pixma_mp750.c,
doc/sane-pixma.man, doc/descriptions/pixma.desc,
doc/descriptions-external/canon_mfp.desc:
> New models changes:

Wyświetl plik

@ -370,6 +370,9 @@
- replace global scsi blocks with local ones in each function
v75 2008-08-07, ReneR
- added fi-6230 usb ID
v76 2008-08-13, MAN
- add independent maximum area values for flatbed
- override said values for fi-4220C, fi-4220C2 and fi-5220C
SANE FLOW DIAGRAM
@ -430,7 +433,7 @@
#include "fujitsu.h"
#define DEBUG 1
#define BUILD 75
#define BUILD 76
/* values for SANE_DEBUG_FUJITSU env var:
- errors 5
@ -1223,10 +1226,12 @@ init_vpd (struct fujitsu *s)
/* maximum window width and length are reported in basic units.*/
s->max_x_basic = get_IN_window_width(in);
s->max_x = s->max_x_basic * 1200 / s->basic_x_res;
s->max_x_fb = s->max_x;
DBG(15, " max width: %2.2f inches\n",(float)s->max_x_basic/s->basic_x_res);
s->max_y_basic = get_IN_window_length(in);
s->max_y = s->max_y_basic * 1200 / s->basic_y_res;
s->max_y_fb = s->max_y;
DBG(15, " max length: %2.2f inches\n",(float)s->max_y_basic/s->basic_y_res);
/* known modes */
@ -1818,6 +1823,13 @@ init_model (struct fujitsu *s)
/* missing from vpd */
s->os_x_basic = 118;
s->os_y_basic = 118;
s->max_y_fb = 0x1b68 * 1200 / s->basic_y_res;
}
else if (strstr (s->model_name, "fi-4220C")){
/* missing from vpd */
s->max_y_fb = 0x1b68 * 1200 / s->basic_y_res;
}
else if (strstr (s->model_name,"fi-5110C")){
@ -1833,6 +1845,13 @@ init_model (struct fujitsu *s)
s->cropping_mode = CROP_ABSOLUTE;
}
else if (strstr (s->model_name,"fi-5220C")){
/* missing from vpd */
s->max_x_fb = 0x1506 * 1200 / s->basic_x_res;
s->max_y_fb = 0x1b68 * 1200 / s->basic_y_res;
}
else if (strstr (s->model_name,"fi-5530")
|| strstr (s->model_name,"fi-5650")
|| strstr (s->model_name,"fi-5750")){
@ -7804,7 +7823,7 @@ get_page_width(struct fujitsu *s)
/* scanner max for fb */
if(s->source == SOURCE_FLATBED){
return s->max_x;
return s->max_x_fb;
}
/* current paper size for adf not overscan */
@ -7833,7 +7852,7 @@ get_page_height(struct fujitsu *s)
/* scanner max for fb */
if(s->source == SOURCE_FLATBED){
return s->max_y;
return s->max_y_fb;
}
/* current paper size for adf not overscan */

Wyświetl plik

@ -301,6 +301,8 @@ struct fujitsu
int max_y;
int min_x;
int min_y;
int max_x_fb;
int max_y_fb;
int has_back; /* not all duplex scanners can do adf back side only */
int color_interlace; /* different models interlace colors differently */

Wyświetl plik

@ -11,7 +11,7 @@
:backend "fujitsu" ; name of backend
:url "http://www.thebility.com/fujitsu/"
:version "73" ; version of backend
:version "76" ; version of backend
:manpage "sane-fujitsu" ; name of manpage (if it exists)
:comment "Backend updated for SANE release 1.1.0, see sane-fujitsu manpage"
:devicetype :scanner ; start of a list of devices....
@ -325,3 +325,12 @@
:status :good
:comment "big, current"
:model "fi-6670C"
:interface "SCSI USB"
:status :untested
:comment "big, current"
:model "fi-6770C"
:interface "SCSI USB"
:status :untested
:comment "big, current"