kopia lustrzana https://gitlab.com/sane-project/backends
*** empty log message ***
rodzic
3bd921ab97
commit
7d13614480
|
@ -1,3 +1,10 @@
|
|||
2003-01-31 Gerhard Jaeger <gerhard@gjaeger.de>
|
||||
* doc/plustek/Plustek-USB.txt: Added comment about scanner.o
|
||||
* backend/plustek.c backend/plustek-devs.c backend/plustek-usb.h
|
||||
backend/plustek-usbshading.c: Fixed major bug, that avoid proper
|
||||
shading on CCD-devices like HP 2200C. Fixed also CanoScan 1220
|
||||
settings, as the current ones didn't work
|
||||
|
||||
2003-01-30 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
|
||||
* doc/descriptions/unsupported.desc: Added Canon, Fijitsu and Prolink
|
||||
|
|
|
@ -490,7 +490,7 @@ static DCapsDef Cap0x03F0_0x0505 =
|
|||
static DCapsDef Cap0x03F0_0x0605 =
|
||||
{
|
||||
/* DataOrigin (x, y), ShadingOriginY */
|
||||
{{ 0, 209}, 20, -1, {2550, 3508 }, { 50, 50}, COLOR_BW },
|
||||
{{ 0, 209}, 0, -1, {2550, 3508 }, { 50, 50}, COLOR_BW },
|
||||
{{ 0, 0}, 0, -1, {0, 0}, { 0, 0 }, 0 }, /* No film scanner module */
|
||||
{{ 0, 0}, 0, -1, {0, 0}, { 0, 0 }, 0 }, /* No film scanner module */
|
||||
{{ 0, 0}, 0, -1, {0, 0}, { 0, 0 }, 0 }, /* No ADF */
|
||||
|
@ -1921,8 +1921,8 @@ static HWDef Hw0x04A9_0x2207_0 =
|
|||
|
||||
0x00, /* bReg 0x27 color mode */
|
||||
2, /* bReg 0x29 illumination mode */
|
||||
{ 3, 0, 0, 23, 3472, 0, 0 },
|
||||
{ 2, 23, 8870, 23, 5055, 23, 2828 },
|
||||
{ 3, 0, 0, 23, 3937, 0, 0 },
|
||||
{ 2, 23, 12000, 23, 5500, 23, 3900 },
|
||||
|
||||
1, /* StepperPhaseCorrection (reg 0x1a + 0x1b) */
|
||||
0, /* bOpticBlackStart (reg 0x1c) */
|
||||
|
@ -1955,7 +1955,7 @@ static HWDef Hw0x04A9_0x2207_0 =
|
|||
0, /* test mode ADC Output CODE LSB (reg 0x5d) */
|
||||
0, /* test mode (reg 0x5e) */
|
||||
_LM9832,
|
||||
MODEL_CANON1220
|
||||
MODEL_CANON1200
|
||||
};
|
||||
|
||||
/** Canon 670/676/LiDE20 */
|
||||
|
@ -2092,7 +2092,7 @@ static HWDef Hw0x04A9_0x220E_0 =
|
|||
0, /* test mode ADC Output CODE LSB (reg 0x5d) */
|
||||
0, /* test mode (reg 0x5e) */
|
||||
_LM9833,
|
||||
MODEL_CANON1240
|
||||
MODEL_CANON1200
|
||||
};
|
||||
|
||||
/******************** all available combinations *****************************/
|
||||
|
@ -2286,23 +2286,7 @@ static ClkMotorDef Motors[] = {
|
|||
{ 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0 }
|
||||
},
|
||||
|
||||
{ MODEL_CANON1220, 8, 51, 6,
|
||||
/* Motor settings (PWM and PWM_Duty) */
|
||||
/* <=75dpi <=100dpi <=150dpi <=200dpi <=300dpi */
|
||||
{{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 },
|
||||
|
||||
/* <=400dpi <=600dpi <=800dpi <=1200dpi <=2400dpi */
|
||||
{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }},
|
||||
/* Color mode MCLK settings */
|
||||
{ 6.0, 6.0, 3.0, 3.0, 6.0, 6.0, 6.0, 6.0, 2.5, 6.0 },
|
||||
{ 6.0, 6.0, 3.0, 3.0, 6.0, 6.0, 6.0, 6.0, 2.5, 6.0 },
|
||||
|
||||
/* Gray mode MCLK settings */
|
||||
{ 18.0, 15.0, 12.0, 12.0, 9.5, 6.5, 6.0, 6.0, 6.0, 6.0 },
|
||||
{ 18.0, 15.0, 12.0, 12.0, 9.5, 6.5, 6.0, 6.0, 6.0, 6.0 }
|
||||
},
|
||||
|
||||
{ MODEL_CANON1240, 8, 51, 3,
|
||||
{ MODEL_CANON1200, 8, 51, 3,
|
||||
/* Motor settings (PWM and PWM_Duty) */
|
||||
/* <=75dpi <=100dpi <=150dpi <=200dpi <=300dpi */
|
||||
{{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 },
|
||||
|
|
|
@ -244,8 +244,7 @@ typedef enum
|
|||
MODEL_MUSTEK1200, /**< for BearPaw 2400 */
|
||||
MODEL_HP, /**< for HP2x00 */
|
||||
MODEL_CANON600 , /**< for CanoScan 600dpi models */
|
||||
MODEL_CANON1220, /**< for Canon N1220U */
|
||||
MODEL_CANON1240, /**< for Canon N1240U */
|
||||
MODEL_CANON1200, /**< for Canon 1200dpi models */
|
||||
MODEL_UMAX, /**< for UMAX 3400/3450 */
|
||||
MODEL_LAST
|
||||
} eModelDef;
|
||||
|
|
|
@ -764,9 +764,11 @@ TOGAIN:
|
|||
tmp.Red, tmp.Red, tmp.Green, tmp.Green, tmp.Blue, tmp.Blue);
|
||||
|
||||
m_dwIdealGain = IDEAL_GainNormal;
|
||||
m_dwIdealGain = 0xff00;
|
||||
/* min(min(rgb.wRed, rgb.wGreen), rgb.wBlue) */
|
||||
|
||||
if( hw->bReg_0x26 & _ONE_CH_COLOR )
|
||||
m_dwIdealGain = 0xff00;
|
||||
|
||||
a_bRegs[0x3b] = usb_GetNewGain( tmp.Red );
|
||||
a_bRegs[0x3c] = usb_GetNewGain( tmp.Green );
|
||||
a_bRegs[0x3d] = usb_GetNewGain( tmp.Blue );
|
||||
|
|
|
@ -130,7 +130,7 @@
|
|||
#include "sane/sanei.h"
|
||||
#include "sane/saneopts.h"
|
||||
|
||||
#define BACKEND_VERSION "0.45-3"
|
||||
#define BACKEND_VERSION "0.45-4"
|
||||
#define BACKEND_NAME plustek
|
||||
#include "sane/sanei_backend.h"
|
||||
#include "sane/sanei_config.h"
|
||||
|
|
|
@ -184,7 +184,11 @@ This is it...
|
|||
Autoloading scanner.o
|
||||
---------------------
|
||||
|
||||
boot.local
|
||||
To perform an automatic load of the scanner module, you might add the modprobe
|
||||
line to your boot.local file.
|
||||
i.e. on SuSE system > 7.x
|
||||
/etc/init.d/boot.local
|
||||
An alternative way is to use the hotplug utilities.
|
||||
|
||||
|
||||
Debugging your USB scanner (written by Kev Green)
|
||||
|
|
Ładowanie…
Reference in New Issue