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

Merge branch 'genesys-use-consistent-enum-names' into 'master' 

genesys: Use consistent enum names

See merge request sane-project/backends!204
merge-requests/198/merge
Povilas Kanapickas 2019-10-05 08:14:36 +00:00
rodzic 9e8f780574 ec8dadc0a0
commit eb7d173916
15 zmienionych plików z 372 dodań i 370 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

68
backend/genesys.cc
Wyświetl plik

@ -977,17 +977,17 @@ static void genesys_send_offset_and_shading(Genesys_Device* dev, const Genesys_S
/* many scanners send coefficient for lineart/gray like in color mode */
if ((dev->settings.scan_mode == ScanColorMode::LINEART ||
dev->settings.scan_mode == ScanColorMode::HALFTONE)
&& dev->model->sensor_id != SensorId::CCD_PLUSTEK3800
&& dev->model->sensor_id != SensorId::CCD_PLUSTEK_OPTICBOOK_3800
&& dev->model->sensor_id != SensorId::CCD_KVSS080
&& dev->model->sensor_id != SensorId::CCD_G4050
&& dev->model->sensor_id != SensorId::CCD_CS4400F
&& dev->model->sensor_id != SensorId::CCD_CS8400F
&& dev->model->sensor_id != SensorId::CCD_CS8600F
&& dev->model->sensor_id != SensorId::CCD_CANON_4400F
&& dev->model->sensor_id != SensorId::CCD_CANON_8400F
&& dev->model->sensor_id != SensorId::CCD_CANON_8600F
&& dev->model->sensor_id != SensorId::CCD_DSMOBILE600
&& dev->model->sensor_id != SensorId::CCD_XP300
&& dev->model->sensor_id != SensorId::CCD_DP665
&& dev->model->sensor_id != SensorId::CCD_DP685
&& dev->model->sensor_id != SensorId::CIS_CANONLIDE80
&& dev->model->sensor_id != SensorId::CIS_CANON_LIDE_80
&& dev->model->sensor_id != SensorId::CCD_ROADWARRIOR
&& dev->model->sensor_id != SensorId::CCD_HP2300
&& dev->model->sensor_id != SensorId::CCD_HP2400
@ -1030,8 +1030,8 @@ void sanei_genesys_init_shading_data(Genesys_Device* dev, const Genesys_Sensor&
function */
if (dev->model->sensor_id==SensorId::CCD_KVSS080 ||
dev->model->sensor_id==SensorId::CCD_G4050 ||
dev->model->sensor_id==SensorId::CCD_CS4400F ||
dev->model->sensor_id==SensorId::CCD_CS8400F ||
dev->model->sensor_id==SensorId::CCD_CANON_4400F ||
dev->model->sensor_id==SensorId::CCD_CANON_8400F ||
dev->cmd_set->has_send_shading_data())
{
return;
@ -1728,8 +1728,8 @@ static void genesys_dummy_dark_shading(Genesys_Device* dev, const Genesys_Sensor
xend = 68;
}
if (dev->model->sensor_id==SensorId::CCD_G4050
|| dev->model->sensor_id==SensorId::CCD_CS4400F
|| dev->model->sensor_id==SensorId::CCD_CS8400F
|| dev->model->sensor_id==SensorId::CCD_CANON_4400F
|| dev->model->sensor_id==SensorId::CCD_CANON_8400F
|| dev->model->sensor_id==SensorId::CCD_KVSS080)
{
skip = 2;
@ -2070,7 +2070,7 @@ compute_averaged_planar (Genesys_Device * dev, const Genesys_Sensor& sensor,
avgpixels = 15;
/* LiDE80 packs shading data */
if (dev->model->sensor_id != SensorId::CIS_CANONLIDE80) {
if (dev->model->sensor_id != SensorId::CIS_CANON_LIDE_80) {
factor=1;
fill=avgpixels;
}
@ -2453,7 +2453,7 @@ static void genesys_send_shading_coefficient(Genesys_Device* dev, const Genesys_
/* special case, memory is aligned on 0x5400, this has yet to be explained */
/* could be 0xa800 because sensor is truly 2400 dpi, then halved because
* we only set 1200 dpi */
if(dev->model->sensor_id==SensorId::CIS_CANONLIDE80)
if(dev->model->sensor_id==SensorId::CIS_CANON_LIDE_80)
{
words_per_color = 0x5400;
}
@ -2587,12 +2587,12 @@ static void genesys_send_shading_coefficient(Genesys_Device* dev, const Genesys_
target_code);
break;
case SensorId::CCD_KVSS080:
case SensorId::CCD_PLUSTEK3800:
case SensorId::CCD_PLUSTEK_OPTICBOOK_3800:
case SensorId::CCD_G4050:
case SensorId::CCD_CS4400F:
case SensorId::CCD_CS8400F:
case SensorId::CCD_CS8600F:
case SensorId::CCD_PLUSTEK_7200I:
case SensorId::CCD_CANON_4400F:
case SensorId::CCD_CANON_8400F:
case SensorId::CCD_CANON_8600F:
case SensorId::CCD_PLUSTEK_OPTICFILM_7200I:
target_code = 0xe000;
o = 0;
compute_coefficients (dev,
@ -2604,24 +2604,24 @@ static void genesys_send_shading_coefficient(Genesys_Device* dev, const Genesys_
coeff,
target_code);
break;
case SensorId::CIS_CANONLIDE700:
case SensorId::CIS_CANONLIDE100:
case SensorId::CIS_CANONLIDE200:
case SensorId::CIS_CANONLIDE110:
case SensorId::CIS_CANONLIDE120:
case SensorId::CIS_CANONLIDE210:
case SensorId::CIS_CANONLIDE220:
case SensorId::CIS_CANON_LIDE_700F:
case SensorId::CIS_CANON_LIDE_100:
case SensorId::CIS_CANON_LIDE_200:
case SensorId::CIS_CANON_LIDE_110:
case SensorId::CIS_CANON_LIDE_120:
case SensorId::CIS_CANON_LIDE_210:
case SensorId::CIS_CANON_LIDE_220:
/* TODO store this in a data struct so we avoid
* growing this switch */
switch(dev->model->sensor_id)
{
case SensorId::CIS_CANONLIDE110:
case SensorId::CIS_CANONLIDE120:
case SensorId::CIS_CANONLIDE210:
case SensorId::CIS_CANONLIDE220:
case SensorId::CIS_CANON_LIDE_110:
case SensorId::CIS_CANON_LIDE_120:
case SensorId::CIS_CANON_LIDE_210:
case SensorId::CIS_CANON_LIDE_220:
target_code = 0xf000;
break;
case SensorId::CIS_CANONLIDE700:
case SensorId::CIS_CANON_LIDE_700F:
target_code = 0xc000; /* from experimentation */
break;
default:
@ -2642,7 +2642,7 @@ static void genesys_send_shading_coefficient(Genesys_Device* dev, const Genesys_
coeff,
target_code);
break;
case SensorId::CCD_CANONLIDE35:
case SensorId::CIS_CANON_LIDE_35:
compute_averaged_planar (dev, sensor,
shading_data.data(),
pixels_per_line,
@ -2653,7 +2653,7 @@ static void genesys_send_shading_coefficient(Genesys_Device* dev, const Genesys_
0xe000,
0x0a00);
break;
case SensorId::CIS_CANONLIDE80:
case SensorId::CIS_CANON_LIDE_80:
compute_averaged_planar (dev, sensor,
shading_data.data(),
pixels_per_line,
@ -2664,7 +2664,7 @@ static void genesys_send_shading_coefficient(Genesys_Device* dev, const Genesys_
0xe000,
0x0800);
break;
case SensorId::CCD_PLUSTEK_3600:
case SensorId::CCD_PLUSTEK_OPTICPRO_3600:
compute_shifted_coefficients (dev, sensor,
shading_data.data(),
pixels_per_line,
@ -2794,8 +2794,8 @@ static void genesys_flatbed_calibration(Genesys_Device* dev, Genesys_Sensor& sen
coarse_res /= 2;
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F)
if (dev->model->model_id == ModelId::CANON_8400F ||
dev->model->model_id == ModelId::CANON_8600F)
{
coarse_res = 1200;
}
@ -4662,7 +4662,7 @@ probe_genesys_devices (void)
of Genesys_Calibration_Cache as is.
*/
static const char* CALIBRATION_IDENT = "sane_genesys";
static const int CALIBRATION_VERSION = 12;
static const int CALIBRATION_VERSION = 14;
bool read_calibration(std::istream& str, Genesys_Device::Calibration& calibration,
const std::string& path)

117
backend/genesys_enums.h
Wyświetl plik

@ -117,13 +117,18 @@ enum class ColorOrder
BGR,
};
/* Enum value naming conventions:
Full name must be included with the following exceptions:
Canon scanners omit "Canoscan" if present
*/
enum class ModelId : unsigned
{
UNKNOWN = 0,
CANON_CANOSCAN_4400F,
CANON_CANOSCAN_5600F,
CANON_CANOSCAN_8400F,
CANON_CANOSCAN_8600F,
CANON_4400F,
CANON_5600F,
CANON_8400F,
CANON_8600F,
CANON_IMAGE_FORMULA_101,
CANON_LIDE_50,
CANON_LIDE_60,
@ -170,10 +175,9 @@ enum class SensorId : unsigned
{
UNKNOWN = 0,
CCD_5345,
CCD_CANONLIDE35,
CCD_CS4400F,
CCD_CS8400F,
CCD_CS8600F,
CCD_CANON_4400F,
CCD_CANON_8400F,
CCD_CANON_8600F,
CCD_DP665,
CCD_DP685,
CCD_DSMOBILE600,
@ -184,22 +188,23 @@ enum class SensorId : unsigned
CCD_HP_N6310,
CCD_IMG101,
CCD_KVSS080,
CCD_PLUSTEK3800,
CCD_PLUSTEK_3600,
CCD_PLUSTEK_7200I,
CCD_PLUSTEK_OPTICBOOK_3800,
CCD_PLUSTEK_OPTICFILM_7200I,
CCD_PLUSTEK_OPTICPRO_3600,
CCD_ROADWARRIOR,
CCD_ST12, // SONY ILX548: 5340 Pixel ???
CCD_ST24, // SONY ILX569: 10680 Pixel ???
CCD_UMAX,
CCD_XP300,
CIS_CANONLIDE100,
CIS_CANONLIDE110,
CIS_CANONLIDE120,
CIS_CANONLIDE200,
CIS_CANONLIDE210,
CIS_CANONLIDE220,
CIS_CANONLIDE700,
CIS_CANONLIDE80,
CIS_CANON_LIDE_35,
CIS_CANON_LIDE_80,
CIS_CANON_LIDE_100,
CIS_CANON_LIDE_110,
CIS_CANON_LIDE_120,
CIS_CANON_LIDE_200,
CIS_CANON_LIDE_210,
CIS_CANON_LIDE_220,
CIS_CANON_LIDE_700F,
CIS_XP200,
};
@ -221,20 +226,20 @@ enum class AdcId : unsigned
{
UNKNOWN = 0,
AD_XP200,
CANONLIDE110,
CANONLIDE120,
CANONLIDE200,
CANONLIDE35,
CANONLIDE700,
CANONLIDE80,
CS8400F,
CS8600F,
CANON_LIDE_35,
CANON_LIDE_80,
CANON_LIDE_110,
CANON_LIDE_120,
CANON_LIDE_200,
CANON_LIDE_700F,
CANON_8400F,
CANON_8600F,
G4050,
IMG101,
KVSS080,
PLUSTEK3800,
PLUSTEK_3600,
PLUSTEK_7200I,
PLUSTEK_OPTICBOOK_3800,
PLUSTEK_OPTICFILM_7200I,
PLUSTEK_OPTICPRO_3600,
WOLFSON_5345,
WOLFSON_DSM600,
WOLFSON_HP2300,
@ -262,16 +267,16 @@ inline void serialize(std::ostream& str, AdcId& x)
enum class GpioId : unsigned
{
UNKNOWN = 0,
CANONLIDE110,
CANONLIDE120,
CANONLIDE200,
CANONLIDE210,
CANONLIDE35,
CANONLIDE700,
CANONLIDE80,
CS4400F,
CS8400F,
CS8600F,
CANON_LIDE_35,
CANON_LIDE_80,
CANON_LIDE_110,
CANON_LIDE_120,
CANON_LIDE_200,
CANON_LIDE_210,
CANON_LIDE_700F,
CANON_4400F,
CANON_8400F,
CANON_8600F,
DP665,
DP685,
G4050,
@ -282,9 +287,9 @@ enum class GpioId : unsigned
IMG101,
KVSS080,
MD_5345,
PLUSTEK3800,
PLUSTEK_3600,
PLUSTEK_7200I,
PLUSTEK_OPTICBOOK_3800,
PLUSTEK_OPTICFILM_7200I,
PLUSTEK_OPTICPRO_3600,
ST12,
ST24,
UMAX,
@ -295,16 +300,16 @@ enum class GpioId : unsigned
enum class MotorId : unsigned
{
UNKNOWN = 0,
CANONLIDE100,
CANONLIDE110,
CANONLIDE120,
CANONLIDE200,
CANONLIDE210,
CANONLIDE35,
CANONLIDE700,
CANONLIDE80,
CS8400F,
CS8600F,
CANON_LIDE_100,
CANON_LIDE_110,
CANON_LIDE_120,
CANON_LIDE_200,
CANON_LIDE_210,
CANON_LIDE_35,
CANON_LIDE_700,
CANON_LIDE_80,
CANON_8400F,
CANON_8600F,
DP665,
DSMOBILE_600,
G4050,
@ -314,9 +319,9 @@ enum class MotorId : unsigned
IMG101,
KVSS080,
MD_5345,
PLUSTEK3800,
PLUSTEK_3600,
PLUSTEK_7200I,
PLUSTEK_OPTICBOOK_3800,
PLUSTEK_OPTICFILM_7200I,
PLUSTEK_OPTICPRO_3600,
ROADWARRIOR,
ST24,
UMAX,

24
backend/genesys_gl124.cc
Wyświetl plik

@ -121,7 +121,7 @@ gl124_init_registers (Genesys_Device * dev)
SETREG (0x03,0x50);
SETREG (0x04,0x03);
SETREG (0x05,0x00);
if(dev->model->sensor_id == SensorId::CIS_CANONLIDE120) {
if(dev->model->sensor_id == SensorId::CIS_CANON_LIDE_120) {
SETREG (0x06,0x50);
SETREG (0x07,0x00);
}
@ -151,7 +151,7 @@ gl124_init_registers (Genesys_Device * dev)
SETREG (0x1f,0x00);
SETREG (0x20,0x15);
SETREG (0x21,0x00);
if(dev->model->sensor_id != SensorId::CIS_CANONLIDE120) {
if(dev->model->sensor_id != SensorId::CIS_CANON_LIDE_120) {
SETREG (0x22,0x02);
}
else
@ -212,7 +212,7 @@ gl124_init_registers (Genesys_Device * dev)
SETREG (0x6c,0x00);
SETREG (0x6e,0x00);
SETREG (0x6f,0x00);
if (dev->model->sensor_id != SensorId::CIS_CANONLIDE120) {
if (dev->model->sensor_id != SensorId::CIS_CANON_LIDE_120) {
SETREG (0x6d,0xd0);
SETREG (0x71,0x08);
}
@ -239,7 +239,7 @@ gl124_init_registers (Genesys_Device * dev)
SETREG (0x7d,0x00);
SETREG (0x7e,0x08);
SETREG (0x7f,0x58);
if (dev->model->sensor_id != SensorId::CIS_CANONLIDE120) {
if (dev->model->sensor_id != SensorId::CIS_CANON_LIDE_120) {
SETREG (0x80,0x00);
SETREG (0x81,0x14);
}
@ -326,7 +326,7 @@ gl124_init_registers (Genesys_Device * dev)
SETREG (0xcd,0x00);
SETREG (0xce,0x00);
*/
if (dev->model->sensor_id == SensorId::CIS_CANONLIDE120) {
if (dev->model->sensor_id == SensorId::CIS_CANON_LIDE_120) {
SETREG (0xc5,0x20);
SETREG (0xc6,0xeb);
SETREG (0xc7,0x20);
@ -466,7 +466,7 @@ static void gl124_set_ti_fe(Genesys_Device* dev, uint8_t set)
sanei_genesys_fe_write_data(dev, 0x05 + i, dev->frontend.regs.get_value(0x24 + i));
}
if (dev->model->adc_id == AdcId::CANONLIDE120) {
if (dev->model->adc_id == AdcId::CANON_LIDE_120) {
sanei_genesys_fe_write_data(dev, 0x00, 0x01);
}
else
@ -551,10 +551,10 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
{
switch(dev->model->motor_id)
{
case MotorId::CANONLIDE110:
case MotorId::CANON_LIDE_110:
min_speed = 600;
break;
case MotorId::CANONLIDE120:
case MotorId::CANON_LIDE_120:
min_speed = 900;
break;
default:
@ -811,7 +811,7 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
r->value &= ~REG01_SCAN;
r = sanei_genesys_get_address (reg, REG03);
if ((dev->model->sensor_id != SensorId::CIS_CANONLIDE120) && (session.params.xres>=600)) {
if ((dev->model->sensor_id != SensorId::CIS_CANON_LIDE_120) && (session.params.xres>=600)) {
r->value &= ~REG03_AVEENB;
DBG (DBG_io, "%s: disabling AVEENB\n", __func__);
}
@ -1194,7 +1194,7 @@ static void gl124_setup_scan_gpio(Genesys_Device* dev, int resolution)
uint8_t val = dev->read_register(REG32);
/* LiDE 110, 210 and 220 cases */
if(dev->model->gpio_id != GpioId::CANONLIDE120) {
if(dev->model->gpio_id != GpioId::CANON_LIDE_120) {
if(resolution>=dev->motor.base_ydpi/2)
{
val &= 0xf7;
@ -2624,8 +2624,8 @@ void CommandSetGl124::update_hardware_sensors(Genesys_Scanner* s) const
* add another per scanner button profile struct to avoid growing
* hard-coded button mapping here.
*/
if ((s->dev->model->gpio_id == GpioId::CANONLIDE110) ||
(s->dev->model->gpio_id == GpioId::CANONLIDE120))
if ((s->dev->model->gpio_id == GpioId::CANON_LIDE_110) ||
(s->dev->model->gpio_id == GpioId::CANON_LIDE_120))
{
s->buttons[BUTTON_SCAN_SW].write((val & 0x01) == 0);
s->buttons[BUTTON_FILE_SW].write((val & 0x08) == 0);

51
backend/genesys_gl841.cc
Wyświetl plik

@ -560,7 +560,7 @@ gl841_init_registers (Genesys_Device * dev)
dev->reg.find_reg(0x03).value = 0x1f /*0x17 */ ; /* lamp on */
dev->reg.find_reg(0x03).value |= REG03_AVEENB;
if (dev->model->sensor_id == SensorId::CCD_PLUSTEK_3600) {
if (dev->model->sensor_id == SensorId::CCD_PLUSTEK_OPTICPRO_3600) {
// AD front end
dev->reg.find_reg(0x04).value = (2 << REG04S_AFEMOD) | 0x02;
}
@ -591,7 +591,7 @@ gl841_init_registers (Genesys_Device * dev)
/* XP300 CCD needs different clock and clock/pixels values */
if (dev->model->sensor_id != SensorId::CCD_XP300 &&
dev->model->sensor_id != SensorId::CCD_DP685 &&
dev->model->sensor_id != SensorId::CCD_PLUSTEK_3600)
dev->model->sensor_id != SensorId::CCD_PLUSTEK_OPTICPRO_3600)
{
dev->reg.find_reg(0x06).value |= 0 << REG06S_SCANMOD;
dev->reg.find_reg(0x09).value |= 1 << REG09S_CLKSET;
@ -651,7 +651,7 @@ gl841_init_registers (Genesys_Device * dev)
}
/* TODO there is a switch calling to be written here */
if (dev->model->gpio_id == GpioId::CANONLIDE35) {
if (dev->model->gpio_id == GpioId::CANON_LIDE_35) {
dev->reg.find_reg(0x6b).value |= REG6B_GPO18;
dev->reg.find_reg(0x6b).value &= ~REG6B_GPO17;
}
@ -745,7 +745,7 @@ static void gl841_set_ad_fe(Genesys_Device* dev, uint8_t set)
DBG_HELPER(dbg);
int i;
if (dev->model->adc_id==AdcId::CANONLIDE80) {
if (dev->model->adc_id==AdcId::CANON_LIDE_80) {
gl841_set_lide80_fe(dev, set);
return;
}
@ -934,8 +934,7 @@ uint8_t t150[] = {0x0c,0x33,0xcf,0x33,0xcf,0x33,0xcf,0x33,0xcf,0x33,0xcf,0x3
uint8_t *table;
if(dev->model->motor_id == MotorId::CANONLIDE80)
{
if(dev->model->motor_id == MotorId::CANON_LIDE_80) {
switch(ydpi)
{
case 3600:
@ -1452,7 +1451,7 @@ static void gl841_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
dev->cmd_set->set_fe(dev, sensor, AFE_SET);
/* gpio part.*/
if (dev->model->gpio_id == GpioId::CANONLIDE35)
if (dev->model->gpio_id == GpioId::CANON_LIDE_35)
{
r = sanei_genesys_get_address (reg, REG6C);
if (session.ccd_size_divisor > 1) {
@ -1461,7 +1460,7 @@ static void gl841_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
r->value |= 0x80;
}
}
if (dev->model->gpio_id == GpioId::CANONLIDE80)
if (dev->model->gpio_id == GpioId::CANON_LIDE_80)
{
r = sanei_genesys_get_address (reg, REG6C);
if (session.ccd_size_divisor > 1) {
@ -1541,7 +1540,7 @@ static void gl841_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
}
else
{
if (dev->model->sensor_id == SensorId::CCD_PLUSTEK_3600) {
if (dev->model->sensor_id == SensorId::CCD_PLUSTEK_OPTICPRO_3600) {
r->value |= 0x22; /* slow color pixel by pixel */
}
else
@ -1669,8 +1668,7 @@ int scan_step_type=0;
}
/* this motor behaves differently */
if (dev->model->motor_id==MotorId::CANONLIDE80)
{
if (dev->model->motor_id==MotorId::CANON_LIDE_80) {
/* driven by 'frequency' tables ? */
scan_step_type = 0;
}
@ -1957,7 +1955,7 @@ void CommandSetGl841::save_power(Genesys_Device* dev, bool enable) const
if (enable)
{
if (dev->model->gpio_id == GpioId::CANONLIDE35)
if (dev->model->gpio_id == GpioId::CANON_LIDE_35)
{
/* expect GPIO17 to be enabled, and GPIO9 to be disabled,
while GPIO8 is disabled*/
@ -2000,7 +1998,7 @@ void CommandSetGl841::save_power(Genesys_Device* dev, bool enable) const
}
else
{
if (dev->model->gpio_id == GpioId::CANONLIDE35)
if (dev->model->gpio_id == GpioId::CANON_LIDE_35)
{
/* expect GPIO17 to be enabled, and GPIO9 to be disabled,
while GPIO8 is disabled*/
@ -2399,13 +2397,13 @@ void CommandSetGl841::begin_scan(Genesys_Device* dev, const Genesys_Sensor& sens
Genesys_Register_Set local_reg(Genesys_Register_Set::SEQUENTIAL);
uint8_t val;
if (dev->model->gpio_id == GpioId::CANONLIDE80) {
if (dev->model->gpio_id == GpioId::CANON_LIDE_80) {
val = dev->read_register(REG6B);
val = REG6B_GPO18;
dev->write_register(REG6B, val);
}
if (dev->model->sensor_id != SensorId::CCD_PLUSTEK_3600) {
if (dev->model->sensor_id != SensorId::CCD_PLUSTEK_OPTICPRO_3600) {
local_reg.init_reg(0x03, reg->get8(0x03) | REG03_LAMPPWR);
} else {
// TODO PLUSTEK_3600: why ??
@ -2508,12 +2506,12 @@ void CommandSetGl841::slow_back_home(Genesys_Device* dev, bool wait_until_home)
// reset gpio pin
uint8_t val;
if (dev->model->gpio_id == GpioId::CANONLIDE35) {
if (dev->model->gpio_id == GpioId::CANON_LIDE_35) {
val = dev->read_register(REG6C);
val = dev->gpo.regs.get_value(0x6c);
dev->write_register(REG6C, val);
}
if (dev->model->gpio_id == GpioId::CANONLIDE80) {
if (dev->model->gpio_id == GpioId::CANON_LIDE_80) {
val = dev->read_register(REG6B);
val = REG6B_GPO18 | REG6B_GPO17;
dev->write_register(REG6B, val);
@ -2734,12 +2732,11 @@ void CommandSetGl841::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
regs = dev->reg;
ydpi = dev->motor.base_ydpi;
if (dev->model->motor_id == MotorId::PLUSTEK_3600) /* TODO PLUSTEK_3600: 1200dpi not yet working, produces dark bar */
if (dev->model->motor_id == MotorId::PLUSTEK_OPTICPRO_3600) /* TODO PLUSTEK_3600: 1200dpi not yet working, produces dark bar */
{
ydpi = 600;
}
if (dev->model->motor_id == MotorId::CANONLIDE80)
{
if (dev->model->motor_id == MotorId::CANON_LIDE_80) {
ydpi = gl841_get_dpihw(dev);
/* get over extra dark area for this model.
It looks like different devices have dark areas of different width
@ -2854,7 +2851,7 @@ void CommandSetGl841::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sens
/* true gray (led add for cis scanners) */
if(dev->model->is_cis && dev->settings.true_gray
&& dev->settings.scan_mode != ScanColorMode::COLOR_SINGLE_PASS
&& dev->model->sensor_id != SensorId::CIS_CANONLIDE80)
&& dev->model->sensor_id != SensorId::CIS_CANON_LIDE_80)
{
// on Lide 80 the LEDADD bit results in only red LED array being lit
DBG(DBG_io, "%s: activating LEDADD\n", __func__);
@ -3144,7 +3141,7 @@ static void ad_fe_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
int target;
/* don't impact 3600 behavior since we can't test it */
if (dev->model->sensor_id == SensorId::CCD_PLUSTEK_3600) {
if (dev->model->sensor_id == SensorId::CCD_PLUSTEK_OPTICPRO_3600) {
return;
}
@ -3702,7 +3699,7 @@ void CommandSetGl841::coarse_gain_calibration(Genesys_Device* dev, const Genesys
uint8_t out_gain = 0;
if (dev->model->adc_id == AdcId::CANONLIDE35 ||
if (dev->model->adc_id == AdcId::CANON_LIDE_35 ||
dev->model->adc_id == AdcId::WOLFSON_XP300 ||
dev->model->adc_id == AdcId::WOLFSON_DSM600)
{
@ -3713,7 +3710,7 @@ void CommandSetGl841::coarse_gain_calibration(Genesys_Device* dev, const Genesys
out_gain = 0;
else
out_gain = 283 - 208/gain[j];
} else if (dev->model->adc_id == AdcId::CANONLIDE80) {
} else if (dev->model->adc_id == AdcId::CANON_LIDE_80) {
out_gain = gain[j]*12;
}
dev->frontend.set_gain(j, out_gain);
@ -3843,7 +3840,7 @@ bool CommandSetGl841::is_compatible_calibration(Genesys_Device* dev, const Genes
DBG_HELPER(dbg);
/* calibration cache not working yet for this model */
if (dev->model->sensor_id == SensorId::CCD_PLUSTEK_3600) {
if (dev->model->sensor_id == SensorId::CCD_PLUSTEK_OPTICPRO_3600) {
return false;
}
@ -4001,8 +3998,8 @@ void CommandSetGl841::update_hardware_sensors(Genesys_Scanner* s) const
*/
uint8_t val;
if (s->dev->model->gpio_id == GpioId::CANONLIDE35
|| s->dev->model->gpio_id == GpioId::CANONLIDE80)
if (s->dev->model->gpio_id == GpioId::CANON_LIDE_35
|| s->dev->model->gpio_id == GpioId::CANON_LIDE_80)
{
val = s->dev->read_register(REG6D);
s->buttons[BUTTON_SCAN_SW].write((val & 0x01) == 0);

150
backend/genesys_gl843.cc
Wyświetl plik

@ -232,7 +232,7 @@ gl843_init_registers (Genesys_Device * dev)
/* default to KV-SS080 */
SETREG (0xa2, 0x0f);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
SETREG(0xa2, 0x1f);
}
SETREG (0x01, 0x00);
@ -244,7 +244,7 @@ gl843_init_registers (Genesys_Device * dev)
{
SETREG(0x03, 0x1d);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
SETREG(0x03, 0x1c);
}
@ -276,7 +276,7 @@ gl843_init_registers (Genesys_Device * dev)
if (dev->model->model_id == ModelId::PLUSTEK_OPTICFILM_7200I) {
SETREG(0x06, 0xd0);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F) {
if (dev->model->model_id == ModelId::CANON_4400F) {
SETREG(0x06, 0xf0); /* SCANMOD=111, PWRBIT and no GAIN4 */
}
@ -289,7 +289,7 @@ gl843_init_registers (Genesys_Device * dev)
{
SETREG(0x0a, 0x18);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
SETREG(0x0a, 0x10);
}
@ -297,10 +297,10 @@ gl843_init_registers (Genesys_Device * dev)
// gl843_boot
SETREG (0x0b, 0x6a);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F) {
if (dev->model->model_id == ModelId::CANON_4400F) {
SETREG(0x0b, 0x69); // 16M only
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
SETREG(0x0b, 0x89);
}
if (dev->model->model_id == ModelId::PLUSTEK_OPTICFILM_7200I) {
@ -313,7 +313,7 @@ gl843_init_registers (Genesys_Device * dev)
SETREG(0x0b, 0x69);
}
if (dev->model->model_id != ModelId::CANON_CANOSCAN_8400F &&
if (dev->model->model_id != ModelId::CANON_8400F &&
dev->model->model_id != ModelId::PLUSTEK_OPTICFILM_7200I)
{
SETREG (0x0c, 0x00);
@ -326,8 +326,8 @@ gl843_init_registers (Genesys_Device * dev)
SETREG(0x13, 0x00); // SENSOR_DEF
SETREG(0x14, 0x00); // SENSOR_DEF
SETREG(0x15, 0x00); // SENSOR_DEF
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F)
if (dev->model->model_id == ModelId::CANON_4400F ||
dev->model->model_id == ModelId::CANON_8600F)
{
dev->reg.set16(REG_EXPR, 0x9c40);
dev->reg.set16(REG_EXPG, 0x9c40);
@ -357,17 +357,17 @@ gl843_init_registers (Genesys_Device * dev)
SETREG(0x1d, 0x04); // SENSOR_DEF
SETREG(0x1e, 0x10);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F)
if (dev->model->model_id == ModelId::CANON_4400F ||
dev->model->model_id == ModelId::CANON_8600F)
{
SETREG(0x1e, 0x20);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
SETREG(0x1e, 0xa0);
}
SETREG (0x1f, 0x01);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
SETREG(0x1f, 0xff);
}
@ -376,13 +376,13 @@ gl843_init_registers (Genesys_Device * dev)
SETREG(0x22, 0x01);
SETREG(0x23, 0x01);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F)
if (dev->model->model_id == ModelId::CANON_4400F ||
dev->model->model_id == ModelId::CANON_8600F)
{
SETREG(0x22, 0xc8);
SETREG(0x23, 0xc8);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
SETREG(0x22, 0x50);
SETREG(0x23, 0x50);
}
@ -404,7 +404,7 @@ gl843_init_registers (Genesys_Device * dev)
// DUMMY: CCD dummy and optically black pixel count
SETREG (0x34, 0x24);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F)
if (dev->model->model_id == ModelId::CANON_8600F)
{
SETREG(0x34, 0x14);
}
@ -454,22 +454,22 @@ gl843_init_registers (Genesys_Device * dev)
// STOPTIM[0:4]: The stop duration between change of directions in
// backtracking
SETREG(0x5e, 0x23);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F) {
if (dev->model->model_id == ModelId::CANON_4400F) {
SETREG(0x5e, 0x3f);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
SETREG(0x5e, 0x85);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
SETREG(0x5e, 0x1f);
}
//FMOVDEC: The number of deceleration steps in table 5 for auto-go-home
SETREG(0x5f, 0x01);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F) {
if (dev->model->model_id == ModelId::CANON_4400F) {
SETREG(0x5f, 0xf0);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
SETREG(0x5f, 0xf0);
}
@ -495,25 +495,25 @@ gl843_init_registers (Genesys_Device * dev)
// FSHDEC[0:7]: The number of deceleration steps after scanning is finished
// (table 3)
SETREG (0x69, 0x01);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
SETREG(0x69, 64);
}
// FMOVNO[0:7] The number of acceleration or deceleration steps for fast
// moving (table 4)
SETREG (0x6a, 0x04);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
SETREG(0x69, 64);
}
// GPIO-related register bits
SETREG(0x6b, 0x30);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F)
if (dev->model->model_id == ModelId::CANON_4400F ||
dev->model->model_id == ModelId::CANON_8600F)
{
SETREG(0x6b, 0x72);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
SETREG(0x6b, 0xb1);
}
if (dev->model->model_id == ModelId::HP_SCANJET_G4010 ||
@ -538,19 +538,19 @@ gl843_init_registers (Genesys_Device * dev)
SETREG(0x72, 0x04); // SENSOR_DEF
SETREG(0x73, 0x05); // SENSOR_DEF
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F) {
if (dev->model->model_id == ModelId::CANON_4400F) {
SETREG(0x70, 0x01);
SETREG(0x71, 0x03);
SETREG(0x72, 0x01);
SETREG(0x73, 0x03);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
SETREG(0x70, 0x01);
SETREG(0x71, 0x03);
SETREG(0x72, 0x03);
SETREG(0x73, 0x04);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
SETREG(0x70, 0x00);
SETREG(0x71, 0x02);
SETREG(0x72, 0x02);
@ -579,7 +579,7 @@ gl843_init_registers (Genesys_Device * dev)
// various AFE settings
SETREG(0x7d, 0x00);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
SETREG(0x7d, 0x20);
}
@ -593,10 +593,10 @@ gl843_init_registers (Genesys_Device * dev)
// VRHOME, VRMOVE, VRBACK, VRSCAN: Vref settings of the motor driver IC for
// moving in various situations.
SETREG(0x80, 0x00);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F) {
if (dev->model->model_id == ModelId::CANON_4400F) {
SETREG(0x80, 0x0c);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
SETREG(0x80, 0x28);
}
if (dev->model->model_id == ModelId::HP_SCANJET_G4010 ||
@ -606,7 +606,7 @@ gl843_init_registers (Genesys_Device * dev)
SETREG(0x80, 0x50);
}
if (dev->model->model_id != ModelId::CANON_CANOSCAN_4400F) {
if (dev->model->model_id != ModelId::CANON_4400F) {
// NOTE: Historical code. None of the following 6 registers are
// documented in the datasheet. Their default value is 0, so probably it's
// not a bad idea to leave this here.
@ -619,15 +619,15 @@ gl843_init_registers (Genesys_Device * dev)
}
SETREG(0x87, 0x00);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F)
if (dev->model->model_id == ModelId::CANON_4400F ||
dev->model->model_id == ModelId::CANON_8400F ||
dev->model->model_id == ModelId::CANON_8600F)
{
SETREG(0x87, 0x02);
}
// MTRPLS[0:7]: The width of the ADF motor trigger signal pulse.
if (dev->model->model_id != ModelId::CANON_CANOSCAN_8400F &&
if (dev->model->model_id != ModelId::CANON_8400F &&
dev->model->model_id != ModelId::PLUSTEK_OPTICFILM_7200I)
{
SETREG(0x94, 0xff);
@ -639,7 +639,7 @@ gl843_init_registers (Genesys_Device * dev)
// ONDUR[0:15]: The duration of PWM ON phase for LAMP control
// OFFDUR[0:15]: The duration of PWM OFF phase for LAMP control
// both of the above are in system clocks
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
SETREG(0x98, 0x00);
SETREG(0x99, 0x00);
SETREG(0x9a, 0x00);
@ -658,9 +658,9 @@ gl843_init_registers (Genesys_Device * dev)
// RMADLY[0:1], MOTLAG, CMODE, STEPTIM, MULDMYLN, IFRS
SETREG(0x9d, 0x04);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F ||
if (dev->model->model_id == ModelId::CANON_4400F ||
dev->model->model_id == ModelId::CANON_8400F ||
dev->model->model_id == ModelId::CANON_8600F ||
dev->model->model_id == ModelId::PLUSTEK_OPTICFILM_7200I ||
dev->model->model_id == ModelId::HP_SCANJET_G4010 ||
dev->model->model_id == ModelId::HP_SCANJET_G4050 ||
@ -671,15 +671,15 @@ gl843_init_registers (Genesys_Device * dev)
// SEL3INV, TGSTIME[0:2], TGWTIME[0:2]
if (dev->model->model_id != ModelId::CANON_CANOSCAN_8400F &&
if (dev->model->model_id != ModelId::CANON_8400F &&
dev->model->model_id != ModelId::PLUSTEK_OPTICFILM_7200I)
{
SETREG(0x9e, 0x00); // SENSOR_DEF
}
// RFHSET[0:4]: Refresh time of SDRAM in units of 2us
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F)
if (dev->model->model_id == ModelId::CANON_4400F ||
dev->model->model_id == ModelId::CANON_8600F)
{
SETREG(0xa2, 0x1f);
}
@ -687,19 +687,19 @@ gl843_init_registers (Genesys_Device * dev)
// 0xa6-0xa9: controls gpio, see gl843_gpio_init
// not documented
if (dev->model->model_id != ModelId::CANON_CANOSCAN_4400F &&
dev->model->model_id != ModelId::CANON_CANOSCAN_8400F &&
if (dev->model->model_id != ModelId::CANON_4400F &&
dev->model->model_id != ModelId::CANON_8400F &&
dev->model->model_id != ModelId::PLUSTEK_OPTICFILM_7200I)
{
SETREG(0xaa, 0x00);
}
// GPOM9, MULSTOP[0-2], NODECEL, TB3TB1, TB5TB2, FIX16CLK. Not documented
if (dev->model->model_id != ModelId::CANON_CANOSCAN_8400F &&
if (dev->model->model_id != ModelId::CANON_8400F &&
dev->model->model_id != ModelId::PLUSTEK_OPTICFILM_7200I) {
SETREG(0xab, 0x50);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_4400F) {
if (dev->model->model_id == ModelId::CANON_4400F) {
SETREG(0xab, 0x00);
}
if (dev->model->model_id == ModelId::HP_SCANJET_G4010 ||
@ -713,7 +713,7 @@ gl843_init_registers (Genesys_Device * dev)
// VRHOME[3:2], VRMOVE[3:2], VRBACK[3:2]: Vref setting of the motor driver IC
// for various situations.
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F ||
if (dev->model->model_id == ModelId::CANON_8600F ||
dev->model->model_id == ModelId::HP_SCANJET_G4010 ||
dev->model->model_id == ModelId::HP_SCANJET_G4050 ||
dev->model->model_id == ModelId::HP_SCANJET_4850C)
@ -1116,7 +1116,7 @@ static void gl843_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
}
r = sanei_genesys_get_address (reg, REG03);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
r->value |= REG03_AVEENB;
} else {
r->value &= ~REG03_AVEENB;
@ -1364,8 +1364,8 @@ void CommandSetGl843::calculate_current_setup(Genesys_Device * dev,
start = SANE_UNFIX(dev->model->x_offset);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F)
if (dev->model->model_id == ModelId::CANON_8400F ||
dev->model->model_id == ModelId::CANON_8600F)
{
// FIXME: this is probably just an artifact of a bug elsewhere
start /= ccd_size_divisor;
@ -1601,7 +1601,7 @@ static void gl843_set_xpa_motor_power(Genesys_Device* dev, bool set)
DBG_HELPER(dbg);
uint8_t val;
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
if (set) {
val = dev->read_register(0x6c);
@ -1625,7 +1625,7 @@ static void gl843_set_xpa_motor_power(Genesys_Device* dev, bool set)
val |= REGA9_GPO29;
dev->write_register(0xa9, val);
}
} else if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
} else if (dev->model->model_id == ModelId::CANON_8600F) {
if (set) {
val = dev->read_register(REG6C);
val &= ~REG6C_GPIO14;
@ -1709,14 +1709,14 @@ static void gl843_set_xpa_lamp_power(Genesys_Device* dev, bool set)
// FIXME: BUG: we're not clearing the registers to the previous state when returning back when
// turning off the lamp
LampSettings settings[] = {
{ ModelId::CANON_CANOSCAN_8400F, ScanMethod::TRANSPARENCY, {
{ ModelId::CANON_8400F, ScanMethod::TRANSPARENCY, {
{ 0xa6, 0x34, 0xf4 },
{ 0xa7, 0xe0, 0xe0 }, // BUG: should be 0x03
}, {
{ 0xa6, 0x40, 0x70 },
}
},
{ ModelId::CANON_CANOSCAN_8400F, ScanMethod::TRANSPARENCY_INFRARED, {
{ ModelId::CANON_8400F, ScanMethod::TRANSPARENCY_INFRARED, {
{ 0x6c, 0x40, 0x40 },
{ 0xa6, 0x01, 0xff },
{ 0xa7, 0x03, 0x07 },
@ -1726,14 +1726,14 @@ static void gl843_set_xpa_lamp_power(Genesys_Device* dev, bool set)
{ 0xa7, 0x07, 0x07 },
}
},
{ ModelId::CANON_CANOSCAN_8600F, ScanMethod::TRANSPARENCY, {
{ ModelId::CANON_8600F, ScanMethod::TRANSPARENCY, {
{ 0xa6, 0x34, 0xf4 },
{ 0xa7, 0xe0, 0xe0 },
}, {
{ 0xa6, 0x40, 0x70 },
}
},
{ ModelId::CANON_CANOSCAN_8600F, ScanMethod::TRANSPARENCY_INFRARED, {
{ ModelId::CANON_8600F, ScanMethod::TRANSPARENCY_INFRARED, {
{ 0xa6, 0x00, 0xc0 },
{ 0xa7, 0xe0, 0xe0 },
{ 0x6c, 0x80, 0x80 },
@ -1817,8 +1817,8 @@ void CommandSetGl843::begin_scan(Genesys_Device* dev, const Genesys_Sensor& sens
// blinking led
dev->write_register(REG7E, 0x01);
break;
case GpioId::CS8400F:
case GpioId::CS8600F:
case GpioId::CANON_8400F:
case GpioId::CANON_8600F:
if (reg->state.is_xpa_on && reg->state.is_lamp_on) {
gl843_set_xpa_lamp_power(dev, true);
}
@ -1827,13 +1827,13 @@ void CommandSetGl843::begin_scan(Genesys_Device* dev, const Genesys_Sensor& sens
gl843_set_xpa_motor_power(dev, true);
}
break;
case GpioId::PLUSTEK_7200I: {
case GpioId::PLUSTEK_OPTICFILM_7200I: {
if (reg->state.is_xpa_on && reg->state.is_lamp_on) {
gl843_set_xpa_lamp_power(dev, true);
}
break;
}
case GpioId::CS4400F:
case GpioId::CANON_4400F:
default:
break;
}
@ -2271,7 +2271,7 @@ void CommandSetGl843::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
if ((dev->settings.scan_method == ScanMethod::TRANSPARENCY ||
dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) &&
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F &&
dev->model->model_id == ModelId::CANON_8600F &&
dev->settings.xres == 4800)
{
float offset = SANE_UNFIX(dev->model->x_offset_ta);
@ -2389,8 +2389,8 @@ void CommandSetGl843::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sens
start = SANE_UNFIX(dev->model->x_offset);
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F)
if (dev->model->model_id == ModelId::CANON_8400F ||
dev->model->model_id == ModelId::CANON_8600F)
{
// FIXME: this is probably just an artifact of a bug elsewhere
start /= sensor.get_ccd_size_divisor_for_dpi(dev->settings.xres);
@ -2683,7 +2683,7 @@ void CommandSetGl843::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if ((dev->settings.scan_method == ScanMethod::TRANSPARENCY ||
dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) &&
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F &&
dev->model->model_id == ModelId::CANON_8600F &&
dev->settings.xres == 4800)
{
start_pixel = SANE_UNFIX(dev->model->x_offset_ta);
@ -3107,7 +3107,7 @@ void CommandSetGl843::asic_boot(Genesys_Device* dev, bool cold) const
/* Set default values for registers */
gl843_init_registers (dev);
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
// turns on vref control for maximum current of the motor driver
dev->write_register(REG6B, 0x72);
} else {
@ -3123,12 +3123,12 @@ void CommandSetGl843::asic_boot(Genesys_Device* dev, bool cold) const
dev->write_register(REG0B, val);
dev->reg.find_reg(0x0b).value = val;
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8400F) {
if (dev->model->model_id == ModelId::CANON_8400F) {
sanei_genesys_write_0x8c(dev, 0x1e, 0x01);
sanei_genesys_write_0x8c(dev, 0x10, 0xb4);
sanei_genesys_write_0x8c(dev, 0x0f, 0x02);
}
else if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
else if (dev->model->model_id == ModelId::CANON_8600F) {
sanei_genesys_write_0x8c(dev, 0x10, 0xc8);
} else {
sanei_genesys_write_0x8c(dev, 0x10, 0xb4);
@ -3137,7 +3137,7 @@ void CommandSetGl843::asic_boot(Genesys_Device* dev, bool cold) const
/* CLKSET */
int clock_freq = REG0B_48MHZ;
switch (dev->model->model_id) {
case ModelId::CANON_CANOSCAN_8600F:
case ModelId::CANON_8600F:
clock_freq = REG0B_60MHZ;
break;
case ModelId::PLUSTEK_OPTICFILM_7200I:
@ -3155,7 +3155,7 @@ void CommandSetGl843::asic_boot(Genesys_Device* dev, bool cold) const
/* prevent further writings by bulk write register */
dev->reg.remove_reg(0x0b);
if (dev->model->model_id != ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id != ModelId::CANON_8600F) {
// set up end access
// FIXME: this is overwritten in gl843_init_gpio
dev->write_register(REGA7, 0x04);
@ -3206,8 +3206,8 @@ void CommandSetGl843::update_hardware_sensors(Genesys_Scanner* s) const
s->buttons[BUTTON_EMAIL_SW].write((val & 0x04) == 0);
s->buttons[BUTTON_COPY_SW].write((val & 0x08) == 0);
break;
case GpioId::CS4400F:
case GpioId::CS8400F:
case GpioId::CANON_4400F:
case GpioId::CANON_8400F:
default:
break;
}
@ -3457,7 +3457,7 @@ void CommandSetGl843::send_shading_data(Genesys_Device* dev, const Genesys_Senso
strpixel = dev->session.pixel_startx;
endpixel = dev->session.pixel_endx;
if (dev->model->model_id == ModelId::CANON_CANOSCAN_8600F) {
if (dev->model->model_id == ModelId::CANON_8600F) {
int half_ccd_factor = dev->session.optical_resolution /
sensor.get_logical_hwdpi(dev->session.output_resolution);
strpixel /= half_ccd_factor * sensor.ccd_pixels_per_system_pixel();

2
backend/genesys_gl846.h
Wyświetl plik

@ -73,7 +73,7 @@ typedef struct
static Gpio_Profile gpios[]={
{ GpioId::IMG101, 0x72, 0x1f, 0xa4, 0x13, 0xa7, 0x11, 0xff, 0x19, 0x05},
{ GpioId::PLUSTEK3800, 0x30, 0x01, 0x80, 0x2d, 0x80, 0x0c, 0x8f, 0x08, 0x04},
{ GpioId::PLUSTEK_OPTICBOOK_3800, 0x30, 0x01, 0x80, 0x2d, 0x80, 0x0c, 0x8f, 0x08, 0x04},
{ GpioId::UNKNOWN, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
};

8
backend/genesys_gl847.cc
Wyświetl plik

@ -423,7 +423,7 @@ static void gl847_homsnr_gpio(Genesys_Device* dev)
DBG_HELPER(dbg);
uint8_t val;
if (dev->model->gpio_id == GpioId::CANONLIDE700) {
if (dev->model->gpio_id == GpioId::CANON_LIDE_700F) {
val = dev->read_register(REG6C);
val &= ~REG6C_GPIO10;
dev->write_register(REG6C, val);
@ -1064,7 +1064,7 @@ void CommandSetGl847::begin_scan(Genesys_Device* dev, const Genesys_Sensor& sens
GenesysRegister *r;
// clear GPIO 10
if (dev->model->gpio_id != GpioId::CANONLIDE700) {
if (dev->model->gpio_id != GpioId::CANON_LIDE_700F) {
val = dev->read_register(REG6C);
val &= ~REG6C_GPIO10;
dev->write_register(REG6C, val);
@ -1885,7 +1885,7 @@ static void gl847_init_memory_layout(Genesys_Device* dev)
if (dev->model->model_id == ModelId::CANON_LIDE_200) {
idx = 1;
}
if (dev->model->model_id == ModelId::CANON_CANOSCAN_5600F) {
if (dev->model->model_id == ModelId::CANON_5600F) {
idx = 2;
}
if (dev->model->model_id == ModelId::CANON_LIDE_700F) {
@ -2018,7 +2018,7 @@ void CommandSetGl847::update_hardware_sensors(Genesys_Scanner* s) const
uint8_t val;
uint8_t scan, file, email, copy;
switch(s->dev->model->gpio_id) {
case GpioId::CANONLIDE700:
case GpioId::CANON_LIDE_700F:
scan=0x04;
file=0x02;
email=0x01;

4
backend/genesys_gl847.h
Wyświetl plik

@ -68,8 +68,8 @@ typedef struct
} Gpio_Profile;
static Gpio_Profile gpios[]={
{ GpioId::CANONLIDE200, 0x02, 0xf9, 0x20, 0xff, 0x00, 0x04, 0x04, 0x00, 0x00},
{ GpioId::CANONLIDE700, 0x06, 0xdb, 0xff, 0xff, 0x80, 0x15, 0x07, 0x20, 0x10},
{ GpioId::CANON_LIDE_200, 0x02, 0xf9, 0x20, 0xff, 0x00, 0x04, 0x04, 0x00, 0x00},
{ GpioId::CANON_LIDE_700F, 0x06, 0xdb, 0xff, 0xff, 0x80, 0x15, 0x07, 0x20, 0x10},
{ GpioId::UNKNOWN, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
};

4
backend/genesys_low.cc
Wyświetl plik

@ -918,8 +918,8 @@ void sanei_genesys_set_lamp_power(Genesys_Device* dev, const Genesys_Sensor& sen
sanei_genesys_set_exposure(regs, sensor.exposure);
// we don't actually turn on lamp on infrared scan
if ((dev->model->model_id == ModelId::CANON_CANOSCAN_8400F ||
dev->model->model_id == ModelId::CANON_CANOSCAN_8600F ||
if ((dev->model->model_id == ModelId::CANON_8400F ||
dev->model->model_id == ModelId::CANON_8600F ||
dev->model->model_id == ModelId::PLUSTEK_OPTICFILM_7200I) &&
dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED)
{

22
backend/genesys_tables_frontend.cc
Wyświetl plik

@ -194,7 +194,7 @@ void genesys_init_frontend_tables()
fe = Genesys_Frontend();
fe.id = AdcId::CANONLIDE35;
fe.id = AdcId::CANON_LIDE_35;
fe.layout = wolfson_layout;
fe.regs = {
{ 0x00, 0x00 },
@ -304,7 +304,7 @@ void genesys_init_frontend_tables()
fe = Genesys_Frontend();
fe.id = AdcId::CANONLIDE200;
fe.id = AdcId::CANON_LIDE_200;
fe.layout = wolfson_layout;
fe.regs = {
{ 0x00, 0x9d },
@ -326,7 +326,7 @@ void genesys_init_frontend_tables()
fe = Genesys_Frontend();
fe.id = AdcId::CANONLIDE700;
fe.id = AdcId::CANON_LIDE_700F;
fe.layout = wolfson_layout;
fe.regs = {
{ 0x00, 0x9d },
@ -392,7 +392,7 @@ void genesys_init_frontend_tables()
fe = Genesys_Frontend();
fe.id = AdcId::CANONLIDE110;
fe.id = AdcId::CANON_LIDE_110;
fe.layout = wolfson_layout;
fe.regs = {
{ 0x00, 0x80 },
@ -418,7 +418,7 @@ void genesys_init_frontend_tables()
* (from Texas Instrument or alike ?)
*/
fe = Genesys_Frontend();
fe.id = AdcId::CANONLIDE120;
fe.id = AdcId::CANON_LIDE_120;
fe.layout = wolfson_layout;
fe.regs = {
{ 0x00, 0x80 },
@ -440,7 +440,7 @@ void genesys_init_frontend_tables()
fe = Genesys_Frontend();
fe.id = AdcId::PLUSTEK_3600;
fe.id = AdcId::PLUSTEK_OPTICPRO_3600;
fe.layout = wolfson_layout;
fe.regs = {
{ 0x00, 0x70 },
@ -462,7 +462,7 @@ void genesys_init_frontend_tables()
fe = Genesys_Frontend();
fe.id = AdcId::PLUSTEK_7200I;
fe.id = AdcId::PLUSTEK_OPTICFILM_7200I;
fe.layout = analog_devices;
fe.regs = {
{ 0x00, 0xf8 },
@ -479,7 +479,7 @@ void genesys_init_frontend_tables()
fe = Genesys_Frontend();
fe.id = AdcId::CS8400F;
fe.id = AdcId::CANON_8400F;
fe.layout = wolfson_layout;
fe.regs = {
{ 0x00, 0x00 },
@ -501,7 +501,7 @@ void genesys_init_frontend_tables()
fe = Genesys_Frontend();
fe.id = AdcId::CS8600F;
fe.id = AdcId::CANON_8600F;
fe.layout = wolfson_layout;
fe.regs = {
{ 0x00, 0x00 },
@ -545,7 +545,7 @@ void genesys_init_frontend_tables()
fe = Genesys_Frontend();
fe.id = AdcId::PLUSTEK3800;
fe.id = AdcId::PLUSTEK_OPTICBOOK_3800;
fe.layout = wolfson_layout;
fe.regs = {
{ 0x00, 0x78 },
@ -571,7 +571,7 @@ void genesys_init_frontend_tables()
* reg6: gain
* reg0 , reg3, reg6 */
fe = Genesys_Frontend();
fe.id = AdcId::CANONLIDE80;
fe.id = AdcId::CANON_LIDE_80;
fe.layout = wolfson_layout;
fe.regs = {
{ 0x00, 0x70 },

26
backend/genesys_tables_gpo.cc
Wyświetl plik

@ -118,7 +118,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::CANONLIDE35;
gpo.id = GpioId::CANON_LIDE_35;
gpo.regs = {
{ 0x6c, 0x02 },
{ 0x6d, 0x80 },
@ -184,7 +184,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::CANONLIDE200;
gpo.id = GpioId::CANON_LIDE_200;
gpo.regs = {
{ 0x6c, 0xfb }, // 0xfb when idle , 0xf9/0xe9 (1200) when scanning
{ 0x6d, 0x20 },
@ -195,7 +195,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::CANONLIDE700;
gpo.id = GpioId::CANON_LIDE_700F;
gpo.regs = {
{ 0x6c, 0xdb },
{ 0x6d, 0xff },
@ -247,7 +247,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::CANONLIDE110;
gpo.id = GpioId::CANON_LIDE_110;
gpo.regs = {
{ 0x6c, 0xfb },
{ 0x6d, 0x20 },
@ -258,7 +258,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::CANONLIDE120;
gpo.id = GpioId::CANON_LIDE_120;
gpo.regs = {
{ 0x6c, 0xfb },
{ 0x6d, 0x20 },
@ -269,7 +269,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::CANONLIDE210;
gpo.id = GpioId::CANON_LIDE_210;
gpo.regs = {
{ 0x6c, 0xfb },
{ 0x6d, 0x20 },
@ -280,7 +280,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::PLUSTEK_3600;
gpo.id = GpioId::PLUSTEK_OPTICPRO_3600;
gpo.regs = {
{ 0x6c, 0x02 },
{ 0x6d, 0x00 },
@ -291,7 +291,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::PLUSTEK_7200I;
gpo.id = GpioId::PLUSTEK_OPTICFILM_7200I;
gpo.regs = {
{ 0x6c, 0x4c },
{ 0x6d, 0x80 },
@ -306,7 +306,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::CS4400F;
gpo.id = GpioId::CANON_4400F;
gpo.regs = {
{ 0x6c, 0x01 },
{ 0x6d, 0x7f },
@ -321,7 +321,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::CS8400F;
gpo.id = GpioId::CANON_8400F;
gpo.regs = {
{ 0x6c, 0x9a },
{ 0x6d, 0xdf },
@ -336,7 +336,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::CS8600F;
gpo.id = GpioId::CANON_8600F;
gpo.regs = {
{ 0x6c, 0x20 },
{ 0x6d, 0x7c },
@ -362,7 +362,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::PLUSTEK3800;
gpo.id = GpioId::PLUSTEK_OPTICBOOK_3800;
gpo.regs = {
{ 0x6c, 0x41 },
{ 0x6d, 0xa4 },
@ -373,7 +373,7 @@ void genesys_init_gpo_tables()
gpo = Genesys_Gpo();
gpo.id = GpioId::CANONLIDE80;
gpo.id = GpioId::CANON_LIDE_80;
gpo.regs = {
{ 0x6c, 0x28 },
{ 0x6d, 0x90 },

144
backend/genesys_tables_model.cc
Wyświetl plik

@ -153,10 +153,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CCD_CANONLIDE35;
model.adc_id = AdcId::CANONLIDE35;
model.gpio_id = GpioId::CANONLIDE35;
model.motor_id = MotorId::CANONLIDE35;
model.sensor_id = SensorId::CIS_CANON_LIDE_35;
model.adc_id = AdcId::CANON_LIDE_35;
model.gpio_id = GpioId::CANON_LIDE_35;
model.motor_id = MotorId::CANON_LIDE_35;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_OFFSET_CALIBRATION |
GENESYS_FLAG_DARK_WHITE_CALIBRATION |
@ -396,7 +396,7 @@ void genesys_init_usb_device_tables()
model.name = "canon-canoscan-4400f";
model.vendor = "Canon";
model.model = "Canoscan 4400f";
model.model_id = ModelId::CANON_CANOSCAN_4400F;
model.model_id = ModelId::CANON_4400F;
model.asic_type = AsicType::GL843;
model.xdpi_values = { 4800, 2400, 1200, 600, 400, 300, 200, 150, 100 };
@ -431,9 +431,9 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_FALSE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CCD_CS4400F;
model.sensor_id = SensorId::CCD_CANON_4400F;
model.adc_id = AdcId::G4050;
model.gpio_id = GpioId::CS4400F;
model.gpio_id = GpioId::CANON_4400F;
model.motor_id = MotorId::G4050;
model.flags = GENESYS_FLAG_NO_CALIBRATION |
GENESYS_FLAG_OFFSET_CALIBRATION |
@ -454,7 +454,7 @@ void genesys_init_usb_device_tables()
model.name = "canon-canoscan-8400f";
model.vendor = "Canon";
model.model = "Canoscan 8400f";
model.model_id = ModelId::CANON_CANOSCAN_8400F;
model.model_id = ModelId::CANON_8400F;
model.asic_type = AsicType::GL843;
model.xdpi_values = { 4800, 2400, 1200, 600, 400, 300, 200, 150, 100 };
@ -489,10 +489,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_FALSE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CCD_CS8400F;
model.adc_id = AdcId::CS8400F;
model.gpio_id = GpioId::CS8400F;
model.motor_id = MotorId::CS8400F;
model.sensor_id = SensorId::CCD_CANON_8400F;
model.adc_id = AdcId::CANON_8400F;
model.gpio_id = GpioId::CANON_8400F;
model.motor_id = MotorId::CANON_8400F;
model.flags = GENESYS_FLAG_HAS_UTA |
GENESYS_FLAG_HAS_UTA_INFRARED |
GENESYS_FLAG_OFFSET_CALIBRATION |
@ -514,7 +514,7 @@ void genesys_init_usb_device_tables()
model.name = "canon-canoscan-8600f";
model.vendor = "Canon";
model.model = "Canoscan 8600f";
model.model_id = ModelId::CANON_CANOSCAN_8600F;
model.model_id = ModelId::CANON_8600F;
model.asic_type = AsicType::GL843;
model.xdpi_values = { 4800, 2400, 1200, 600, 400, 300 }; // TODO: resolutions for non-XPA mode
@ -549,10 +549,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_FALSE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CCD_CS8600F;
model.adc_id = AdcId::CS8600F;
model.gpio_id = GpioId::CS8600F;
model.motor_id = MotorId::CS8600F;
model.sensor_id = SensorId::CCD_CANON_8600F;
model.adc_id = AdcId::CANON_8600F;
model.gpio_id = GpioId::CANON_8600F;
model.motor_id = MotorId::CANON_8600F;
model.flags = GENESYS_FLAG_HAS_UTA |
GENESYS_FLAG_HAS_UTA_INFRARED |
GENESYS_FLAG_OFFSET_CALIBRATION |
@ -609,10 +609,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CIS_CANONLIDE100;
model.adc_id = AdcId::CANONLIDE200;
model.gpio_id = GpioId::CANONLIDE200;
model.motor_id = MotorId::CANONLIDE100;
model.sensor_id = SensorId::CIS_CANON_LIDE_100;
model.adc_id = AdcId::CANON_LIDE_200;
model.gpio_id = GpioId::CANON_LIDE_200;
model.motor_id = MotorId::CANON_LIDE_100;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_SIS_SENSOR |
GENESYS_FLAG_DARK_CALIBRATION |
@ -668,10 +668,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CIS_CANONLIDE110;
model.adc_id = AdcId::CANONLIDE110;
model.gpio_id = GpioId::CANONLIDE110;
model.motor_id = MotorId::CANONLIDE110;
model.sensor_id = SensorId::CIS_CANON_LIDE_110;
model.adc_id = AdcId::CANON_LIDE_110;
model.gpio_id = GpioId::CANON_LIDE_110;
model.motor_id = MotorId::CANON_LIDE_110;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_OFFSET_CALIBRATION |
GENESYS_FLAG_DARK_CALIBRATION |
@ -725,10 +725,10 @@ void genesys_init_usb_device_tables()
model.line_mode_color_order = ColorOrder::RGB;
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CIS_CANONLIDE120;
model.adc_id = AdcId::CANONLIDE120;
model.gpio_id = GpioId::CANONLIDE120;
model.motor_id = MotorId::CANONLIDE120;
model.sensor_id = SensorId::CIS_CANON_LIDE_120;
model.adc_id = AdcId::CANON_LIDE_120;
model.gpio_id = GpioId::CANON_LIDE_120;
model.motor_id = MotorId::CANON_LIDE_120;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_OFFSET_CALIBRATION |
GENESYS_FLAG_DARK_CALIBRATION |
@ -784,10 +784,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CIS_CANONLIDE210;
model.adc_id = AdcId::CANONLIDE110;
model.gpio_id = GpioId::CANONLIDE210;
model.motor_id = MotorId::CANONLIDE210;
model.sensor_id = SensorId::CIS_CANON_LIDE_210;
model.adc_id = AdcId::CANON_LIDE_110;
model.gpio_id = GpioId::CANON_LIDE_210;
model.motor_id = MotorId::CANON_LIDE_210;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_OFFSET_CALIBRATION |
GENESYS_FLAG_DARK_CALIBRATION |
@ -843,10 +843,10 @@ void genesys_init_usb_device_tables()
model.line_mode_color_order = ColorOrder::RGB;
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CIS_CANONLIDE220;
model.adc_id = AdcId::CANONLIDE110;
model.gpio_id = GpioId::CANONLIDE210;
model.motor_id = MotorId::CANONLIDE210;
model.sensor_id = SensorId::CIS_CANON_LIDE_220;
model.adc_id = AdcId::CANON_LIDE_110;
model.gpio_id = GpioId::CANON_LIDE_210;
model.motor_id = MotorId::CANON_LIDE_210;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_OFFSET_CALIBRATION |
GENESYS_FLAG_DARK_CALIBRATION |
@ -868,7 +868,7 @@ void genesys_init_usb_device_tables()
model.name = "canon-5600f";
model.vendor = "Canon";
model.model = "5600F";
model.model_id = ModelId::CANON_CANOSCAN_5600F;
model.model_id = ModelId::CANON_5600F;
model.asic_type = AsicType::GL847;
model.xdpi_values = { 1200, 600, 400, 300, 200, 150, 100, 75 };
@ -903,10 +903,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CIS_CANONLIDE200;
model.adc_id = AdcId::CANONLIDE200;
model.gpio_id = GpioId::CANONLIDE200;
model.motor_id = MotorId::CANONLIDE200;
model.sensor_id = SensorId::CIS_CANON_LIDE_200;
model.adc_id = AdcId::CANON_LIDE_200;
model.gpio_id = GpioId::CANON_LIDE_200;
model.motor_id = MotorId::CANON_LIDE_200;
model.flags = GENESYS_FLAG_UNTESTED |
GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_SIS_SENSOR |
@ -962,10 +962,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CIS_CANONLIDE700;
model.adc_id = AdcId::CANONLIDE700;
model.gpio_id = GpioId::CANONLIDE700;
model.motor_id = MotorId::CANONLIDE700;
model.sensor_id = SensorId::CIS_CANON_LIDE_700F;
model.adc_id = AdcId::CANON_LIDE_700F;
model.gpio_id = GpioId::CANON_LIDE_700F;
model.motor_id = MotorId::CANON_LIDE_700;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_SIS_SENSOR |
GENESYS_FLAG_OFFSET_CALIBRATION |
@ -1021,10 +1021,10 @@ void genesys_init_usb_device_tables()
model.line_mode_color_order = ColorOrder::RGB;
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CIS_CANONLIDE200;
model.adc_id = AdcId::CANONLIDE200;
model.gpio_id = GpioId::CANONLIDE200;
model.motor_id = MotorId::CANONLIDE200;
model.sensor_id = SensorId::CIS_CANON_LIDE_200;
model.adc_id = AdcId::CANON_LIDE_200;
model.gpio_id = GpioId::CANON_LIDE_200;
model.motor_id = MotorId::CANON_LIDE_200;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_SIS_SENSOR |
GENESYS_FLAG_OFFSET_CALIBRATION |
@ -1080,10 +1080,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CCD_CANONLIDE35;
model.adc_id = AdcId::CANONLIDE35;
model.gpio_id = GpioId::CANONLIDE35;
model.motor_id = MotorId::CANONLIDE35;
model.sensor_id = SensorId::CIS_CANON_LIDE_35;
model.adc_id = AdcId::CANON_LIDE_35;
model.gpio_id = GpioId::CANON_LIDE_35;
model.motor_id = MotorId::CANON_LIDE_35;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_OFFSET_CALIBRATION |
GENESYS_FLAG_DARK_WHITE_CALIBRATION |
@ -1138,10 +1138,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_TRUE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CIS_CANONLIDE80;
model.adc_id = AdcId::CANONLIDE80;
model.gpio_id = GpioId::CANONLIDE80;
model.motor_id = MotorId::CANONLIDE80;
model.sensor_id = SensorId::CIS_CANON_LIDE_80;
model.adc_id = AdcId::CANON_LIDE_80;
model.gpio_id = GpioId::CANON_LIDE_80;
model.motor_id = MotorId::CANON_LIDE_80;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_OFFSET_CALIBRATION |
GENESYS_FLAG_DARK_WHITE_CALIBRATION |
@ -2312,10 +2312,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_FALSE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CCD_PLUSTEK_3600;
model.adc_id = AdcId::PLUSTEK_3600;
model.gpio_id = GpioId::PLUSTEK_3600;
model.motor_id = MotorId::PLUSTEK_3600;
model.sensor_id = SensorId::CCD_PLUSTEK_OPTICPRO_3600;
model.adc_id = AdcId::PLUSTEK_OPTICPRO_3600;
model.gpio_id = GpioId::PLUSTEK_OPTICPRO_3600;
model.motor_id = MotorId::PLUSTEK_OPTICPRO_3600;
model.flags = GENESYS_FLAG_UNTESTED | // not fully working yet
GENESYS_FLAG_CUSTOM_GAMMA |
GENESYS_FLAG_SKIP_WARMUP |
@ -2367,10 +2367,10 @@ void genesys_init_usb_device_tables()
model.is_cis = false;
model.is_sheetfed = false;
model.sensor_id = SensorId::CCD_PLUSTEK_7200I;
model.adc_id = AdcId::PLUSTEK_7200I;
model.gpio_id = GpioId::PLUSTEK_7200I;
model.motor_id = MotorId::PLUSTEK_7200I;
model.sensor_id = SensorId::CCD_PLUSTEK_OPTICFILM_7200I;
model.adc_id = AdcId::PLUSTEK_OPTICFILM_7200I;
model.gpio_id = GpioId::PLUSTEK_OPTICFILM_7200I;
model.motor_id = MotorId::PLUSTEK_OPTICFILM_7200I;
model.flags = GENESYS_FLAG_HAS_UTA |
GENESYS_FLAG_HAS_UTA_INFRARED |
@ -2430,9 +2430,9 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_FALSE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CCD_HP_N6310;
model.adc_id = AdcId::CANONLIDE200; // Not defined yet for N6310
model.adc_id = AdcId::CANON_LIDE_200; // Not defined yet for N6310
model.gpio_id = GpioId::HP_N6310;
model.motor_id = MotorId::CANONLIDE200, // Not defined yet for N6310
model.motor_id = MotorId::CANON_LIDE_200, // Not defined yet for N6310
model.flags = GENESYS_FLAG_UNTESTED |
GENESYS_FLAG_14BIT_GAMMA |
GENESYS_FLAG_DARK_CALIBRATION |
@ -2488,10 +2488,10 @@ void genesys_init_usb_device_tables()
model.is_cis = SANE_FALSE;
model.is_sheetfed = SANE_FALSE;
model.sensor_id = SensorId::CCD_PLUSTEK3800;
model.adc_id = AdcId::PLUSTEK3800;
model.gpio_id = GpioId::PLUSTEK3800;
model.motor_id = MotorId::PLUSTEK3800;
model.sensor_id = SensorId::CCD_PLUSTEK_OPTICBOOK_3800;
model.adc_id = AdcId::PLUSTEK_OPTICBOOK_3800;
model.gpio_id = GpioId::PLUSTEK_OPTICBOOK_3800;
model.motor_id = MotorId::PLUSTEK_OPTICBOOK_3800;
model.flags = GENESYS_FLAG_SKIP_WARMUP |
GENESYS_FLAG_OFFSET_CALIBRATION |
GENESYS_FLAG_CUSTOM_GAMMA;

26
backend/genesys_tables_motor.cc
Wyświetl plik

@ -193,7 +193,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::CANONLIDE35;
motor.id = MotorId::CANON_LIDE_35;
motor.base_ydpi = 1200;
motor.optical_ydpi = 2400;
motor.max_step_type = 1;
@ -331,7 +331,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::CANONLIDE100;
motor.id = MotorId::CANON_LIDE_100;
motor.base_ydpi = 1200;
motor.optical_ydpi = 6400;
motor.max_step_type = 2;
@ -361,7 +361,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::CANONLIDE200;
motor.id = MotorId::CANON_LIDE_200;
motor.base_ydpi = 1200;
motor.optical_ydpi = 6400;
motor.max_step_type = 2;
@ -391,7 +391,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::CANONLIDE700;
motor.id = MotorId::CANON_LIDE_700;
motor.base_ydpi = 1200;
motor.optical_ydpi = 6400;
motor.max_step_type = 2;
@ -481,7 +481,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::CS8400F;
motor.id = MotorId::CANON_8400F;
motor.base_ydpi = 1200;
motor.optical_ydpi = 9600;
motor.max_step_type = 2;
@ -511,7 +511,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::CS8600F;
motor.id = MotorId::CANON_8600F;
motor.base_ydpi = 2400;
motor.optical_ydpi = 9600;
motor.max_step_type = 2;
@ -541,7 +541,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::CANONLIDE110;
motor.id = MotorId::CANON_LIDE_110;
motor.base_ydpi = 4800;
motor.optical_ydpi = 9600;
motor.max_step_type = 1;
@ -557,7 +557,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::CANONLIDE120;
motor.id = MotorId::CANON_LIDE_120;
motor.base_ydpi = 4800;
motor.optical_ydpi = 9600;
motor.max_step_type = 1;
@ -573,7 +573,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::CANONLIDE210;
motor.id = MotorId::CANON_LIDE_210;
motor.base_ydpi = 4800;
motor.optical_ydpi = 9600;
motor.max_step_type = 1;
@ -589,7 +589,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::PLUSTEK_3600;
motor.id = MotorId::PLUSTEK_OPTICPRO_3600;
motor.base_ydpi = 1200;
motor.optical_ydpi = 2400;
motor.max_step_type = 1;
@ -612,7 +612,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::PLUSTEK_7200I;
motor.id = MotorId::PLUSTEK_OPTICFILM_7200I;
motor.base_ydpi = 3600;
motor.optical_ydpi = 3600;
motor.max_step_type = 0; // only used on GL841
@ -643,7 +643,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::PLUSTEK3800;
motor.id = MotorId::PLUSTEK_OPTICBOOK_3800;
motor.base_ydpi = 600;
motor.optical_ydpi = 1200;
motor.max_step_type = 1;
@ -666,7 +666,7 @@ void genesys_init_motor_tables()
motor = Genesys_Motor();
motor.id = MotorId::CANONLIDE80;
motor.id = MotorId::CANON_LIDE_80;
motor.base_ydpi = 2400;
motor.optical_ydpi = 4800, // 9600
motor.max_step_type = 1;

66
backend/genesys_tables_motor_profile.cc
Wyświetl plik

@ -754,10 +754,10 @@ Motor_Profile gl843_motor_profiles[] = {
{ MotorId::G4050, 15624, StepType::HALF, g4050_xpa },
{ MotorId::G4050, 42752, StepType::QUARTER, g4050_max },
{ MotorId::G4050, 56064, StepType::HALF, g4050_high },
{ MotorId::CS8400F, 50000, StepType::QUARTER, cs8400f_fast },
{ MotorId::CS8600F, 0x59d8, StepType::QUARTER, motor_speeds_cs8600f }, // FIXME: if the exposure is lower then we'll select another motor
{ MotorId::PLUSTEK_7200I, 0x19c8, StepType::HALF, motor_speeds_plustek_7200i_1},
{ MotorId::PLUSTEK_7200I, 0x2538, StepType::HALF, motor_speeds_plustek_7200i_2},
{ MotorId::CANON_8400F, 50000, StepType::QUARTER, cs8400f_fast },
{ MotorId::CANON_8600F, 0x59d8, StepType::QUARTER, motor_speeds_cs8600f }, // FIXME: if the exposure is lower then we'll select another motor
{ MotorId::PLUSTEK_OPTICFILM_7200I, 0x19c8, StepType::HALF, motor_speeds_plustek_7200i_1},
{ MotorId::PLUSTEK_OPTICFILM_7200I, 0x2538, StepType::HALF, motor_speeds_plustek_7200i_2},
{ MotorId::UNKNOWN, 0, StepType::FULL, NULL },
};
@ -875,7 +875,7 @@ static uint32_t img101_high[] = {
Motor_Profile gl846_motor_profiles[] = {
{ MotorId::IMG101, 11000, StepType::HALF, img101_high},
{ MotorId::PLUSTEK3800, 11000, StepType::HALF, img101_high},
{ MotorId::PLUSTEK_OPTICBOOK_3800, 11000, StepType::HALF, img101_high},
{ MotorId::UNKNOWN, 0, StepType::FULL, NULL},
};
@ -1027,24 +1027,24 @@ static uint32_t lide200_max[] = { 124992, 124992, 124992, 124992, 124992, 124992
*/
Motor_Profile gl847_motor_profiles[] = {
{ MotorId::CANONLIDE100, 2848, StepType::HALF , lide200_base },
{ MotorId::CANONLIDE100, 1424, StepType::HALF , lide200_base },
{ MotorId::CANONLIDE100, 1432, StepType::HALF , lide200_base },
{ MotorId::CANONLIDE100, 2712, StepType::QUARTER, lide200_medium },
{ MotorId::CANONLIDE100, 5280, StepType::EIGHTH , lide200_high },
{ MotorId::CANON_LIDE_100, 2848, StepType::HALF , lide200_base },
{ MotorId::CANON_LIDE_100, 1424, StepType::HALF , lide200_base },
{ MotorId::CANON_LIDE_100, 1432, StepType::HALF , lide200_base },
{ MotorId::CANON_LIDE_100, 2712, StepType::QUARTER, lide200_medium },
{ MotorId::CANON_LIDE_100, 5280, StepType::EIGHTH , lide200_high },
{ MotorId::CANONLIDE200, 2848, StepType::HALF , lide200_base },
{ MotorId::CANONLIDE200, 1424, StepType::HALF , lide200_base },
{ MotorId::CANONLIDE200, 1432, StepType::HALF , lide200_base },
{ MotorId::CANONLIDE200, 2712, StepType::QUARTER, lide200_medium },
{ MotorId::CANONLIDE200, 5280, StepType::EIGHTH , lide200_high },
{ MotorId::CANONLIDE200, 10416, StepType::EIGHTH , lide200_high },
{ MotorId::CANON_LIDE_200, 2848, StepType::HALF , lide200_base },
{ MotorId::CANON_LIDE_200, 1424, StepType::HALF , lide200_base },
{ MotorId::CANON_LIDE_200, 1432, StepType::HALF , lide200_base },
{ MotorId::CANON_LIDE_200, 2712, StepType::QUARTER, lide200_medium },
{ MotorId::CANON_LIDE_200, 5280, StepType::EIGHTH , lide200_high },
{ MotorId::CANON_LIDE_200, 10416, StepType::EIGHTH , lide200_high },
{ MotorId::CANONLIDE700, 2848, StepType::HALF , lide200_base },
{ MotorId::CANONLIDE700, 1424, StepType::HALF , lide200_base },
{ MotorId::CANONLIDE700, 1504, StepType::HALF , lide200_base },
{ MotorId::CANONLIDE700, 2696, StepType::HALF , lide700_medium }, /* 2696 , 2838 */
{ MotorId::CANONLIDE700, 10576, StepType::EIGHTH, lide700_high },
{ MotorId::CANON_LIDE_700, 2848, StepType::HALF , lide200_base },
{ MotorId::CANON_LIDE_700, 1424, StepType::HALF , lide200_base },
{ MotorId::CANON_LIDE_700, 1504, StepType::HALF , lide200_base },
{ MotorId::CANON_LIDE_700, 2696, StepType::HALF , lide700_medium }, /* 2696 , 2838 */
{ MotorId::CANON_LIDE_700, 10576, StepType::EIGHTH, lide700_high },
{ MotorId::UNKNOWN, 0, StepType::FULL, NULL},
};
@ -1163,20 +1163,20 @@ static uint32_t lide210_max[] = { 62496, 31296, 20864, 10432, 0 };
// NEXT LPERIOD=PREVIOUS*2-192
Motor_Profile gl124_motor_profiles[] = {
{ MotorId::CANONLIDE110, 2768, StepType::FULL, lide210_fast },
{ MotorId::CANONLIDE110, 5360, StepType::HALF, lide110_ok },
{ MotorId::CANONLIDE110, 10528, StepType::HALF, lide110_slow },
{ MotorId::CANONLIDE110, 20864, StepType::QUARTER, lide110_max },
{ MotorId::CANON_LIDE_110, 2768, StepType::FULL, lide210_fast },
{ MotorId::CANON_LIDE_110, 5360, StepType::HALF, lide110_ok },
{ MotorId::CANON_LIDE_110, 10528, StepType::HALF, lide110_slow },
{ MotorId::CANON_LIDE_110, 20864, StepType::QUARTER, lide110_max },
{ MotorId::CANONLIDE120, 4608, StepType::FULL, lide120_fast },
{ MotorId::CANONLIDE120, 5360, StepType::HALF, lide120_ok },
{ MotorId::CANONLIDE120, 10528, StepType::QUARTER, lide120_slow },
{ MotorId::CANONLIDE120, 20864, StepType::QUARTER, lide120_max },
{ MotorId::CANON_LIDE_120, 4608, StepType::FULL, lide120_fast },
{ MotorId::CANON_LIDE_120, 5360, StepType::HALF, lide120_ok },
{ MotorId::CANON_LIDE_120, 10528, StepType::QUARTER, lide120_slow },
{ MotorId::CANON_LIDE_120, 20864, StepType::QUARTER, lide120_max },
{ MotorId::CANONLIDE210, 2768, StepType::FULL, lide210_fast },
{ MotorId::CANONLIDE210, 5360, StepType::HALF, lide110_ok },
{ MotorId::CANONLIDE210, 10528, StepType::HALF, lide110_slow },
{ MotorId::CANONLIDE210, 20864, StepType::QUARTER, lide210_max },
{ MotorId::CANON_LIDE_210, 2768, StepType::FULL, lide210_fast },
{ MotorId::CANON_LIDE_210, 5360, StepType::HALF, lide110_ok },
{ MotorId::CANON_LIDE_210, 10528, StepType::HALF, lide110_slow },
{ MotorId::CANON_LIDE_210, 20864, StepType::QUARTER, lide210_max },
{ MotorId::UNKNOWN, 0, StepType::FULL, NULL},
};

30
backend/genesys_tables_sensor.cc
Wyświetl plik

@ -986,7 +986,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CCD_CANONLIDE35;
sensor.sensor_id = SensorId::CIS_CANON_LIDE_35;
sensor.optical_res = 1200;
sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87;
@ -1590,7 +1590,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CIS_CANONLIDE200;
sensor.sensor_id = SensorId::CIS_CANON_LIDE_200;
sensor.optical_res = 4800;
sensor.black_pixels = 87*4;
sensor.dummy_pixel = 16*4;
@ -1726,7 +1726,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CIS_CANONLIDE700;
sensor.sensor_id = SensorId::CIS_CANON_LIDE_700F;
sensor.optical_res = 4800;
sensor.black_pixels = 73*8; // black pixels 73 at 600 dpi
sensor.dummy_pixel = 16*8;
@ -1864,7 +1864,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CIS_CANONLIDE100;
sensor.sensor_id = SensorId::CIS_CANON_LIDE_100;
sensor.optical_res = 2400;
sensor.black_pixels = 87*4, /* black pixels */
sensor.dummy_pixel = 16*4;
@ -2213,7 +2213,7 @@ void genesys_init_sensor_tables()
}
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CCD_CS4400F;
sensor.sensor_id = SensorId::CCD_CANON_4400F;
sensor.optical_res = 4800;
sensor.ccd_size_divisor = 4;
sensor.black_pixels = 50*8;
@ -2262,7 +2262,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CCD_CS8400F;
sensor.sensor_id = SensorId::CCD_CANON_8400F;
sensor.optical_res = 4800;
sensor.ccd_size_divisor = 2;
sensor.black_pixels = 50*8;
@ -2476,7 +2476,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CCD_CS8600F;
sensor.sensor_id = SensorId::CCD_CANON_8600F;
sensor.optical_res = 4800;
sensor.ccd_size_divisor = 4;
sensor.black_pixels = 31;
@ -2719,7 +2719,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CIS_CANONLIDE110;
sensor.sensor_id = SensorId::CIS_CANON_LIDE_110;
sensor.optical_res = 2400;
sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87;
@ -2854,7 +2854,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CIS_CANONLIDE120;
sensor.sensor_id = SensorId::CIS_CANON_LIDE_120;
sensor.optical_res = 2400;
sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87;
@ -2990,7 +2990,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CIS_CANONLIDE210;
sensor.sensor_id = SensorId::CIS_CANON_LIDE_210;
sensor.optical_res = 2400;
sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87;
@ -3125,7 +3125,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CIS_CANONLIDE220;
sensor.sensor_id = SensorId::CIS_CANON_LIDE_220;
sensor.optical_res = 2400;
sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87;
@ -3260,7 +3260,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CCD_PLUSTEK_3600;
sensor.sensor_id = SensorId::CCD_PLUSTEK_OPTICPRO_3600;
sensor.optical_res = 1200;
sensor.ccd_size_divisor = 2;
sensor.black_pixels = 87;
@ -3306,7 +3306,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CCD_PLUSTEK_7200I;
sensor.sensor_id = SensorId::CCD_PLUSTEK_OPTICFILM_7200I;
sensor.optical_res = 7200;
sensor.register_dpihw_override = 1200;
sensor.black_pixels = 88; // TODO
@ -3456,7 +3456,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CCD_PLUSTEK3800;
sensor.sensor_id = SensorId::CCD_PLUSTEK_OPTICBOOK_3800;
sensor.optical_res = 1200;
sensor.black_pixels = 31;
sensor.dummy_pixel = 31;
@ -3517,7 +3517,7 @@ void genesys_init_sensor_tables()
sensor = Genesys_Sensor();
sensor.sensor_id = SensorId::CIS_CANONLIDE80,
sensor.sensor_id = SensorId::CIS_CANON_LIDE_80,
sensor.optical_res = 1200; // real hardware limit is 2400
sensor.ccd_size_divisor = 2;
sensor.black_pixels = 20;