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

gl847 exposure setting rework

merge-requests/1/head
Stphane Voltz 2011-02-06 08:50:57 +01:00
rodzic 1265e26d61
commit f3fa997d9b
3 zmienionych plików z 68 dodań i 58 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/genesys_devices.c
Wyświetl plik

@ -446,7 +446,7 @@ static Genesys_Sensor Sensor[] = {
200, 200,
{0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00},
/* reg 0x10 - 0x1d */ /* reg 0x10 - 0x1d */
{0x01, 0xc0, 0x01, 0xc0, 0x01, 0x40, /* EXPR/EXPG/EXPB */ {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* EXPR/EXPG/EXPB */
0x10, 0x08, 0x00, 0xff, 0x34, 0x00, 0x02, 0x04 }, 0x10, 0x08, 0x00, 0xff, 0x34, 0x00, 0x02, 0x04 },
/* reg 0x52 - 0x5e */ /* reg 0x52 - 0x5e */
{0x03, 0x07, {0x03, 0x07,

114
backend/genesys_gl847.c
Wyświetl plik

@ -386,21 +386,26 @@ gl847_setup_sensor (Genesys_Device * dev, Genesys_Register_Set * regs, int dpi)
sanei_genesys_set_reg_from_set(regs,REG_EXPDMY,(uint8_t)((sensor->expdummy) & 0xff)); sanei_genesys_set_reg_from_set(regs,REG_EXPDMY,(uint8_t)((sensor->expdummy) & 0xff));
/* 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_double(dev->reg,REG_EXPR,&exp); exp=dev->sensor.regs_0x10_0x1d[0]*256+dev->sensor.regs_0x10_0x1d[1];
if(exp==0) if(exp==0)
{ {
sanei_genesys_set_double(dev->reg,REG_EXPR,sensor->expr); exp=sensor->expr;
} }
sanei_genesys_get_double(dev->reg,REG_EXPG,&exp); sanei_genesys_set_double(regs,REG_EXPR,exp);
exp=dev->sensor.regs_0x10_0x1d[2]*256+dev->sensor.regs_0x10_0x1d[3];
if(exp==0) if(exp==0)
{ {
sanei_genesys_set_double(dev->reg,REG_EXPG,sensor->expg); exp=sensor->expg;
} }
sanei_genesys_get_double(dev->reg,REG_EXPB,&exp); sanei_genesys_set_double(regs,REG_EXPG,exp);
exp=dev->sensor.regs_0x10_0x1d[4]*256+dev->sensor.regs_0x10_0x1d[5];
if(exp==0) if(exp==0)
{ {
sanei_genesys_set_double(dev->reg,REG_EXPB,sensor->expb); exp=sensor->expb;
} }
sanei_genesys_set_double(regs,REG_EXPB,exp);
sanei_genesys_set_triple(regs,REG_CK1MAP,sensor->ck1map); sanei_genesys_set_triple(regs,REG_CK1MAP,sensor->ck1map);
sanei_genesys_set_triple(regs,REG_CK3MAP,sensor->ck3map); sanei_genesys_set_triple(regs,REG_CK3MAP,sensor->ck3map);
@ -443,17 +448,22 @@ gl847_init_registers (Genesys_Device * dev)
SETREG (0x0a, 0x00); SETREG (0x0a, 0x00);
SETREG (0x0b, 0x01); SETREG (0x0b, 0x01);
SETREG (0x0c, 0x02); SETREG (0x0c, 0x02);
/* SETREG (0x0d, REG0D_CLRMCNT); */
/* LED exposures */
SETREG (0x10, 0x00); SETREG (0x10, 0x00);
SETREG (0x11, 0x00); SETREG (0x11, 0x00);
SETREG (0x12, 0x00); SETREG (0x12, 0x00);
SETREG (0x13, 0x00); SETREG (0x13, 0x00);
SETREG (0x14, 0x00); SETREG (0x14, 0x00);
SETREG (0x15, 0x00); SETREG (0x15, 0x00);
SETREG (0x16, 0x10); SETREG (0x16, 0x10);
SETREG (0x17, 0x08); SETREG (0x17, 0x08);
SETREG (0x18, 0x00); SETREG (0x18, 0x00);
/* EXPDMY */
SETREG (0x19, 0x50); SETREG (0x19, 0x50);
SETREG (0x1a, 0x34); SETREG (0x1a, 0x34);
SETREG (0x1b, 0x00); SETREG (0x1b, 0x00);
SETREG (0x1c, 0x02); SETREG (0x1c, 0x02);
@ -2171,38 +2181,17 @@ static void
gl847_set_lamp_power (Genesys_Device * dev, gl847_set_lamp_power (Genesys_Device * dev,
Genesys_Register_Set * regs, SANE_Bool set) Genesys_Register_Set * regs, SANE_Bool set)
{ {
Genesys_Register_Set *r;
int i;
if (set) if (set)
{ {
sanei_genesys_set_reg_from_set (regs, 0x03, sanei_genesys_set_reg_from_set (regs, REG03,
sanei_genesys_read_reg_from_set (regs, sanei_genesys_read_reg_from_set (regs, REG03)
0x03)
| REG03_LAMPPWR); | REG03_LAMPPWR);
for (i = 0; i < 6; i++)
{
r = sanei_genesys_get_address (dev->calib_reg, 0x10+i);
r->value = dev->sensor.regs_0x10_0x1d[i];
}
r = sanei_genesys_get_address (regs, 0x19);
r->value = 0x50;
} }
else else
{ {
sanei_genesys_set_reg_from_set (regs, 0x03, sanei_genesys_set_reg_from_set (regs, REG03,
sanei_genesys_read_reg_from_set (regs, sanei_genesys_read_reg_from_set (regs, REG03)
0x03)
& ~REG03_LAMPPWR); & ~REG03_LAMPPWR);
for (i = 0; i < 6; i++)
{
r = sanei_genesys_get_address (dev->calib_reg, 0x10+i);
r->value = 0x00;
}
r = sanei_genesys_get_address (regs, 0x19);
r->value = 0xff;
} }
} }
@ -2793,6 +2782,13 @@ gl847_feed (Genesys_Device * dev, int steps)
gl847_init_optical_regs_off (dev, local_reg); gl847_init_optical_regs_off (dev, local_reg);
gl847_init_motor_regs (dev, local_reg, steps, MOTOR_ACTION_FEED, 0); gl847_init_motor_regs (dev, local_reg, steps, MOTOR_ACTION_FEED, 0);
sanei_genesys_set_double(local_reg,REG_EXPR,0);
sanei_genesys_set_double(local_reg,REG_EXPG,0);
sanei_genesys_set_double(local_reg,REG_EXPB,0);
/* clear scan and feed count */
RIE (sanei_genesys_write_register (dev, REG0D, REG0D_CLRLNCNT));
RIE (sanei_genesys_write_register (dev, REG0D, REG0D_CLRMCNT));
status = gl847_bulk_write_register (dev, local_reg, GENESYS_GL847_MAX_REGS); status = gl847_bulk_write_register (dev, local_reg, GENESYS_GL847_MAX_REGS);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
@ -2927,6 +2923,12 @@ gl847_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
GENESYS_GL847_MAX_REGS * sizeof (Genesys_Register_Set)); GENESYS_GL847_MAX_REGS * sizeof (Genesys_Register_Set));
gl847_init_optical_regs_off (dev, local_reg); gl847_init_optical_regs_off (dev, local_reg);
sanei_genesys_set_double(local_reg,REG_EXPR,0);
sanei_genesys_set_double(local_reg,REG_EXPG,0);
sanei_genesys_set_double(local_reg,REG_EXPB,0);
/* clear scan and feed count */
RIE (sanei_genesys_write_register (dev, REG0D, REG0D_CLRLNCNT | REG0D_CLRMCNT));
gl847_init_motor_regs (dev, local_reg, 65536, MOTOR_ACTION_GO_HOME, 0); gl847_init_motor_regs (dev, local_reg, 65536, MOTOR_ACTION_GO_HOME, 0);
@ -3517,16 +3519,18 @@ gl847_led_calibration (Genesys_Device * dev)
int turn; int turn;
char fn[20]; char fn[20];
uint16_t expr, expg, expb; uint16_t expr, expg, expb;
Sensor_Profile *sensor;
Genesys_Register_Set *r; Genesys_Register_Set *r;
SANE_Bool acceptable = SANE_FALSE; SANE_Bool acceptable = SANE_FALSE;
DBG (DBG_proc, "gl847_led_calibration\n"); DBGSTART;
/* offset calibration is always done in color mode */ /* offset calibration is always done in color mode */
channels = 3; channels = 3;
depth=16; depth=16;
used_res = dev->sensor.optical_res; used_res=sanei_genesys_compute_dpihw(dev,dev->settings.xres);
sensor=get_sensor_profile(dev->model->ccd_type, used_res);
num_pixels = (dev->sensor.sensor_pixels*used_res)/dev->sensor.optical_res; num_pixels = (dev->sensor.sensor_pixels*used_res)/dev->sensor.optical_res;
/* initial calibration reg values */ /* initial calibration reg values */
@ -3576,27 +3580,20 @@ gl847_led_calibration (Genesys_Device * dev)
adjust exposure times adjust exposure times
*/ */
expr = (dev->sensor.regs_0x10_0x1d[0] << 8) | dev->sensor.regs_0x10_0x1d[1]; expr=sensor->expr;
expg = (dev->sensor.regs_0x10_0x1d[2] << 8) | dev->sensor.regs_0x10_0x1d[3]; expg=sensor->expg;
expb = (dev->sensor.regs_0x10_0x1d[4] << 8) | dev->sensor.regs_0x10_0x1d[5]; expb=sensor->expb;
turn = 0; turn = 0;
/* no move during led calibration */
r = sanei_genesys_get_address (dev->calib_reg, REG02);
r->value &= ~REG02_MTRPWR;
do do
{ {
sanei_genesys_set_double(dev->calib_reg,REG_EXPR,expr);
dev->sensor.regs_0x10_0x1d[0] = (expr >> 8) & 0xff; sanei_genesys_set_double(dev->calib_reg,REG_EXPG,expg);
dev->sensor.regs_0x10_0x1d[1] = expr & 0xff; sanei_genesys_set_double(dev->calib_reg,REG_EXPB,expb);
dev->sensor.regs_0x10_0x1d[2] = (expg >> 8) & 0xff;
dev->sensor.regs_0x10_0x1d[3] = expg & 0xff;
dev->sensor.regs_0x10_0x1d[4] = (expb >> 8) & 0xff;
dev->sensor.regs_0x10_0x1d[5] = expb & 0xff;
for (i = 0; i < 6; i++)
{
r = sanei_genesys_get_address (dev->calib_reg, 0x10+i);
r->value = dev->sensor.regs_0x10_0x1d[i];
}
RIE (gl847_bulk_write_register RIE (gl847_bulk_write_register
(dev, dev->calib_reg, GENESYS_GL847_MAX_REGS)); (dev, dev->calib_reg, GENESYS_GL847_MAX_REGS));
@ -3632,6 +3629,7 @@ gl847_led_calibration (Genesys_Device * dev)
avg[j] /= num_pixels; avg[j] /= num_pixels;
} }
avga = (avg[0] + avg[1] + avg[2]) / 3;
DBG (DBG_info, "gl847_led_calibration: average: " DBG (DBG_info, "gl847_led_calibration: average: "
"%d,%d,%d\n", avg[0], avg[1], avg[2]); "%d,%d,%d\n", avg[0], avg[1], avg[2]);
@ -3645,7 +3643,6 @@ gl847_led_calibration (Genesys_Device * dev)
if (!acceptable) if (!acceptable)
{ {
avga = (avg[0] + avg[1] + avg[2]) / 3;
expr = (expr * avga) / avg[0]; expr = (expr * avga) / avg[0];
expg = (expg * avga) / avg[1]; expg = (expg * avga) / avg[1];
expb = (expb * avga) / avg[2]; expb = (expb * avga) / avg[2];
@ -3684,6 +3681,19 @@ gl847_led_calibration (Genesys_Device * dev)
DBG (DBG_info, "gl847_led_calibration: acceptable exposure: %d,%d,%d\n", DBG (DBG_info, "gl847_led_calibration: acceptable exposure: %d,%d,%d\n",
expr, expg, expb); expr, expg, expb);
/* set these values as final ones for scan */
sanei_genesys_set_double(dev->reg,REG_EXPR,expr);
sanei_genesys_set_double(dev->reg,REG_EXPG,expg);
sanei_genesys_set_double(dev->reg,REG_EXPB,expb);
/* store in this struct since it is the one used by cache calibration */
dev->sensor.regs_0x10_0x1d[0] = (expr >> 8) & 0xff;
dev->sensor.regs_0x10_0x1d[1] = expr & 0xff;
dev->sensor.regs_0x10_0x1d[2] = (expg >> 8) & 0xff;
dev->sensor.regs_0x10_0x1d[3] = expg & 0xff;
dev->sensor.regs_0x10_0x1d[4] = (expb >> 8) & 0xff;
dev->sensor.regs_0x10_0x1d[5] = expb & 0xff;
/* cleanup before return */ /* cleanup before return */
free (line); free (line);
@ -3734,7 +3744,7 @@ gl847_init_regs_for_warmup (Genesys_Device * dev,
int *channels, int *total_size) int *channels, int *total_size)
{ {
DBG (DBG_proc, "%s: not implemented \n", __FUNCTION__); DBG (DBG_proc, "%s: not implemented \n", __FUNCTION__);
return SANE_STATUS_GOOD; return SANE_STATUS_INVAL;
} }
static SANE_Status static SANE_Status

10
backend/genesys_gl847.h
Wyświetl plik

@ -314,7 +314,7 @@
#define REG_EXPR 0x10 #define REG_EXPR 0x10
#define REG_EXPG 0x12 #define REG_EXPG 0x12
#define REG_EXPB 0x14 #define REG_EXPB 0x14
#define REG_EXPDMY 0x34 #define REG_EXPDMY 0x19
#define REG_CK1MAP 0x74 #define REG_CK1MAP 0x74
#define REG_CK3MAP 0x77 #define REG_CK3MAP 0x77
#define REG_CK4MAP 0x7a #define REG_CK4MAP 0x7a
@ -543,9 +543,9 @@ static Sensor_Profile sensors[]={
{CIS_CANONLIDE200, 150, 2848, 240, 636, 340, 5144, 0, 255, 637, 637, 637}, {CIS_CANONLIDE200, 150, 2848, 240, 636, 340, 5144, 0, 255, 637, 637, 637},
{CIS_CANONLIDE200, 300, 1424, 240, 636, 340, 5144, 0, 255, 637, 637, 637}, {CIS_CANONLIDE200, 300, 1424, 240, 636, 340, 5144, 0, 255, 637, 637, 637},
*/ */
{CIS_CANONLIDE200, 600, 1432, 240, 636, 340, 5144, 255, 410, 275, 203}, {CIS_CANONLIDE200, 600, 1432, 60, 159, 85, 5144, 255, 410, 275, 203},
{CIS_CANONLIDE200, 1200, 2712, 240, 636, 340, 5144, 255, 746, 478, 353}, {CIS_CANONLIDE200, 1200, 2712, 60, 159, 85, 5144, 255, 746, 478, 353},
{CIS_CANONLIDE200, 2400, 5280, 240, 636, 340, 5144, 255, 1417, 909, 643}, {CIS_CANONLIDE200, 2400, 5280, 60, 159, 85, 5144, 255, 1417, 909, 643},
{CIS_CANONLIDE200, 4800, 10416, 240, 636, 340, 5144, 255, 2692, 1728, 1221}, {CIS_CANONLIDE200, 4800, 10416, 60, 159, 85, 5144, 255, 2692, 1728, 1221},
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */