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

enable warming up and calibration caching for HP3670

merge-requests/1/head
Stphane Voltz 2010-03-01 21:42:38 +01:00
rodzic 00da89b379
commit bc652842a5
3 zmienionych plików z 10 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
backend/genesys.c
Wyświetl plik

@ -1733,7 +1733,9 @@ sanei_genesys_search_reference_point (Genesys_Device * dev, uint8_t * data,
if ((dev->model->ccd_type == CCD_HP2300 if ((dev->model->ccd_type == CCD_HP2300
&& dev->model->motor_type == MOTOR_HP2300) && dev->model->motor_type == MOTOR_HP2300)
|| (dev->model->ccd_type == CCD_HP2400 || (dev->model->ccd_type == CCD_HP2400
&& dev->model->motor_type == MOTOR_HP2400)) && dev->model->motor_type == MOTOR_HP2400)
|| (dev->model->ccd_type == CCD_HP3670
&& dev->model->motor_type == MOTOR_HP3670))
{ {
top = 0; top = 0;
count = 0; count = 0;

3
backend/genesys_devices.c
Wyświetl plik

@ -981,6 +981,7 @@ Genesys_Model hp2400c_model = {
| GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_SKIP_WARMUP
| GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_STAGGERED_LINE
| GENESYS_FLAG_CUSTOM_GAMMA, | GENESYS_FLAG_CUSTOM_GAMMA,
GENESYS_HAS_COPY_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_SCAN_SW,
20, 20,
132 132
}; };
@ -1086,7 +1087,7 @@ static Genesys_Model hp3670c_model = {
| GENESYS_FLAG_XPA | GENESYS_FLAG_XPA
| GENESYS_FLAG_DARK_CALIBRATION | GENESYS_FLAG_DARK_CALIBRATION
| GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_OFFSET_CALIBRATION
| GENESYS_FLAG_SKIP_WARMUP /* | GENESYS_FLAG_SKIP_WARMUP */
| GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_STAGGERED_LINE
| GENESYS_FLAG_CUSTOM_GAMMA, | GENESYS_FLAG_CUSTOM_GAMMA,
GENESYS_HAS_COPY_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_SCAN_SW, GENESYS_HAS_COPY_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_SCAN_SW,

8
backend/genesys_gl646.c
Wyświetl plik

@ -4439,8 +4439,10 @@ gl646_init_regs_for_warmup (Genesys_Device * dev,
/* we are not going to move, so clear these bits */ /* we are not going to move, so clear these bits */
dev->reg[reg_0x02].value &= ~(REG02_FASTFED | REG02_AGOHOME); dev->reg[reg_0x02].value &= ~(REG02_FASTFED | REG02_AGOHOME);
/* don't enable gamma correction for this scan */ /* don't enable any correction for this scan */
dev->reg[reg_0x05].value &= ~REG05_GMMENB; dev->reg[reg_0x01].value &= ~REG01_DVDSET;
/* XXX STEF XXX
dev->reg[reg_0x05].value &= ~REG05_GMMENB; */
/* turn off motor during this scan */ /* turn off motor during this scan */
gl646_set_motor_power (local_reg, SANE_FALSE); gl646_set_motor_power (local_reg, SANE_FALSE);
@ -5304,7 +5306,7 @@ gl646_is_compatible_calibration (Genesys_Device * dev,
for_overwrite); for_overwrite);
/* calibration caching not supported yet for HP3670 */ /* calibration caching not supported yet for HP3670 */
if (cache == NULL || dev->model->ccd_type == CCD_HP3670 || dev->model->ccd_type == CCD_HP2400) if (cache == NULL || dev->model->ccd_type == CCD_HP2400)
return SANE_STATUS_UNSUPPORTED; return SANE_STATUS_UNSUPPORTED;
/* build minimal current_setup for calibration cache use only, it will be better /* build minimal current_setup for calibration cache use only, it will be better