kopia lustrzana https://gitlab.com/sane-project/backends
Fixed a bug in the stop scan function for Plustek U16b. Added support for Genius
Vivid4xe.merge-requests/1/head
Henning Geinitz
rodzic
d565a760a8
commit
a4dc00b0ed
|
|
@ -1,3 +1,11 @@
|
|||
2004-01-05 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
|
||||
* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
|
||||
backend/gt68xx_gt6801.c doc/sane-gt68xx.man
|
||||
doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Fixed a
|
||||
bug in the stop scan function for Plustek U16b. Added support
|
||||
for Genius Vivid4xe.
|
||||
|
||||
2003-12-31 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
|
||||
* doc/descriptions/unsupported.desc: Added HP and Epson scanners.
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
#include "../include/sane/config.h"
|
||||
|
||||
#define BUILD 51
|
||||
#define BUILD 52
|
||||
#define MAX_DEBUG
|
||||
#define WARMUP_TIME 30
|
||||
#define CALIBRATION_HEIGHT 2.5
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ usb 0x0458 0x2011
|
|||
# Autodetect Genius Colorpage Vivid4x
|
||||
usb 0x0458 0x201b
|
||||
|
||||
# Genius Colorpage Vivid3x doesn't need any manual settings
|
||||
# Genius Colorpage Vivid4x doesn't need any manual settings
|
||||
|
||||
##############################################################################
|
||||
# Autodetect Genius Colorpage Vivid3xe
|
||||
|
|
@ -159,3 +159,9 @@ usb 0x0458 0x2017
|
|||
# Genius Colorpage Vivid3xe doesn't need any manual settings
|
||||
|
||||
##############################################################################
|
||||
# Autodetect Genius Colorpage Vivid4xe
|
||||
usb 0x0458 0x201a
|
||||
|
||||
# Genius Colorpage Vivid4xe doesn't need any manual settings
|
||||
##############################################################################
|
||||
|
||||
|
|
|
|||
|
|
@ -1041,6 +1041,55 @@ static GT68xx_Model genius_vivid4x_model = {
|
|||
/* Mostly untested, copied from 3x, some values from Claudio Filho <filhocf@openoffice.org> */
|
||||
};
|
||||
|
||||
static GT68xx_Model genius_vivid4xe_model = {
|
||||
"genius-colorpage-vivid4xe", /* Name */
|
||||
"Genius", /* Device vendor string */
|
||||
"Colorpage Vivid4xe", /* Device model name */
|
||||
"ccd548.fw", /* Name of the firmware file */
|
||||
SANE_FALSE, /* Dynamic allocation flag */
|
||||
|
||||
&mustek_gt6816_command_set, /* Command set used by this scanner */
|
||||
|
||||
600, /* maximum optical sensor resolution */
|
||||
600, /* maximum motor resolution */
|
||||
600, /* base x-res used to calculate geometry */
|
||||
600, /* base y-res used to calculate geometry */
|
||||
50, /* if ydpi is equal or higher, use linemode */
|
||||
SANE_TRUE, /* Use base_ydpi for all resolutions */
|
||||
|
||||
{600, 300, 150, 75, 0}, /* possible x-resolutions */
|
||||
{600, 300, 150, 75, 0}, /* possible y-resolutions */
|
||||
{12, 8, 0}, /* possible depths in gray mode */
|
||||
{12, 8, 0}, /* possible depths in color mode */
|
||||
|
||||
SANE_FIX (3.5), /* Start of scan area in mm (x) */
|
||||
SANE_FIX (7.5), /* Start of scan area in mm (y) */
|
||||
SANE_FIX (218.0), /* Size of scan area in mm (x) */
|
||||
SANE_FIX (299.0), /* Size of scan area in mm (y) */
|
||||
|
||||
SANE_FIX (0.0), /* Start of white strip in mm (y) */
|
||||
SANE_FIX (1.0), /* Start of black mark in mm (x) */
|
||||
|
||||
SANE_FIX (0.0), /* Start of scan area in TA mode in mm (x) */
|
||||
SANE_FIX (0.0), /* Start of scan area in TA mode in mm (y) */
|
||||
SANE_FIX (100.0), /* Size of scan area in TA mode in mm (x) */
|
||||
SANE_FIX (100.0), /* Size of scan area in TA mode in mm (y) */
|
||||
|
||||
SANE_FIX (0.0), /* Start of white strip in TA mode in mm (y) */
|
||||
|
||||
0, 8, 16, /* RGB CCD Line-distance correction in pixel */
|
||||
0, /* CCD distcance for CCD with 6 lines) */
|
||||
|
||||
COLOR_ORDER_BGR, /* Order of the CCD/CIS colors */
|
||||
{0x1c, 0x29, 0x1c, 0x2c, 0x1c, 0x2b}, /* Default offset/gain */
|
||||
{0x157, 0x157, 0x157}, /* Default exposure parameters */
|
||||
SANE_FIX (2.0), /* Default gamma value */
|
||||
|
||||
SANE_FALSE, /* Is this a CIS scanner? */
|
||||
GT68XX_FLAG_OFFSET_INV /* Which flags are needed for this scanner? */
|
||||
/* mostly untested, based on the Genius Vivid3x */
|
||||
};
|
||||
|
||||
static GT68xx_Model genius_vivid3xe_model = {
|
||||
"genius-colorpage-vivid3xe", /* Name */
|
||||
"Genius", /* Device vendor string */
|
||||
|
|
@ -1158,6 +1207,7 @@ static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = {
|
|||
{0x07b3, 0x0413, &plustek_opticslim1200},
|
||||
{0x0458, 0x2011, &genius_vivid3x_model},
|
||||
{0x0458, 0x2017, &genius_vivid3xe_model},
|
||||
{0x0458, 0x201a, &genius_vivid4xe_model},
|
||||
{0x0458, 0x201b, &genius_vivid4x_model},
|
||||
{0, 0, NULL}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -334,7 +334,7 @@ gt6801_u16b_stop_scan (GT68xx_Device * dev)
|
|||
req[0] = 0x42;
|
||||
req[1] = 0x01;
|
||||
RIE (gt68xx_device_req (dev, req, req));
|
||||
if (gt68xx_device_check_result (req, 0x42))
|
||||
if (gt68xx_device_check_result (req, 0x42) == SANE_STATUS_GOOD)
|
||||
break;
|
||||
DBG (7, "gt6801_u16b_stop_scan: failed, count = %d\n", count);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
:backend "gt68xx"
|
||||
:version "1.0-51"
|
||||
:version "1.0-52"
|
||||
:manpage "sane-gt68xx"
|
||||
:url "http://www.meier-geinitz.de/sane/gt68xx-backend/"
|
||||
:comment "Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend."
|
||||
|
|
@ -63,6 +63,11 @@
|
|||
:interface "USB"
|
||||
:comment "Should work but has limited testing. Please contact me if you own such a device."
|
||||
|
||||
:model "Colorpage Vivid4xe"
|
||||
:status :basic
|
||||
:interface "USB"
|
||||
:comment "Should work but has limited testing. Please contact me if you own such a device."
|
||||
|
||||
; -----------------------------------------------------------------------------
|
||||
|
||||
:mfg "Googlegear"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
gt68xx.CHANGES -*-text-*-
|
||||
|
||||
V 1.0-52 (2004-01-01)
|
||||
|
||||
* gt68xx_gt6801.c: Fixed a bug in the stop scan function for Plustek U16b.
|
||||
* Added support for Genius Vivid4xe.
|
||||
|
||||
V 1.0-51 (2003-12-14)
|
||||
|
||||
* Changed color order to RGB vor Genius Vivid 4x. Seems to work now. Updated
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.TH sane-gt68xx 5 "14 Dec 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
|
||||
.TH sane-gt68xx 5 "1 Jan 2004" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
|
||||
.IX sane-gt68xx
|
||||
.SH NAME
|
||||
sane-gt68xx \- SANE backend for GT-68XX based USB flatbed scanners
|
||||
|
|
@ -27,6 +27,8 @@ Genius Colorpage Vivid3xe
|
|||
.br
|
||||
Genius Colorpage Vivid4x
|
||||
.br
|
||||
Genius Colorpage Vivid4xe
|
||||
.br
|
||||
Googlegear 2000
|
||||
.br
|
||||
Lexmark X70
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue