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

Improve offset/gain/led calibration

merge-requests/1/head
Pierre Willenbrock 2009-10-09 22:50:11 +02:00 zatwierdzone przez Stphane Voltz
rodzic 95434c1f0a
commit aba391f159
1 zmienionych plików z 8 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
backend/genesys_gl841.c
Wyświetl plik

@ -4935,7 +4935,7 @@ gl841_offset_calibration (Genesys_Device * dev)
int turn; int turn;
char fn[20]; char fn[20];
SANE_Bool acceptable = SANE_FALSE; SANE_Bool acceptable = SANE_FALSE;
int mintgt = 0x2000; int mintgt = 0x400;
DBG (DBG_proc, "gl841_offset_calibration\n"); DBG (DBG_proc, "gl841_offset_calibration\n");
@ -4957,7 +4957,8 @@ gl841_offset_calibration (Genesys_Device * dev)
SCAN_FLAG_DISABLE_GAMMA | SCAN_FLAG_DISABLE_GAMMA |
SCAN_FLAG_SINGLE_LINE | SCAN_FLAG_SINGLE_LINE |
SCAN_FLAG_IGNORE_LINE_DISTANCE | SCAN_FLAG_IGNORE_LINE_DISTANCE |
SCAN_FLAG_USE_OPTICAL_RES SCAN_FLAG_USE_OPTICAL_RES |
SCAN_FLAG_DISABLE_LAMP
); );
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
@ -4986,7 +4987,7 @@ gl841_offset_calibration (Genesys_Device * dev)
/* scan first line of data with no offset nor gain */ /* scan first line of data with no offset nor gain */
/*WM8199: gain=0.73; offset=-260mV*/ /*WM8199: gain=0.73; offset=-260mV*/
/*okay. the sensor black level is now at -260V. we only get 0 from AFE...*/ /*okay. the sensor black level is now at -260mV. we only get 0 from AFE...*/
/* we should probably do real calibration here: /* we should probably do real calibration here:
* -detect acceptable offset with binary search * -detect acceptable offset with binary search
* -calculate offset from this last version * -calculate offset from this last version
@ -5123,7 +5124,7 @@ gl841_offset_calibration (Genesys_Device * dev)
val = val =
first_line[i * 2 * channels + 2 * j + 1] * 256 + first_line[i * 2 * channels + 2 * j + 1] * 256 +
first_line[i * 2 * channels + 2 * j]; first_line[i * 2 * channels + 2 * j];
if (min1[j] > val) if (min1[j] > val && val >= 10)
min1[j] = val; min1[j] = val;
} }
} }
@ -5241,7 +5242,7 @@ gl841_offset_calibration (Genesys_Device * dev)
val = val =
second_line[i * 2 * channels + 2 * j + 1] * 256 + second_line[i * 2 * channels + 2 * j + 1] * 256 +
second_line[i * 2 * channels + 2 * j]; second_line[i * 2 * channels + 2 * j];
if (min2[j] > val) if (min2[j] > val && val != 0)
min2[j] = val; min2[j] = val;
} }
} }
@ -5280,7 +5281,7 @@ gl841_offset_calibration (Genesys_Device * dev)
else else
off[j] = 0xffff; off[j] = 0xffff;
} else } else
off[j] = -(mintgt * (off1[j] - off2[j]) + min2[j] * off1[j] - min1[j] * off2[j])/(min2[j]-min1[j]); off[j] = (mintgt * (off1[j] - off2[j]) + min1[j] * off2[j] - min2[j] * off1[j])/(min1[j]-min2[j]);
if (off[j] > 255) if (off[j] > 255)
off[j] = 255; off[j] = 255;
if (off[j] < 0) if (off[j] < 0)