diff --git a/backend/plustek-usb.h b/backend/plustek-usb.h
index bd90a1f9f..270331a85 100644
--- a/backend/plustek-usb.h
+++ b/backend/plustek-usb.h
@@ -49,6 +49,7 @@
* - bPCB is now ushort to be "missused" by non Plustek
* devices (as threshhold for resetting sensor order)
* - added _WAF_LOFF_ON_START and _WAF_ONLY_8BIT
+ * - added MODEL_TSCAN_A4
* .
*
* This file is part of the SANE package.
@@ -326,7 +327,8 @@ typedef enum
MODEL_CANON_LIDE25, /**< for CanoScan LiDE25 */
MODEL_UMAX, /**< for UMAX 3400/3450 */
MODEL_UMAX1200, /**< for UMAX 5400 */
- MODEL_TSCAN, /**< for Syscan Travelscan */
+ MODEL_TSCAN, /**< for Syscan TravelScan A6 */
+ MODEL_TSCAN_A4, /**< for Syscan TravelScan A4 */
MODEL_QSCAN, /**< for PandP Q-Scan */
MODEL_LAST
} eModelDef;
@@ -510,7 +512,7 @@ typedef struct HWDefault
eChipDef chip; /* chiptype */
eModelDef motorModel; /* to identify used motor */
- double gamma; /* gamma setting */
+ double gamma; /* default gamma setting */
} HWDef;
/** device description during runtime
diff --git a/backend/plustek-usbdevs.c b/backend/plustek-usbdevs.c
index 5c306846b..42861e01f 100644
--- a/backend/plustek-usbdevs.c
+++ b/backend/plustek-usbdevs.c
@@ -63,13 +63,14 @@
* - fixed CanoScan N670U settings, see (bugreport #302738)
* - added high-speed setting for HP2200
* - 0.51 - tweaked CanoScan N1220U settings again
- * - added settings for Syscan Travelscan 662
+ * - added settings for Syscan TravelScan 662
* - tweaked settings for Bearpaw 1200
* - fixed CanoScan LiDE20 settings, cause of various reports, seems
* Canon has built-in different motortypes
* - also fixed Motorsettings for LiDE30
* - 0.52 - added Q-Scan USB001 settings
* - tweaked motor settings for Bearpaw 1200
+ * - added TravelScan 464 settings
*
*
* This file is part of the SANE package.
@@ -757,6 +758,26 @@ static DCapsDef Cap0x0A82_0x6620 =
_MIO5 + _PORT1 + _PS_INP_MIO2
};
+/* Syscan TravelScan 464 A4 sheet-fed scanner
+ */
+static DCapsDef Cap0x0A82_0x4600 =
+{
+ {{ 0, 0}, 150, -1, {2550, 3508}, {75, 75}},
+ {{ 0, 0}, 0, 0, {0, 0}, { 0, 0 }},
+ {{ 0, 0}, 0, 0, {0, 0}, { 0, 0 }},
+ {{ 0, 0}, 0, 0, {0, 0}, { 0, 0 }},
+ {600, 600},
+ DEVCAPSFLAG_SheetFed,
+ SENSORORDER_rgb,
+ 8,
+ 1,
+ kNEC8861, /* use default settings during calibration */
+ 0, /* not used here... */
+ (_WAF_MISC_IO_LAMPS | _WAF_MISC_IO_BUTTONS |
+ _WAF_BIN_FROM_COLOR | _WAF_GRAY_FROM_COLOR),
+ _MIO5 + _PORT1 + _PS_INP_MIO2
+};
+
/* IRIScan/Q-Scan USB001 A4 sheet-fed scanner
*/
static DCapsDef Cap0x0A53_0x1000 =
@@ -2493,6 +2514,76 @@ static HWDef Hw0x0A82_0x6620 =
1.8
};
+/** TravelScan 464 */
+static HWDef Hw0x0A82_0x4600 =
+{
+ 0.72, /* dMaxMotorSpeed */
+ 0.188, /* dMaxMoveSpeed */
+ 0.0, /* dHighSpeed */
+ 100, /* wIntegrationTimeLowLamp */
+ 100, /* wIntegrationTimeHighLamp */
+ 740, /* wMotorDpi (Full step DPI) */
+ 512, /* wRAMSize (KB) */
+ 3.75, /* dMinIntegrationTimeLowres (ms) */
+ 5.75, /* dMinIntegrationTimeHighres (ms) */
+ 3000, /* wGreenPWMDutyCycleLow (reg 0x2a + 0x2b) */
+ 3000, /* wGreenPWMDutyCycleHigh (reg 0x2a + 0x2b) */
+
+ 0x0d, /* bSensorConfiguration (0x0b) */
+ 0x00, /* sensor control settings (reg 0x0c) */
+ 0x25, /* sensor control settings (reg 0x0d) */
+ 0x00, /* sensor control settings (reg 0x0e) */
+
+ {0x18, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07},
+ /* mono (reg 0x0f to 0x18) */
+
+ {0x18, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07},
+ /* color (reg 0x0f to 0x18) */
+
+ (_BLUE_CH | _ONE_CH_COLOR), /* bReg_0x26 color mode */
+
+ 0x00, /* bReg 0x27 color mode */
+ 2, /* bReg 0x29 illumination mode */
+
+ { 3, 0, 0, 10, 450, 0, 0 },
+ { 2, 10, 1000, 10, 880, 10, 630 },
+
+ 1, /* StepperPhaseCorrection (reg 0x1a + 0x1b) */
+ 1, /* bOpticBlackStart (reg 0x1c) */
+ 2, /* bOpticBlackEnd (reg 0x1d) */
+ 0x15, /* wActivePixelsStart (reg 0x1e + 0x1f) */
+ 5300, /* wLineEnd (reg 0x20 + 0x21) */
+
+ 500, /* red lamp on (reg 0x2c + 0x2d) */
+ 1000, /* red lamp off (reg 0x2e + 0x2f) */
+ 500, /* green lamp on (reg 0x30 + 0x31) */
+ 1000, /* green lamp off (reg 0x32 + 0x33) */
+ 500, /* blue lamp on (reg 0x34 + 0x35) */
+ 100, /* blue lamp off (reg 0x36 + 0x37) */
+
+ 3, /* stepper motor control (reg 0x45) */
+ 0, /* wStepsAfterPaperSensor2 (reg 0x4c + 0x4d) */
+
+ 0, /* steps to reverse when buffer is full reg 0x50) */
+ 0, /* acceleration profile (reg 0x51) */
+ 0, /* lines to process (reg 0x54) */
+ 0x09, /* kickstart (reg 0x55) */
+ 0x02, /* pwm freq (reg 0x56) */
+ 0x16, /* pwm duty cycle (reg 0x57) */
+
+ 0x01, /* Paper sense (reg 0x58) */
+
+ 0x0e, /* misc io12 (reg 0x59) */
+ 0x96, /* misc io34 (reg 0x5a) */
+ 0x01, /* misc io56 (reg 0x5b) */
+ 0, /* test mode ADC Output CODE MSB (reg 0x5c) */
+ 0, /* test mode ADC Output CODE LSB (reg 0x5d) */
+ 0, /* test mode (reg 0x5e) */
+ _LM9833,
+ MODEL_TSCAN_A4,
+ 1.5
+};
+
/** IRIScan/Q-Scan USB001 - Portable Peripheral Co., Ltd. */
static HWDef Hw0x0A53_0x1000 =
{
@@ -2648,6 +2739,7 @@ static SetDef Settings[] =
{"0x04A9-0x2220", &Cap0x04A9_0x2220, &Hw0x04A9_0x2220, "CanoScan LiDE25" },
/* SYSCAN... */
+ {"0x0A82-0x4600", &Cap0x0A82_0x4600, &Hw0x0A82_0x4600, "TravelScan 460/464" },
{"0x0A82-0x6620", &Cap0x0A82_0x6620, &Hw0x0A82_0x6620, "TravelScan 662" },
/* Portable Peripheral Co., Ltd. */
@@ -2872,6 +2964,20 @@ static ClkMotorDef Motors[] = {
{ 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0 },
},
+ { MODEL_TSCAN_A4, 2, 22, 6, 0, 0,
+ /* Motor settings (PWM and PWM_Duty) */
+ /* <=75dpi <=100dpi <=150dpi <=200dpi <=300dpi */
+ {{ 2, 22, 1 }, { 2, 22, 1 }, { 2, 22, 1 }, { 2, 22, 1 }, { 2, 22, 1 },
+ /* <=400dpi <=600dpi <=800dpi <=1200dpi <=2400dpi */
+ { 2, 22, 1 }, { 2, 22, 1 }, { 2, 22, 1 }, { 2, 22, 1 }, { 2, 22, 1 }},
+ /* Color mode MCLK settings */
+ { 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0 },
+ { 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0 },
+ /* Gray mode MCLK settings */
+ { 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0 },
+ { 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0, 16.0 },
+ },
+
{ MODEL_QSCAN, 8, 21, 6, 300, 4600,
/* Motor settings (PWM and PWM_Duty) */
/* <=75dpi <=100dpi <=150dpi <=200dpi <=300dpi */
diff --git a/doc/descriptions/plustek.desc b/doc/descriptions/plustek.desc
index 74c7e125e..5c8de4654 100644
--- a/doc/descriptions/plustek.desc
+++ b/doc/descriptions/plustek.desc
@@ -233,11 +233,26 @@
:mfg "Syscan"
:url "http://www.syscaninc.com/"
+:model "TravelScan 460/464"
+:interface "USB"
+:usbid "0x0a82" "0x4600"
+:status :complete
+
:model "TravelScan 662"
:interface "USB"
:usbid "0x0a82" "0x6620"
:status :complete
+;* SYSCAN *******************************************************************************************
+
+:mfg "Ambir"
+
+:model "Visigo A4"
+:interface "USB"
+:usbid "0x0a82" "0x4600"
+:status :complete
+:comment "Rebaged Travelscan 464"
+
;* Portable Peripheral Co., Ltd. ********************************************************************
:mfg "Portable Peripheral Co., Ltd."