diff --git a/backend/genesys_devices.cc b/backend/genesys_devices.cc index 6439f440b..6d7c7d7fc 100644 --- a/backend/genesys_devices.cc +++ b/backend/genesys_devices.cc @@ -1639,6 +1639,8 @@ void genesys_init_sensor_tables() { 0x0c, 0x00 }, { 0x70, 0x00 }, { 0x71, 0x02 }, + { 0x72, 0x02 }, + { 0x73, 0x04 }, { 0x9e, 0x2d }, { 0xaa, 0x00 }, { 0x16, 0x13 }, @@ -1668,6 +1670,8 @@ void genesys_init_sensor_tables() { 0x0c, 0x00 }, { 0x70, 0x00 }, { 0x71, 0x02 }, + { 0x72, 0x02 }, + { 0x73, 0x04 }, { 0x9e, 0x2d }, { 0xaa, 0x00 }, { 0x16, 0x13 }, @@ -1697,6 +1701,8 @@ void genesys_init_sensor_tables() { 0x0c, 0x00 }, { 0x70, 0x00 }, { 0x71, 0x02 }, + { 0x72, 0x02 }, + { 0x73, 0x04 }, { 0x9e, 0x2d }, { 0xaa, 0x00 }, { 0x16, 0x13 }, @@ -1782,20 +1788,17 @@ void genesys_init_sensor_tables() }, }; - auto base_custom_regs = sensor.custom_regs; for (const CustomSensorSettings& setting : custom_settings) { sensor.min_resolution = setting.min_resolution; sensor.max_resolution = setting.max_resolution; sensor.method = setting.method; sensor.exposure_lperiod = setting.exposure_lperiod; - sensor.custom_regs = base_custom_regs; - sensor.custom_regs.merge(setting.extra_custom_regs); + sensor.custom_regs = setting.extra_custom_regs; sensor.custom_fe_regs = setting.custom_fe_regs; s_sensors->push_back(sensor); } } - s_sensors->push_back(sensor); sensor = Genesys_Sensor(); diff --git a/backend/genesys_gl843.cc b/backend/genesys_gl843.cc index 0f3ea8db1..99d78abce 100644 --- a/backend/genesys_gl843.cc +++ b/backend/genesys_gl843.cc @@ -579,8 +579,8 @@ gl843_init_registers (Genesys_Device * dev) // CPL[0:4]: The position of falling edge of CCD CP signal in cycles SETREG(0x70, 0x01); // SENSOR_DEF SETREG(0x71, 0x03); // SENSOR_DEF - SETREG(0x72, 0x04); - SETREG(0x73, 0x05); + SETREG(0x72, 0x04); // SENSOR_DEF + SETREG(0x73, 0x05); // SENSOR_DEF if (dev->model->model_id == MODEL_CANON_CANOSCAN_4400F) { SETREG(0x70, 0x01);