genesys: Remove support for shading calibration without moving

backend/genesys/enums.h

@@ -466,9 +466,6 @@ enum class ModelFlag : unsigned
     // the scanner uses multi-segment sensors that must be handled during calibration
     SIS_SENSOR = 1 << 16,
 
-    // the scanner does not move sensor during scanner calibration
-    SHADING_NO_MOVE = 1 << 17,
-
     // the head must be reparked between shading scans
     SHADING_REPARK = 1 << 18,
 

backend/genesys/genesys.cpp

@@ -1163,20 +1163,14 @@ static void genesys_shading_calibration_impl(Genesys_Device* dev, const Genesys_
 
   std::vector<uint16_t> calibration_data(size / 2);
 
-    bool motor = true;
-    if (has_flag(dev->model->flags, ModelFlag::SHADING_NO_MOVE)) {
-        motor = false;
-    }
-
     // turn off motor and lamp power for flatbed scanners, but not for sheetfed scanners
     // because they have a calibration sheet with a sufficient black strip
     if (is_dark && !dev->model->is_sheetfed) {
         sanei_genesys_set_lamp_power(dev, sensor, local_reg, false);
-        sanei_genesys_set_motor_power(local_reg, motor);
     } else {
         sanei_genesys_set_lamp_power(dev, sensor, local_reg, true);
-        sanei_genesys_set_motor_power(local_reg, motor);
     }
+    sanei_genesys_set_motor_power(local_reg, true);
 
     dev->interface->write_registers(local_reg);
 
@@ -1411,14 +1405,9 @@ static void genesys_dark_white_shading_calibration(Genesys_Device* dev,
 
   std::vector<uint8_t> calibration_data(size);
 
-    bool motor = true;
-    if (has_flag(dev->model->flags, ModelFlag::SHADING_NO_MOVE)) {
-        motor = false;
-    }
-
     // turn on motor and lamp power
     sanei_genesys_set_lamp_power(dev, sensor, local_reg, true);
-    sanei_genesys_set_motor_power(local_reg, motor);
+    sanei_genesys_set_motor_power(local_reg, true);
 
     dev->interface->write_registers(local_reg);
 

backend/genesys/tables_model.cpp

@@ -1488,7 +1488,7 @@ void genesys_init_usb_device_tables()
     model.y_size = 296.4;
 
     model.y_offset_calib_white = 0.00;
-    model.y_size_calib_mm = 3.0;
+    model.y_size_calib_mm = 2.0;
     model.x_offset_calib_black = 0.00;
 
     model.post_scan = 0.0;
@@ -1507,7 +1507,6 @@ void genesys_init_usb_device_tables()
     model.motor_id = MotorId::MD_5345;
     model.flags = ModelFlag::GAMMA_14BIT |
                   ModelFlag::DARK_CALIBRATION |
-                  ModelFlag::SHADING_NO_MOVE |
                   ModelFlag::CUSTOM_GAMMA;
     model.buttons = GENESYS_HAS_COPY_SW |
                     GENESYS_HAS_EMAIL_SW |