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

genesys: Rename calib_reg to initial_regs

merge-requests/340/head
Povilas Kanapickas 2020-02-02 18:45:31 +02:00
rodzic 16e8ca3511
commit 32041bc7fe
9 zmienionych plików z 16 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/genesys/device.cpp
Wyświetl plik

@ -209,7 +209,7 @@ std::ostream& operator<<(std::ostream& out, const Genesys_Device& dev)
<< " ignore_offsets: " << dev.ignore_offsets << '\n'
<< " model: (not printed)\n"
<< " reg: " << format_indent_braced_list(4, dev.reg) << '\n'
<< " calib_reg: " << format_indent_braced_list(4, dev.calib_reg) << '\n'
<< " initial_regs: " << format_indent_braced_list(4, dev.initial_regs) << '\n'
<< " settings: " << format_indent_braced_list(4, dev.settings) << '\n'
<< " frontend: " << format_indent_braced_list(4, dev.frontend) << '\n'
<< " frontend_initial: " << format_indent_braced_list(4, dev.frontend_initial) << '\n'

2
backend/genesys/device.h
Wyświetl plik

@ -250,7 +250,7 @@ struct Genesys_Device
std::unique_ptr<CommandSet> cmd_set;
Genesys_Register_Set reg;
Genesys_Register_Set calib_reg;
Genesys_Register_Set initial_regs;
Genesys_Settings settings;
Genesys_Frontend frontend, frontend_initial;

4
backend/genesys/genesys.cpp
Wyświetl plik

@ -2912,7 +2912,7 @@ static void genesys_flatbed_calibration(Genesys_Device* dev, Genesys_Sensor& sen
coarse_res = 1200;
}
auto local_reg = dev->calib_reg;
auto local_reg = dev->initial_regs;
/* do offset calibration if needed */
if (has_flag(dev->model->flags, ModelFlag::OFFSET_CALIBRATION)) {
@ -3039,7 +3039,7 @@ static void genesys_sheetfed_calibration(Genesys_Device* dev, Genesys_Sensor& se
DBG_HELPER(dbg);
bool forward = true;
auto local_reg = dev->calib_reg;
auto local_reg = dev->initial_regs;
// first step, load document
dev->cmd_set->load_document(dev);

2
backend/genesys/gl124.cpp
Wyświetl plik

@ -338,7 +338,7 @@ gl124_init_registers (Genesys_Device * dev)
const auto& sensor = sanei_genesys_find_sensor_any(dev);
sanei_genesys_set_dpihw(dev->reg, sensor, sensor.optical_res);
dev->calib_reg = dev->reg;
dev->initial_regs = dev->reg;
}
/**@brief send slope table for motor movement

3
backend/genesys/gl646.cpp
Wyświetl plik

@ -2726,8 +2726,7 @@ void CommandSetGl646::init(Genesys_Device* dev) const
// Init shading data
sanei_genesys_init_shading_data(dev, sensor, sensor.sensor_pixels);
/* initial calibration reg values */
dev->calib_reg = dev->reg;
dev->initial_regs = dev->reg;
}
// execute physical unit init only if cold

14
backend/genesys/gl841.cpp
Wyświetl plik

@ -1745,7 +1745,7 @@ void CommandSetGl841::save_power(Genesys_Device* dev, bool enable) const
uint8_t val = dev->interface->read_register(REG_0x6B);
dev->interface->write_register(REG_0x6B, val & ~REG_0x6B_GPO17);
dev->reg.find_reg(0x6b).value &= ~REG_0x6B_GPO17;
dev->calib_reg.find_reg(0x6b).value &= ~REG_0x6B_GPO17;
dev->initial_regs.find_reg(0x6b).value &= ~REG_0x6B_GPO17;
}
set_fe(dev, sensor, AFE_POWER_SAVE);
@ -1777,13 +1777,13 @@ void CommandSetGl841::save_power(Genesys_Device* dev, bool enable) const
val = dev->interface->read_register(REG_0x6B);
dev->interface->write_register(REG_0x6B, val | REG_0x6B_GPO17);
dev->reg.find_reg(0x6b).value |= REG_0x6B_GPO17;
dev->calib_reg.find_reg(0x6b).value |= REG_0x6B_GPO17;
dev->initial_regs.find_reg(0x6b).value |= REG_0x6B_GPO17;
/*enable GPO18*/
val = dev->interface->read_register(REG_0x6B);
dev->interface->write_register(REG_0x6B, val | REG_0x6B_GPO18);
dev->reg.find_reg(0x6b).value |= REG_0x6B_GPO18;
dev->calib_reg.find_reg(0x6b).value |= REG_0x6B_GPO18;
dev->initial_regs.find_reg(0x6b).value |= REG_0x6B_GPO18;
}
if (dev->model->gpio_id == GpioId::DP665
@ -1792,7 +1792,7 @@ void CommandSetGl841::save_power(Genesys_Device* dev, bool enable) const
uint8_t val = dev->interface->read_register(REG_0x6B);
dev->interface->write_register(REG_0x6B, val | REG_0x6B_GPO17);
dev->reg.find_reg(0x6b).value |= REG_0x6B_GPO17;
dev->calib_reg.find_reg(0x6b).value |= REG_0x6B_GPO17;
dev->initial_regs.find_reg(0x6b).value |= REG_0x6B_GPO17;
}
}
@ -3446,8 +3446,8 @@ void CommandSetGl841::init(Genesys_Device* dev) const
// Set analog frontend
dev->cmd_set->set_fe(dev, sensor, AFE_INIT);
// FIXME: move_back_home modifies dev->calib_reg and requires it to be filled
dev->calib_reg = dev->reg;
// FIXME: move_back_home modifies dev->initial_regs and requires it to be filled
dev->initial_regs = dev->reg;
// Move home
dev->cmd_set->move_back_home(dev, true);
@ -3466,7 +3466,7 @@ void CommandSetGl841::init(Genesys_Device* dev) const
dev->cmd_set->send_gamma_table(dev, sensor);
/* initial calibration reg values */
Genesys_Register_Set& regs = dev->calib_reg;
Genesys_Register_Set& regs = dev->initial_regs;
regs = dev->reg;
unsigned resolution = sensor.get_logical_hwdpi(300);

3
backend/genesys/gl846.cpp
Wyświetl plik

@ -218,8 +218,7 @@ gl846_init_registers (Genesys_Device * dev)
const auto& sensor = sanei_genesys_find_sensor_any(dev);
sanei_genesys_set_dpihw(dev->reg, sensor, sensor.optical_res);
/* initalize calibration reg */
dev->calib_reg = dev->reg;
dev->initial_regs = dev->reg;
}
/**@brief send slope table for motor movement

3
backend/genesys/gl847.cpp
Wyświetl plik

@ -239,8 +239,7 @@ gl847_init_registers (Genesys_Device * dev)
const auto& sensor = sanei_genesys_find_sensor_any(dev);
sanei_genesys_set_dpihw(dev->reg, sensor, sensor.optical_res);
/* initalize calibration reg */
dev->calib_reg = dev->reg;
dev->initial_regs = dev->reg;
}
/**@brief send slope table for motor movement

3
backend/genesys/low.cpp
Wyświetl plik

@ -1493,8 +1493,7 @@ void sanei_genesys_asic_init(Genesys_Device* dev, bool /*max_regs*/)
dev->settings.color_filter = ColorFilter::RED;
/* duplicate initial values into calibration registers */
dev->calib_reg = dev->reg;
dev->initial_regs = dev->reg;
const auto& sensor = sanei_genesys_find_sensor_any(dev);