From 37297fdad3aa5746bd9bfabe79a2934ae9e5e397 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Sat, 22 Feb 2020 10:48:27 +0200 Subject: [PATCH] genesys: Simplify definitions of x_size_calib_mm --- backend/genesys/tables_model.cpp | 92 ++++++++++++++++---------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/backend/genesys/tables_model.cpp b/backend/genesys/tables_model.cpp index 293478aac..4748e1da0 100644 --- a/backend/genesys/tables_model.cpp +++ b/backend/genesys/tables_model.cpp @@ -123,7 +123,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 1.0; - model.x_size_calib_mm = 10800.0 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 228.6; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -174,7 +174,7 @@ void genesys_init_usb_device_tables() model.y_size_calib_mm = 3.0; model.y_offset_calib_dark_white_mm = 1.0; model.y_size_calib_dark_white_mm = 6.0; - model.x_size_calib_mm = 10400.0 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 220.13334; model.x_offset_calib_black = 0.0; model.post_scan = 0.0; @@ -230,7 +230,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 9.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5376.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 227.584; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -281,7 +281,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5360.1 * MM_PER_INCH / 600; + model.x_size_calib_mm = 226.9067; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -332,7 +332,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 3.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5360.1 * MM_PER_INCH / 600; + model.x_size_calib_mm = 226.9067; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -383,7 +383,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5360.1 * MM_PER_INCH / 600; + model.x_size_calib_mm = 226.9067; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -439,7 +439,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 2.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5700.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 241.3; model.x_offset_ta = 115.0; model.y_offset_ta = 60.0; @@ -512,7 +512,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 3.0; model.x_offset_calib_black = 10.0; - model.x_size_calib_mm = 28400.0 * MM_PER_INCH / 3200; + model.x_size_calib_mm = 225.425; model.x_offset_ta = 75.0; model.y_offset_ta = 45.00; @@ -579,7 +579,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 8.0; - model.x_size_calib_mm = 11372 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 240.70734; model.x_offset_ta = 94.0; model.y_offset_ta = 26.0; @@ -642,7 +642,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 1.0; model.y_size_calib_mm = 3.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5136.1 * MM_PER_INCH / 600; + model.x_size_calib_mm = 217.4241; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -699,7 +699,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 3.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5168.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 218.7787; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -754,7 +754,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 1.0; model.y_size_calib_mm = 3.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5104.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 216.0694; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -809,7 +809,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 3.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5168.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 218.7787; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -867,7 +867,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 3.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5168.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 218.7787; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -923,7 +923,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 3.0; model.y_size_calib_mm = 3.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5136.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 217.4241; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -980,7 +980,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 1.0; model.y_size_calib_mm = 3.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5188.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 219.6254; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1037,7 +1037,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 3.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5136.1 * MM_PER_INCH / 600; + model.x_size_calib_mm = 217.4241; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1095,7 +1095,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_dark_white_mm = 1.0; model.y_size_calib_dark_white_mm = 6.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 10400.0 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 220.13334; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1150,7 +1150,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_dark_white_mm = 1.0; model.y_size_calib_dark_white_mm = 6.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 10240.0 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 216.7467; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1205,7 +1205,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 1.0; - model.x_size_calib_mm = 5368.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 227.2454; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1258,7 +1258,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 2.0; // FIXME: check if white area is really so small model.x_offset_calib_black = 1.0; - model.x_size_calib_mm = 10872.1 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 230.1241; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1311,7 +1311,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5200.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 220.1334; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1364,7 +1364,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 1.0; - model.x_size_calib_mm = 10872.1 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 230.1241; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1416,7 +1416,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 1.0; - model.x_size_calib_mm = 5416.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 229.2774; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1465,7 +1465,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 1.0; - model.x_size_calib_mm = 10800.0 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 228.6; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1517,7 +1517,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.00; model.y_size_calib_mm = 3.0; // FIXME: the y_offset is most likely incorrect model.x_offset_calib_black = 0.00; - model.x_size_calib_mm = 10872.1 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 230.1241; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -1573,7 +1573,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 10240.1 * MM_PER_INCH / 600; + model.x_size_calib_mm = 433.4934; model.post_scan = 26.5; // this is larger than needed -- accounts for second sensor head, which is a calibration item @@ -1624,7 +1624,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 2496.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 105.664; model.post_scan = 17.5; model.eject_feed = 0.0; @@ -1675,7 +1675,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5200.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 220.1334; model.post_scan = 16.0; model.eject_feed = 0.0; @@ -1726,7 +1726,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5200.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 220.1334; model.post_scan = 16.0; model.eject_feed = 0.0; @@ -1779,7 +1779,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5200.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 220.1334; model.post_scan = 16.0; model.eject_feed = 0.0; @@ -1830,7 +1830,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5200.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 220.1334; model.post_scan = 16.0; model.eject_feed = 0.0; @@ -1883,7 +1883,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5200.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 220.1334; model.post_scan = 16.0; model.eject_feed = 0.0; @@ -1933,7 +1933,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5020.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 212.5134; model.post_scan = 26.5; // this is larger than needed -- accounts for second sensor head, which is a calibration item @@ -1986,7 +1986,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 10240.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 433.4934; model.post_scan = 26.5; // this is larger than needed -- accounts for second sensor head, which is a calibration item @@ -2038,7 +2038,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 10240.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 433.4934; model.post_scan = 26.5; // this is larger than needed -- accounts for second sensor head, which is a calibration item @@ -2092,7 +2092,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.00; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.00; - model.x_size_calib_mm = 10872.1 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 230.1241; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -2148,7 +2148,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.00; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.00; - model.x_size_calib_mm = 10872.1 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 230.1241; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -2204,7 +2204,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 5200.0 * MM_PER_INCH / 600; + model.x_size_calib_mm = 220.1334; model.post_scan = 16.0; model.eject_feed = 0.0; @@ -2256,7 +2256,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 10100.0 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 213.7834; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -2310,7 +2310,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 0.0; model.x_offset_calib_black = 6.5; - model.x_size_calib_mm = 10200.0 * MM_PER_INCH / 7200; + model.x_size_calib_mm = 35.9834; model.x_offset_ta = 0.0; model.y_offset_ta = 29.0; @@ -2376,7 +2376,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 0.0; model.x_offset_calib_black = 6.5; - model.x_size_calib_mm = 10200.0 * MM_PER_INCH / 7200; + model.x_size_calib_mm = 35.9834; model.x_offset_ta = 0.0; model.y_offset_ta = 29.0; @@ -2446,7 +2446,7 @@ void genesys_init_usb_device_tables() model.y_offset_ta = 29.0; model.x_size_ta = 36.0; model.y_size_ta = 24.0; - model.x_size_calib_mm = 10200.0 * MM_PER_INCH / 7200; + model.x_size_calib_mm = 35.9834; model.y_offset_sensor_to_ta = 0.0; model.y_offset_calib_black_ta = 6.5; @@ -2505,7 +2505,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 0.0; model.y_size_calib_mm = 4.0; // FIXME: y_offset is liely incorrect model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 42720.0 * MM_PER_INCH / 2400; + model.x_size_calib_mm = 452.12; model.post_scan = 0; model.eject_feed = 0; @@ -2561,7 +2561,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 9.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 10200.0 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 215.9; model.post_scan = 0.0; model.eject_feed = 0.0; @@ -2612,7 +2612,7 @@ void genesys_init_usb_device_tables() model.y_offset_calib_white = 9.0; model.y_size_calib_mm = 4.0; model.x_offset_calib_black = 0.0; - model.x_size_calib_mm = 10800.0 * MM_PER_INCH / 1200; + model.x_size_calib_mm = 228.6; model.post_scan = 0.0; model.eject_feed = 0.0;