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

genesys: Remove no longer used ccd_start_xoffset

merge-requests/213/head^2
Povilas Kanapickas 2020-04-13 07:23:43 +03:00
rodzic 87f5637a47
commit 922cabc0be
4 zmienionych plików z 0 dodań i 46 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
backend/genesys/sensor.cpp
Wyświetl plik

@ -133,7 +133,6 @@ std::ostream& operator<<(std::ostream& out, const Genesys_Sensor& sensor)
<< " output_pixel_offset: " << sensor.output_pixel_offset << '\n' << " output_pixel_offset: " << sensor.output_pixel_offset << '\n'
<< " black_pixels: " << sensor.black_pixels << '\n' << " black_pixels: " << sensor.black_pixels << '\n'
<< " dummy_pixel: " << sensor.dummy_pixel << '\n' << " dummy_pixel: " << sensor.dummy_pixel << '\n'
<< " ccd_start_xoffset: " << sensor.ccd_start_xoffset << '\n'
<< " fau_gain_white_ref: " << sensor.fau_gain_white_ref << '\n' << " fau_gain_white_ref: " << sensor.fau_gain_white_ref << '\n'
<< " gain_white_ref: " << sensor.gain_white_ref << '\n' << " gain_white_ref: " << sensor.gain_white_ref << '\n'
<< " exposure: " << format_indent_braced_list(4, sensor.exposure) << '\n' << " exposure: " << format_indent_braced_list(4, sensor.exposure) << '\n'

4
backend/genesys/sensor.h
Wyświetl plik

@ -296,8 +296,6 @@ struct Genesys_Sensor {
int black_pixels = 0; int black_pixels = 0;
// value of the dummy register // value of the dummy register
int dummy_pixel = 0; int dummy_pixel = 0;
// last pixel of CCD margin at optical resolution
int ccd_start_xoffset = 0;
// TA CCD target code (reference gain) // TA CCD target code (reference gain)
int fau_gain_white_ref = 0; int fau_gain_white_ref = 0;
// CCD target code (reference gain) // CCD target code (reference gain)
@ -371,7 +369,6 @@ struct Genesys_Sensor {
output_pixel_offset == other.output_pixel_offset && output_pixel_offset == other.output_pixel_offset &&
black_pixels == other.black_pixels && black_pixels == other.black_pixels &&
dummy_pixel == other.dummy_pixel && dummy_pixel == other.dummy_pixel &&
ccd_start_xoffset == other.ccd_start_xoffset &&
fau_gain_white_ref == other.fau_gain_white_ref && fau_gain_white_ref == other.fau_gain_white_ref &&
gain_white_ref == other.gain_white_ref && gain_white_ref == other.gain_white_ref &&
exposure == other.exposure && exposure == other.exposure &&
@ -401,7 +398,6 @@ void serialize(Stream& str, Genesys_Sensor& x)
serialize(str, x.pixel_count_ratio); serialize(str, x.pixel_count_ratio);
serialize(str, x.black_pixels); serialize(str, x.black_pixels);
serialize(str, x.dummy_pixel); serialize(str, x.dummy_pixel);
serialize(str, x.ccd_start_xoffset);
serialize(str, x.fau_gain_white_ref); serialize(str, x.fau_gain_white_ref);
serialize(str, x.gain_white_ref); serialize(str, x.gain_white_ref);
serialize_newline(str); serialize_newline(str);

40
backend/genesys/tables_sensor.cpp
Wyświetl plik

@ -100,7 +100,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 1200; sensor.optical_res = 1200;
sensor.black_pixels = 48; sensor.black_pixels = 48;
sensor.dummy_pixel = 64; sensor.dummy_pixel = 64;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -144,7 +143,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 600; sensor.optical_res = 600;
sensor.black_pixels = 48; sensor.black_pixels = 48;
sensor.dummy_pixel = 85; sensor.dummy_pixel = 85;
sensor.ccd_start_xoffset = 152;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -186,7 +184,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 1200; sensor.optical_res = 1200;
sensor.black_pixels = 48; sensor.black_pixels = 48;
sensor.dummy_pixel = 64; sensor.dummy_pixel = 64;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -231,7 +228,6 @@ void genesys_init_sensor_tables()
sensor.ccd_size_divisor = 2; sensor.ccd_size_divisor = 2;
sensor.black_pixels = 48; sensor.black_pixels = 48;
sensor.dummy_pixel = 16; sensor.dummy_pixel = 16;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 190; sensor.fau_gain_white_ref = 190;
sensor.gain_white_ref = 190; sensor.gain_white_ref = 190;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -361,7 +357,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 1200; sensor.optical_res = 1200;
sensor.black_pixels = 48; sensor.black_pixels = 48;
sensor.dummy_pixel = 15; sensor.dummy_pixel = 15;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -463,7 +458,6 @@ void genesys_init_sensor_tables()
sensor.ccd_size_divisor = 2; sensor.ccd_size_divisor = 2;
sensor.black_pixels = 48; sensor.black_pixels = 48;
sensor.dummy_pixel = 20; sensor.dummy_pixel = 20;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 180; sensor.fau_gain_white_ref = 180;
sensor.gain_white_ref = 180; sensor.gain_white_ref = 180;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -548,7 +542,6 @@ void genesys_init_sensor_tables()
sensor.ccd_size_divisor = 2; sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87; sensor.black_pixels = 87;
sensor.dummy_pixel = 87; sensor.dummy_pixel = 87;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 0; sensor.fau_gain_white_ref = 0;
sensor.gain_white_ref = 0; sensor.gain_white_ref = 0;
sensor.exposure = { 0x0400, 0x0400, 0x0400 }; sensor.exposure = { 0x0400, 0x0400, 0x0400 };
@ -609,7 +602,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 600; sensor.optical_res = 600;
sensor.black_pixels = 5; sensor.black_pixels = 5;
sensor.dummy_pixel = 38; sensor.dummy_pixel = 38;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 200; sensor.fau_gain_white_ref = 200;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x1450, 0x0c80, 0x0a28 }; sensor.exposure = { 0x1450, 0x0c80, 0x0a28 };
@ -672,7 +664,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 1200; sensor.optical_res = 1200;
sensor.black_pixels = 48; sensor.black_pixels = 48;
sensor.dummy_pixel = 16; sensor.dummy_pixel = 16;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0, 0, 0 }; sensor.exposure = { 0, 0, 0 };
@ -784,7 +775,6 @@ void genesys_init_sensor_tables()
sensor.shading_resolution = 600; sensor.shading_resolution = 600;
sensor.black_pixels = 27; sensor.black_pixels = 27;
sensor.dummy_pixel = 27; sensor.dummy_pixel = 27;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x1100, 0x1100, 0x1100 }; sensor.exposure = { 0x1100, 0x1100, 0x1100 };
@ -841,7 +831,6 @@ void genesys_init_sensor_tables()
sensor.shading_resolution = 600; sensor.shading_resolution = 600;
sensor.black_pixels = 27; sensor.black_pixels = 27;
sensor.dummy_pixel = 27; sensor.dummy_pixel = 27;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x1100, 0x1100, 0x1100 }; sensor.exposure = { 0x1100, 0x1100, 0x1100 };
@ -899,7 +888,6 @@ void genesys_init_sensor_tables()
sensor.shading_resolution = 600; sensor.shading_resolution = 600;
sensor.black_pixels = 28; sensor.black_pixels = 28;
sensor.dummy_pixel = 28; sensor.dummy_pixel = 28;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x1544, 0x1544, 0x1544 }; sensor.exposure = { 0x1544, 0x1544, 0x1544 };
@ -956,7 +944,6 @@ void genesys_init_sensor_tables()
sensor.shading_resolution = 600; sensor.shading_resolution = 600;
sensor.black_pixels = 27; sensor.black_pixels = 27;
sensor.dummy_pixel = 27; sensor.dummy_pixel = 27;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x1100, 0x1100, 0x1100 }; sensor.exposure = { 0x1100, 0x1100, 0x1100 };
@ -1013,7 +1000,6 @@ void genesys_init_sensor_tables()
sensor.shading_resolution = 600; sensor.shading_resolution = 600;
sensor.black_pixels = 27; sensor.black_pixels = 27;
sensor.dummy_pixel = 27; sensor.dummy_pixel = 27;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x1100, 0x1100, 0x1100 }; sensor.exposure = { 0x1100, 0x1100, 0x1100 };
@ -1071,7 +1057,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 600; sensor.optical_res = 600;
sensor.black_pixels = 27; sensor.black_pixels = 27;
sensor.dummy_pixel = 27; sensor.dummy_pixel = 27;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x1100, 0x1100, 0x1100 }; sensor.exposure = { 0x1100, 0x1100, 0x1100 };
@ -1126,7 +1111,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 4800; sensor.optical_res = 4800;
sensor.black_pixels = 87*4; sensor.black_pixels = 87*4;
sensor.dummy_pixel = 16*4; sensor.dummy_pixel = 16*4;
sensor.ccd_start_xoffset = 320*8;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -1289,8 +1273,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 4800; sensor.optical_res = 4800;
sensor.black_pixels = 73*8; // black pixels 73 at 600 dpi sensor.black_pixels = 73*8; // black pixels 73 at 600 dpi
sensor.dummy_pixel = 16*8; sensor.dummy_pixel = 16*8;
// 384 at 600 dpi
sensor.ccd_start_xoffset = 384*8;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.gamma = { 1.0f, 1.0f, 1.0f }; sensor.gamma = { 1.0f, 1.0f, 1.0f };
@ -1435,7 +1417,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 2400; sensor.optical_res = 2400;
sensor.black_pixels = 87*4; sensor.black_pixels = 87*4;
sensor.dummy_pixel = 16*4; sensor.dummy_pixel = 16*4;
sensor.ccd_start_xoffset = 320*4;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x01c1, 0x0126, 0x00e5 }; sensor.exposure = { 0x01c1, 0x0126, 0x00e5 };
@ -1569,7 +1550,6 @@ void genesys_init_sensor_tables()
sensor.shading_resolution = 600; sensor.shading_resolution = 600;
sensor.black_pixels = 38; sensor.black_pixels = 38;
sensor.dummy_pixel = 38; sensor.dummy_pixel = 38;
sensor.ccd_start_xoffset = 152;
sensor.fau_gain_white_ref = 160; sensor.fau_gain_white_ref = 160;
sensor.gain_white_ref = 160; sensor.gain_white_ref = 160;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -1636,7 +1616,6 @@ void genesys_init_sensor_tables()
sensor.black_pixels = 50*8; sensor.black_pixels = 50*8;
// 31 at 600 dpi dummy_pixels 58 at 1200 // 31 at 600 dpi dummy_pixels 58 at 1200
sensor.dummy_pixel = 58; sensor.dummy_pixel = 58;
sensor.ccd_start_xoffset = 152;
sensor.fau_gain_white_ref = 160; sensor.fau_gain_white_ref = 160;
sensor.gain_white_ref = 160; sensor.gain_white_ref = 160;
sensor.exposure = { 0x2c09, 0x22b8, 0x10f0 }; sensor.exposure = { 0x2c09, 0x22b8, 0x10f0 };
@ -1764,7 +1743,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 4800; sensor.optical_res = 4800;
sensor.black_pixels = 100; sensor.black_pixels = 100;
sensor.dummy_pixel = 58; sensor.dummy_pixel = 58;
sensor.ccd_start_xoffset = 152;
sensor.fau_gain_white_ref = 160; sensor.fau_gain_white_ref = 160;
sensor.gain_white_ref = 160; sensor.gain_white_ref = 160;
sensor.exposure = { 0x2c09, 0x22b8, 0x10f0 }; sensor.exposure = { 0x2c09, 0x22b8, 0x10f0 };
@ -1889,7 +1867,6 @@ void genesys_init_sensor_tables()
sensor.black_pixels = 50*8; sensor.black_pixels = 50*8;
// 31 at 600 dpi, 58 at 1200 dpi // 31 at 600 dpi, 58 at 1200 dpi
sensor.dummy_pixel = 20; sensor.dummy_pixel = 20;
sensor.ccd_start_xoffset = 152;
sensor.fau_gain_white_ref = 160; sensor.fau_gain_white_ref = 160;
sensor.gain_white_ref = 160; sensor.gain_white_ref = 160;
sensor.exposure = { 0x9c40, 0x9c40, 0x9c40 }; sensor.exposure = { 0x9c40, 0x9c40, 0x9c40 };
@ -2014,7 +1991,6 @@ void genesys_init_sensor_tables()
sensor.black_pixels = 50*8; sensor.black_pixels = 50*8;
// 31 at 600 dpi, 58 at 1200 dpi // 31 at 600 dpi, 58 at 1200 dpi
sensor.dummy_pixel = 20; sensor.dummy_pixel = 20;
sensor.ccd_start_xoffset = 152;
sensor.fau_gain_white_ref = 160; sensor.fau_gain_white_ref = 160;
sensor.gain_white_ref = 160; sensor.gain_white_ref = 160;
sensor.exposure = { 0x9c40, 0x9c40, 0x9c40 }; sensor.exposure = { 0x9c40, 0x9c40, 0x9c40 };
@ -2173,7 +2149,6 @@ void genesys_init_sensor_tables()
sensor.ccd_size_divisor = 4; sensor.ccd_size_divisor = 4;
sensor.black_pixels = 31; sensor.black_pixels = 31;
sensor.dummy_pixel = 20; sensor.dummy_pixel = 20;
sensor.ccd_start_xoffset = 0; // not used at the moment
sensor.fau_gain_white_ref = 160; sensor.fau_gain_white_ref = 160;
sensor.gain_white_ref = 160; sensor.gain_white_ref = 160;
sensor.exposure = { 0x9c40, 0x9c40, 0x9c40 }; sensor.exposure = { 0x9c40, 0x9c40, 0x9c40 };
@ -2347,7 +2322,6 @@ void genesys_init_sensor_tables()
sensor.black_pixels = 96; sensor.black_pixels = 96;
sensor.dummy_pixel = 26; sensor.dummy_pixel = 26;
sensor.pixel_count_ratio = Ratio{1, 4}; sensor.pixel_count_ratio = Ratio{1, 4};
sensor.ccd_start_xoffset = 128;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -2410,7 +2384,6 @@ void genesys_init_sensor_tables()
sensor.ccd_size_divisor = 2; sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87; sensor.black_pixels = 87;
sensor.dummy_pixel = 16; sensor.dummy_pixel = 16;
sensor.ccd_start_xoffset = 303;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -2580,7 +2553,6 @@ void genesys_init_sensor_tables()
sensor.ccd_size_divisor = 2; sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87; sensor.black_pixels = 87;
sensor.dummy_pixel = 16; sensor.dummy_pixel = 16;
sensor.ccd_start_xoffset = 303;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -2751,7 +2723,6 @@ void genesys_init_sensor_tables()
sensor.ccd_size_divisor = 2; sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87; sensor.black_pixels = 87;
sensor.dummy_pixel = 16; sensor.dummy_pixel = 16;
sensor.ccd_start_xoffset = 303;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -2947,7 +2918,6 @@ void genesys_init_sensor_tables()
sensor.ccd_size_divisor = 2; sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87; sensor.black_pixels = 87;
sensor.dummy_pixel = 16; sensor.dummy_pixel = 16;
sensor.ccd_start_xoffset = 303;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -3143,7 +3113,6 @@ void genesys_init_sensor_tables()
sensor.ccd_size_divisor = 2; sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87; sensor.black_pixels = 87;
sensor.dummy_pixel = 87; sensor.dummy_pixel = 87;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -3204,7 +3173,6 @@ void genesys_init_sensor_tables()
sensor.register_dpihw = 1200; sensor.register_dpihw = 1200;
sensor.black_pixels = 88; // TODO sensor.black_pixels = 88; // TODO
sensor.dummy_pixel = 20; sensor.dummy_pixel = 20;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -3293,7 +3261,6 @@ void genesys_init_sensor_tables()
sensor.register_dpihw = 1200; sensor.register_dpihw = 1200;
sensor.black_pixels = 88; // TODO sensor.black_pixels = 88; // TODO
sensor.dummy_pixel = 20; sensor.dummy_pixel = 20;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -3368,7 +3335,6 @@ void genesys_init_sensor_tables()
sensor.register_dpihw = 1200; sensor.register_dpihw = 1200;
sensor.black_pixels = 88; // TODO sensor.black_pixels = 88; // TODO
sensor.dummy_pixel = 20; sensor.dummy_pixel = 20;
sensor.ccd_start_xoffset = 120;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -3420,7 +3386,6 @@ void genesys_init_sensor_tables()
sensor.register_dpihw = 1200; sensor.register_dpihw = 1200;
sensor.black_pixels = 88; // TODO sensor.black_pixels = 88; // TODO
sensor.dummy_pixel = 20; sensor.dummy_pixel = 20;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -3502,7 +3467,6 @@ void genesys_init_sensor_tables()
sensor.register_dpihw = 1200; sensor.register_dpihw = 1200;
sensor.black_pixels = 88; // TODO sensor.black_pixels = 88; // TODO
sensor.dummy_pixel = 20; sensor.dummy_pixel = 20;
sensor.ccd_start_xoffset = 120;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -3563,7 +3527,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 1200; sensor.optical_res = 1200;
sensor.black_pixels = 31; sensor.black_pixels = 31;
sensor.dummy_pixel = 31; sensor.dummy_pixel = 31;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
@ -3619,7 +3582,6 @@ void genesys_init_sensor_tables()
sensor.optical_res = 1200; sensor.optical_res = 1200;
sensor.black_pixels = 31; sensor.black_pixels = 31;
sensor.dummy_pixel = 31; sensor.dummy_pixel = 31;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0, 0, 0 }; sensor.exposure = { 0, 0, 0 };
@ -3672,8 +3634,6 @@ void genesys_init_sensor_tables()
sensor.ccd_size_divisor = 2; sensor.ccd_size_divisor = 2;
sensor.black_pixels = 20; sensor.black_pixels = 20;
sensor.dummy_pixel = 6; sensor.dummy_pixel = 6;
// tuned to give 3*8 multiple startx coordinate during shading calibration
sensor.ccd_start_xoffset = 34; // 14=>3, 20=>2
sensor.fau_gain_white_ref = 150; sensor.fau_gain_white_ref = 150;
sensor.gain_white_ref = 150; sensor.gain_white_ref = 150;
// maps to 0x70-0x73 for GL841 // maps to 0x70-0x73 for GL841

1
testsuite/backend/genesys/tests_calibration.cpp
Wyświetl plik

@ -69,7 +69,6 @@ Genesys_Calibration_Cache create_fake_calibration_entry()
sensor.optical_res = 1200; sensor.optical_res = 1200;
sensor.black_pixels = 48; sensor.black_pixels = 48;
sensor.dummy_pixel = 64; sensor.dummy_pixel = 64;
sensor.ccd_start_xoffset = 0;
sensor.fau_gain_white_ref = 210; sensor.fau_gain_white_ref = 210;
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };