kopia lustrzana https://gitlab.com/sane-project/backends
Added basic support for Plustek OpticSlim 2400. Fixed calibration debug output.
Henning Geinitz
rodzic
3e34ca2aa2
commit
820b9ba269
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
#include "../include/sane/config.h"
|
||||
|
||||
#define BUILD 53
|
||||
#define BUILD 54
|
||||
#define MAX_DEBUG
|
||||
#define WARMUP_TIME 30
|
||||
#define CALIBRATION_HEIGHT 2.5
|
||||
|
|
|
|||
|
|
@ -141,6 +141,10 @@ usb 0x07b3 0x0403
|
|||
# Autodetect Plustek OpticSlim 1200
|
||||
usb 0x07b3 0x0413
|
||||
|
||||
##############################################################################
|
||||
# Autodetect Plustek OpticSlim 2400
|
||||
usb 0x07b3 0x0422
|
||||
|
||||
##############################################################################
|
||||
# Autodetect Genius Colorpage Vivid3x
|
||||
usb 0x0458 0x2011
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* sane - Scanner Access Now Easy.
|
||||
|
||||
Copyright (C) 2002 Sergey Vlasov <vsu@altlinux.ru>
|
||||
Copyright (C) 2002, 2003 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
Copyright (C) 2002 - 2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
|
||||
This file is part of the SANE package.
|
||||
|
||||
|
|
@ -1139,7 +1139,7 @@ static GT68xx_Model genius_vivid3xe_model = {
|
|||
/* mostly untested, based on the Genius Vivid3x */
|
||||
};
|
||||
|
||||
static GT68xx_Model plustek_opticslim1200 = {
|
||||
static GT68xx_Model plustek_opticslim1200_model = {
|
||||
"plustek-opticslim-1200", /* Name */
|
||||
"Plustek", /* Device vendor string */
|
||||
"OpticSlim 1200", /* Device model name */
|
||||
|
|
@ -1187,6 +1187,56 @@ static GT68xx_Model plustek_opticslim1200 = {
|
|||
0
|
||||
};
|
||||
|
||||
static GT68xx_Model plustek_opticslim2400_model = {
|
||||
"plustek-opticslim-2400", /* Name */
|
||||
"Plustek", /* Device vendor string */
|
||||
"OpticSlim 2400", /* Device model name */
|
||||
"cis3R5B1.fw", /* Name of the firmware file */
|
||||
SANE_FALSE, /* Dynamic allocation flag */
|
||||
|
||||
&mustek_gt6816_command_set, /* Command set used by this scanner */
|
||||
|
||||
1200, /* maximum optical sensor resolution */
|
||||
2400, /* maximum motor resolution */
|
||||
1200, /* base x-res used to calculate geometry */
|
||||
1200, /* base y-res used to calculate geometry */
|
||||
2400, /* if ydpi is equal or higher, use linemode */
|
||||
SANE_FALSE, /* Use base_ydpi for all resolutions */
|
||||
|
||||
{1200, 600, 300, 150, 75, 50, 0}, /* possible x-resolutions */
|
||||
{2400, 1200, 600, 300, 150, 75, 50, 0}, /* possible y-resolutions */
|
||||
{16, 8, 0}, /* possible depths in gray mode */
|
||||
{16, 8, 0}, /* possible depths in color mode */
|
||||
|
||||
SANE_FIX (1.0), /* Start of scan area in mm (x) */
|
||||
SANE_FIX (9.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 (140.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, 0, 0, /* RGB CCD Line-distance correction in pixel */
|
||||
0, /* CCD distcance for CCD with 6 lines) */
|
||||
|
||||
COLOR_ORDER_RGB, /* Order of the CCD/CIS colors */
|
||||
{0x15, 0x09, 0x18, 0x11, 0x16, 0x0c}, /* Default offset/gain */
|
||||
{0x157, 0x157, 0x157}, /* Default exposure parameters */
|
||||
SANE_FIX (2.0), /* Default gamma value */
|
||||
|
||||
SANE_TRUE, /* Is this a CIS scanner? */
|
||||
GT68XX_FLAG_UNTESTED
|
||||
};
|
||||
/* By Detlef Gausepohl <detlef at sunrise.psycho.rwth-aachen.de> */
|
||||
|
||||
|
||||
static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = {
|
||||
{0x055f, 0x0218, &mustek_2400ta_model},
|
||||
{0x055f, 0x0219, &mustek_2400taplus_model},
|
||||
|
|
@ -1205,7 +1255,8 @@ static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = {
|
|||
{0x07b3, 0x0401, &plustek_op1248u_model}, /* Same scanner, different id? */
|
||||
{0x07b3, 0x0402, &plustek_u16b_model},
|
||||
{0x07b3, 0x0403, &plustek_u16b_model}, /* two ids? 403 seems to be more common */
|
||||
{0x07b3, 0x0413, &plustek_opticslim1200},
|
||||
{0x07b3, 0x0413, &plustek_opticslim1200_model},
|
||||
{0x07b3, 0x0422, &plustek_opticslim2400_model},
|
||||
{0x0458, 0x2011, &genius_vivid3x_model},
|
||||
{0x0458, 0x2017, &genius_vivid3xe_model},
|
||||
{0x0458, 0x201a, &genius_vivid4xe_model},
|
||||
|
|
|
|||
|
|
@ -729,7 +729,7 @@ gt68xx_scanner_calibrate (GT68xx_Scanner * scanner,
|
|||
status = gt68xx_scanner_create_gray_calibrators (scanner, ¶ms);
|
||||
|
||||
#if defined(SAVE_WHITE_CALIBRATION) || defined(SAVE_BLACK_CALIBRATION)
|
||||
printf ("P5\n%d %d\n255\n", params.pixel_xs, params.pixel_ys);
|
||||
printf ("P5\n%d %d\n255\n", params.pixel_xs, params.pixel_ys * 3);
|
||||
#endif
|
||||
for (i = 0; i < params.pixel_ys; ++i)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
:backend "gt68xx"
|
||||
:version "1.0-53"
|
||||
:version "1.0-54"
|
||||
: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."
|
||||
|
|
@ -237,10 +237,6 @@
|
|||
:status :good
|
||||
:comment "Works up to 600 dpi."
|
||||
|
||||
:model "OpticSlim 1200"
|
||||
:interface "USB"
|
||||
:status :good
|
||||
|
||||
:model "OpticPro U16B"
|
||||
:interface "USB"
|
||||
:status :untested
|
||||
|
|
@ -251,6 +247,15 @@
|
|||
:status :untested
|
||||
:comment "Should be detected but may not work. Please contact me if you own such a device. Same as U16B but with a transparency adapter?"
|
||||
|
||||
:model "OpticSlim 1200"
|
||||
:interface "USB"
|
||||
:status :good
|
||||
|
||||
:model "OpticSlim 2400"
|
||||
:interface "USB"
|
||||
:status :basic
|
||||
:comment "Calibration doesn't seem to work correctly on all scanners yet. Needs more testing. Please tell me how well this scanner works."
|
||||
|
||||
; -----------------------------------------------------------------------------
|
||||
|
||||
:mfg "RevScan"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.TH sane-gt68xx 5 "19 Jan 2004" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
|
||||
.TH sane-gt68xx 5 "10 Feb 2004" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
|
||||
.IX sane-gt68xx
|
||||
.SH NAME
|
||||
sane-gt68xx \- SANE backend for GT-68XX based USB flatbed scanners
|
||||
|
|
@ -71,6 +71,8 @@ Plustek OpticPro 1248U
|
|||
.br
|
||||
Plustek OpticSlim 1200
|
||||
.br
|
||||
Plustek OpticSlim 2400
|
||||
.br
|
||||
RevScan 19200i
|
||||
.br
|
||||
Trust Compact Scan USB 19200
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue