diff --git a/backend/genesys_devices.c b/backend/genesys_devices.c index f86bc5d9b..130a9a314 100644 --- a/backend/genesys_devices.c +++ b/backend/genesys_devices.c @@ -181,6 +181,14 @@ static Genesys_Frontend Wolfson[] = { , {0x00, 0x00, 0x00} } , + {DAC_CANONLIDE120, + {0x80, 0x8a, 0x23, 0x4c} + , {0x00, 0xca, 0x94} + , {0x00, 0x00, 0x00} + , {0x00, 0x00, 0x00} + , {0x00, 0x00, 0x00} + } + , {DAC_PLUSTEK_3600, {0x70, 0x80, 0x00, 0x00} , {0x00, 0x00, 0x00} @@ -951,6 +959,12 @@ static Genesys_Gpo Gpo[] = { {0xff, 0x00}, } , + /* CANONLIDE120 */ + {GPO_CANONLIDE120, + {0xfb, 0x20}, + {0xff, 0x00}, + } + , /* CANONLIDE210 */ {GPO_CANONLIDE210, {0xfb, 0x20}, @@ -1291,6 +1305,17 @@ static Genesys_Motor Motor[] = { }, }, }, + {MOTOR_CANONLIDE120, /* Canon LiDE 120 */ + 4800, + 9600, + 1, /* maximum step type count */ + 1, /* maximum power modes count */ + { /* motor slopes */ + { /* power mode 0 */ + { 3000, 1000, 256, 0.50}, /* full step */ + }, + }, + }, {MOTOR_CANONLIDE210, /* Canon LiDE 210 */ 4800, 9600, @@ -1940,10 +1965,11 @@ static Genesys_Model canon_lide_120_model = { SANE_TRUE, /* Is this a CIS scanner? */ SANE_FALSE, /* Is this a sheetfed scanner? */ CIS_CANONLIDE120, - DAC_CANONLIDE110, - GPO_CANONLIDE110, - MOTOR_CANONLIDE110, + DAC_CANONLIDE120, + GPO_CANONLIDE120, + MOTOR_CANONLIDE120, GENESYS_FLAG_SKIP_WARMUP + | GENESYS_FLAG_NO_CALIBRATION | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_DARK_CALIBRATION | GENESYS_FLAG_HALF_CCD_MODE diff --git a/backend/genesys_gl124.c b/backend/genesys_gl124.c index ae3e80368..e065a94e8 100644 --- a/backend/genesys_gl124.c +++ b/backend/genesys_gl124.c @@ -1,6 +1,6 @@ /* sane - Scanner Access Now Easy. - Copyright (C) 2010-2013 Stéphane Voltz + Copyright (C) 2010-2016 Stéphane Voltz This file is part of the SANE package. diff --git a/backend/genesys_gl124.h b/backend/genesys_gl124.h index 67a5c0d06..52932c48e 100644 --- a/backend/genesys_gl124.h +++ b/backend/genesys_gl124.h @@ -1,6 +1,6 @@ /* sane - Scanner Access Now Easy. - Copyright (C) 2010-2013 Stéphane Voltz + Copyright (C) 2010-2016 Stéphane Voltz This file is part of the SANE package. @@ -660,6 +660,10 @@ static Motor_Profile motors[]={ {MOTOR_CANONLIDE110, 5360, 0, lide110_ok}, {MOTOR_CANONLIDE110, 10528, 1, lide110_slow}, {MOTOR_CANONLIDE110, 20864, 2, lide110_max}, + {MOTOR_CANONLIDE120, 2768, 0, lide210_fast}, + {MOTOR_CANONLIDE120, 5360, 0, lide110_ok}, + {MOTOR_CANONLIDE120, 10528, 1, lide110_slow}, + {MOTOR_CANONLIDE120, 20864, 2, lide110_max}, {MOTOR_CANONLIDE210, 2768, 0, lide210_fast}, {MOTOR_CANONLIDE210, 5360, 0, lide110_ok}, {MOTOR_CANONLIDE210, 10528, 1, lide110_slow}, diff --git a/backend/genesys_low.h b/backend/genesys_low.h index b1677dfca..07da5cb5d 100644 --- a/backend/genesys_low.h +++ b/backend/genesys_low.h @@ -352,6 +352,7 @@ Genesys_Color_Order; #define DAC_IMG101 18 #define DAC_PLUSTEK3800 19 #define DAC_CANONLIDE80 20 +#define DAC_CANONLIDE120 21 #define CCD_UMAX 0 #define CCD_ST12 1 /* SONY ILX548: 5340 Pixel ??? */ @@ -410,6 +411,7 @@ Genesys_Color_Order; #define GPO_IMG101 22 #define GPO_PLUSTEK3800 23 #define GPO_CANONLIDE80 24 +#define GPO_CANONLIDE120 25 #define MOTOR_UMAX 0 #define MOTOR_5345 1 @@ -435,6 +437,7 @@ Genesys_Color_Order; #define MOTOR_PLUSTEK3800 22 #define MOTOR_CANONLIDE210 23 #define MOTOR_CANONLIDE80 24 +#define MOTOR_CANONLIDE120 25 /* Forward typedefs */