mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

working 2400 dpi mode for LiDE 110

merge-requests/1/head
Stphane Voltz 2011-01-13 22:08:31 +01:00
rodzic 93998d5fe3
commit 53e28b3cd1
3 zmienionych plików z 17 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
backend/genesys_devices.c
Wyświetl plik

@ -526,12 +526,12 @@ static Genesys_Sensor Sensor[] = {
87, /* black pixels */ 87, /* black pixels */
16, /* dummy pixels 16 */ 16, /* dummy pixels 16 */
303, /* 303 */ 303, /* 303 */
5168*4, /* 10272*2 */ 5168*4,
210, 210,
200, 200,
{0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00},
/* reg 0x10 - 0x15 */ /* reg 0x10 - 0x15 : EXPR, EXPG and EXPB */
{0x00, 0x00, 0x00, 0x0f, 0x00, 0x80, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* reg 0x16 - 0x1d */ /* reg 0x16 - 0x1d */
0x10, 0x04, 0x00, 0x01, 0x30, 0x00, 0x02, 0x01 }, 0x10, 0x04, 0x00, 0x01, 0x30, 0x00, 0x02, 0x01 },
/* reg 0x52 - 0x5e */ /* reg 0x52 - 0x5e */
@ -1310,8 +1310,8 @@ static Genesys_Model canon_lide_110_model = {
GENESYS_GL124, GENESYS_GL124,
NULL, NULL,
{/*2400,*/ 1200, 600, /* 400,*/ 300, 150, 100, 75, 0}, /* possible x-resolutions */ {2400, 1200, 600, /* 400,*/ 300, 150, 100, 75, 0}, /* possible x-resolutions */
{/*2400,*/ 1200, 600, /* 400,*/ 300, 150, 100, 75, 0}, /* possible y-resolutions */ {2400, 1200, 600, /* 400,*/ 300, 150, 100, 75, 0}, /* possible y-resolutions */
{16, 8, 0}, /* possible depths in gray mode */ {16, 8, 0}, /* possible depths in gray mode */
{16, 8, 0}, /* possible depths in color mode */ {16, 8, 0}, /* possible depths in color mode */

18
backend/genesys_gl124.c
Wyświetl plik

@ -1050,7 +1050,8 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
if (flags & MOTOR_FLAG_AUTO_GO_HOME) if (flags & MOTOR_FLAG_AUTO_GO_HOME)
r->value |= REG02_AGOHOME; r->value |= REG02_AGOHOME;
if (flags & MOTOR_FLAG_DISABLE_BUFFER_FULL_MOVE) if ((flags & MOTOR_FLAG_DISABLE_BUFFER_FULL_MOVE)
||(yres>=dev->sensor.optical_res))
r->value |= REG02_ACDCDIS; r->value |= REG02_ACDCDIS;
/* SCANFED */ /* SCANFED */
@ -1209,20 +1210,20 @@ gl124_setup_sensor (Genesys_Device * dev, Genesys_Register_Set * regs, int dpi)
sanei_genesys_set_double(regs,REG_EXPDMY,sensor->expdummy); sanei_genesys_set_double(regs,REG_EXPDMY,sensor->expdummy);
/* if no calibration has been done, set default values for exposures */ /* if no calibration has been done, set default values for exposures */
sanei_genesys_get_triple(dev->reg,REG_EXPR,&exp); sanei_genesys_get_triple(regs,REG_EXPR,&exp);
if(exp==0) if(exp==0)
{ {
sanei_genesys_set_triple(dev->reg,REG_EXPR,sensor->expr); sanei_genesys_set_triple(regs,REG_EXPR,sensor->expr);
} }
sanei_genesys_get_triple(dev->reg,REG_EXPG,&exp); sanei_genesys_get_triple(regs,REG_EXPG,&exp);
if(exp==0) if(exp==0)
{ {
sanei_genesys_set_triple(dev->reg,REG_EXPG,sensor->expg); sanei_genesys_set_triple(regs,REG_EXPG,sensor->expg);
} }
sanei_genesys_get_triple(dev->reg,REG_EXPB,&exp); sanei_genesys_get_triple(regs,REG_EXPB,&exp);
if(exp==0) if(exp==0)
{ {
sanei_genesys_set_triple(dev->reg,REG_EXPB,sensor->expb); sanei_genesys_set_triple(regs,REG_EXPB,sensor->expb);
} }
sanei_genesys_set_triple(regs,REG_CK1MAP,sensor->ck1map); sanei_genesys_set_triple(regs,REG_CK1MAP,sensor->ck1map);
@ -1317,6 +1318,7 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
{ {
r->value |= REG01_DVDSET; r->value |= REG01_DVDSET;
} }
r->value &= ~REG01_SCAN;
r = sanei_genesys_get_address (reg, REG03); r = sanei_genesys_get_address (reg, REG03);
r->value &= ~REG03_AVEENB; r->value &= ~REG03_AVEENB;
@ -2811,7 +2813,7 @@ gl124_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
endpixel=segcnt; endpixel=segcnt;
} }
DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d, PIXELS=%d, SEGCNT=%d\n",__FUNCTION__,strpixel,endpixel,endpixel-strpixel,segcnt); DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d, PIXELS=%d, SEGCNT=%d\n",__FUNCTION__,strpixel,endpixel,endpixel-strpixel,segcnt);
/* turn pixel value into bytes 2x16 bits words */ /* turn pixel value into bytes 2x16 bits words */
strpixel*=2*2; /* 2 words of 2 bytes */ strpixel*=2*2; /* 2 words of 2 bytes */
endpixel*=2*2; endpixel*=2*2;

4
backend/genesys_gl124.h
Wyświetl plik

@ -625,7 +625,7 @@ static Sensor_Profile sensors[]={
{CIS_CANONLIDE110, 300, 5359, 0x1e, 0x9f, 0x55, 5168, 154, 101, 388, 574, 393, 0x00, 0x0a, 0x20, 0x21}, {CIS_CANONLIDE110, 300, 5359, 0x1e, 0x9f, 0x55, 5168, 154, 101, 388, 574, 393, 0x00, 0x0a, 0x20, 0x21},
{CIS_CANONLIDE110, 600, 5360, 0x1e, 0x9f, 0x55, 5168, 163, 101, 388, 574, 393, 0x00, 0x0a, 0x20, 0x21}, {CIS_CANONLIDE110, 600, 5360, 0x1e, 0x9f, 0x55, 5168, 163, 101, 388, 574, 393, 0x00, 0x0a, 0x20, 0x21},
{CIS_CANONLIDE110, 1200, 10528, 0x1e, 0x9f, 0x55, 5168, 163, 101, 388, 574, 393, 0x00, 0x08, 0x20, 0x22}, {CIS_CANONLIDE110, 1200, 10528, 0x1e, 0x9f, 0x55, 5168, 163, 101, 388, 574, 393, 0x00, 0x08, 0x20, 0x22},
{CIS_CANONLIDE110, 2400, 20864, 0x1e, 0x9f, 0x55, 5168, 163, 101, 388, 574, 393, 0x00, 0x06, 0x20, 0x24}, {CIS_CANONLIDE110, 2400, 20864, 0x1e, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, 0x00, 0x06, 0x20, 0x24},
/* {CIS_CANONLIDE110, 200, 2304, 0x1e, 0x9f, 0x55, 5168, 154, 101, 388, 574, 393, 0x00, 0x0a, 0x20, 0x21}, */ /* {CIS_CANONLIDE110, 200, 2304, 0x1e, 0x9f, 0x55, 5168, 154, 101, 388, 574, 393, 0x00, 0x0a, 0x20, 0x21}, */
}; };
@ -669,7 +669,7 @@ static Motor_Profile motors[]={
{MOTOR_CANONLIDE110, 5359, 0, lide110_alt}, {MOTOR_CANONLIDE110, 5359, 0, lide110_alt},
{MOTOR_CANONLIDE110, 5360, 1, lide110_alt}, {MOTOR_CANONLIDE110, 5360, 1, lide110_alt},
{MOTOR_CANONLIDE110, 10528, 1, lide110_slow}, {MOTOR_CANONLIDE110, 10528, 1, lide110_slow},
{MOTOR_CANONLIDE110, 20864, 3, lide110_max}, {MOTOR_CANONLIDE110, 20864, 2, lide110_max},
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */