From 21d9079eb760bceba9e95e9afb957def63ffcecb Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Thu, 9 Apr 2020 23:57:11 +0300 Subject: [PATCH] genesys: Invert meaning of ModelFlag::SKIP_WARMUP --- backend/genesys/enums.h | 4 +- backend/genesys/genesys.cpp | 2 +- backend/genesys/tables_model.cpp | 111 +++++++++++-------------------- 3 files changed, 40 insertions(+), 77 deletions(-) diff --git a/backend/genesys/enums.h b/backend/genesys/enums.h index 32c54609b..5bd0cece5 100644 --- a/backend/genesys/enums.h +++ b/backend/genesys/enums.h @@ -474,8 +474,8 @@ enum class ModelFlag : unsigned // use 14-bit gamma table instead of 12-bit GAMMA_14BIT = 1 << 1, - // skip lamp warmup (genesys_warmup()) - SKIP_WARMUP = 1 << 4, + // perform lamp warmup + WARMUP = 1 << 4, // repark head and check for lock by moving without scanning REPARK = 1 << 7, diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp index 4601001a2..efc376d40 100644 --- a/backend/genesys/genesys.cpp +++ b/backend/genesys/genesys.cpp @@ -3529,7 +3529,7 @@ static void genesys_start_scan(Genesys_Device* dev, bool lamp_off) /* wait for lamp warmup : until a warmup for TRANSPARENCY is designed, skip * it when scanning from XPA. */ - if (!has_flag(dev->model->flags, ModelFlag::SKIP_WARMUP) && + if (has_flag(dev->model->flags, ModelFlag::WARMUP) && (dev->settings.scan_method == ScanMethod::FLATBED)) { genesys_warmup_lamp(dev); diff --git a/backend/genesys/tables_model.cpp b/backend/genesys/tables_model.cpp index 9645b6f66..eca2d6abc 100644 --- a/backend/genesys/tables_model.cpp +++ b/backend/genesys/tables_model.cpp @@ -192,8 +192,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_LIDE_35; model.gpio_id = GpioId::CANON_LIDE_35; model.motor_id = MotorId::CANON_LIDE_35; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_WHITE_CALIBRATION | + model.flags = ModelFlag::DARK_WHITE_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_FILE_SW | @@ -247,8 +246,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::KVSS080; model.gpio_id = GpioId::KVSS080; model.motor_id = MotorId::KVSS080; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::CUSTOM_GAMMA; + model.flags = ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW; model.search_lines = 100; @@ -299,7 +297,6 @@ void genesys_init_usb_device_tables() model.gpio_id = GpioId::G4050; model.motor_id = MotorId::G4050; model.flags = ModelFlag::SHADING_REPARK | - ModelFlag::SKIP_WARMUP | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_FILE_SW | GENESYS_HAS_COPY_SW; model.search_lines = 100; @@ -348,8 +345,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::G4050; model.gpio_id = GpioId::G4050; model.motor_id = MotorId::G4050; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_FILE_SW | GENESYS_HAS_COPY_SW; model.search_lines = 100; @@ -400,8 +396,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::G4050; model.gpio_id = GpioId::G4050; model.motor_id = MotorId::G4050; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_FILE_SW | GENESYS_HAS_COPY_SW; model.search_lines = 100; @@ -465,8 +460,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_4400F; model.gpio_id = GpioId::CANON_4400F; model.motor_id = MotorId::CANON_4400F; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA | ModelFlag::SHADING_REPARK | ModelFlag::UTA_NO_SECONDARY_MOTOR; @@ -537,8 +531,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_8400F; model.gpio_id = GpioId::CANON_8400F; model.motor_id = MotorId::CANON_8400F; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA | ModelFlag::SHADING_REPARK; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_FILE_SW | GENESYS_HAS_COPY_SW; @@ -603,8 +596,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_8600F; model.gpio_id = GpioId::CANON_8600F; model.motor_id = MotorId::CANON_8600F; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA | ModelFlag::SHADING_REPARK; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_FILE_SW | GENESYS_HAS_COPY_SW; @@ -656,8 +648,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_LIDE_200; model.gpio_id = GpioId::CANON_LIDE_200; model.motor_id = MotorId::CANON_LIDE_100; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::SIS_SENSOR | + model.flags = ModelFlag::SIS_SENSOR | ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK | ModelFlag::CUSTOM_GAMMA; @@ -712,8 +703,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_LIDE_110; model.gpio_id = GpioId::CANON_LIDE_110; model.motor_id = MotorId::CANON_LIDE_110; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | @@ -766,8 +756,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_LIDE_120; model.gpio_id = GpioId::CANON_LIDE_120; model.motor_id = MotorId::CANON_LIDE_120; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | @@ -822,8 +811,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_LIDE_110; model.gpio_id = GpioId::CANON_LIDE_210; model.motor_id = MotorId::CANON_LIDE_210; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | @@ -878,8 +866,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_LIDE_110; model.gpio_id = GpioId::CANON_LIDE_210; model.motor_id = MotorId::CANON_LIDE_210; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | @@ -936,7 +923,6 @@ void genesys_init_usb_device_tables() model.gpio_id = GpioId::CANON_LIDE_200; model.motor_id = MotorId::CANON_LIDE_200; model.flags = ModelFlag::UNTESTED | - ModelFlag::SKIP_WARMUP | ModelFlag::SIS_SENSOR | ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA; @@ -992,8 +978,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_LIDE_700F; model.gpio_id = GpioId::CANON_LIDE_700F; model.motor_id = MotorId::CANON_LIDE_700; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::SIS_SENSOR | + model.flags = ModelFlag::SIS_SENSOR | ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK | ModelFlag::CUSTOM_GAMMA; @@ -1048,8 +1033,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_LIDE_200; model.gpio_id = GpioId::CANON_LIDE_200; model.motor_id = MotorId::CANON_LIDE_200; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::SIS_SENSOR | + model.flags = ModelFlag::SIS_SENSOR | ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK | ModelFlag::CUSTOM_GAMMA; @@ -1106,8 +1090,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_LIDE_35; model.gpio_id = GpioId::CANON_LIDE_35; model.motor_id = MotorId::CANON_LIDE_35; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_WHITE_CALIBRATION | + model.flags = ModelFlag::DARK_WHITE_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_COPY_SW | @@ -1162,8 +1145,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::CANON_LIDE_80; model.gpio_id = GpioId::CANON_LIDE_80; model.motor_id = MotorId::CANON_LIDE_80; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_WHITE_CALIBRATION | + model.flags = ModelFlag::DARK_WHITE_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_FILE_SW | @@ -1217,7 +1199,6 @@ void genesys_init_usb_device_tables() model.gpio_id = GpioId::HP2300; model.motor_id = MotorId::HP2300; model.flags = ModelFlag::GAMMA_14BIT | - ModelFlag::SKIP_WARMUP | ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_COPY_SW; @@ -1271,7 +1252,6 @@ void genesys_init_usb_device_tables() model.motor_id = MotorId::HP2400; model.flags = ModelFlag::GAMMA_14BIT | ModelFlag::DARK_CALIBRATION | - ModelFlag::SKIP_WARMUP | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_COPY_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_SCAN_SW; model.search_lines = 132; @@ -1324,7 +1304,6 @@ void genesys_init_usb_device_tables() model.motor_id = MotorId::XP200; model.flags = ModelFlag::GAMMA_14BIT | ModelFlag::CUSTOM_GAMMA | - ModelFlag::SKIP_WARMUP | ModelFlag::DARK_CALIBRATION; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; model.search_lines = 132; @@ -1375,7 +1354,8 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_HP3670; model.gpio_id = GpioId::HP3670; model.motor_id = MotorId::HP3670; - model.flags = ModelFlag::GAMMA_14BIT | + model.flags = ModelFlag::WARMUP | + ModelFlag::GAMMA_14BIT | ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_COPY_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_SCAN_SW; @@ -1526,7 +1506,8 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_5345; model.gpio_id = GpioId::MD_5345; model.motor_id = MotorId::MD_5345; - model.flags = ModelFlag::GAMMA_14BIT | + model.flags = ModelFlag::WARMUP | + ModelFlag::GAMMA_14BIT | ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_COPY_SW | @@ -1581,8 +1562,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_XP300; model.gpio_id = GpioId::XP300; model.motor_id = MotorId::XP300; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; model.search_lines = 400; @@ -1632,8 +1612,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_XP300; model.gpio_id = GpioId::DP665; model.motor_id = MotorId::DP665; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; model.search_lines = 400; @@ -1683,8 +1662,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_XP300; model.gpio_id = GpioId::DP665; model.motor_id = MotorId::ROADWARRIOR; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::CUSTOM_GAMMA | + model.flags = ModelFlag::CUSTOM_GAMMA | ModelFlag::DARK_CALIBRATION; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; model.search_lines = 400; @@ -1734,8 +1712,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_XP300; model.gpio_id = GpioId::DP665; model.motor_id = MotorId::ROADWARRIOR; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::NO_CALIBRATION | + model.flags = ModelFlag::NO_CALIBRATION | ModelFlag::CUSTOM_GAMMA | ModelFlag::UNTESTED; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW; @@ -1787,8 +1764,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_XP300; model.gpio_id = GpioId::DP665; model.motor_id = MotorId::ROADWARRIOR; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::CUSTOM_GAMMA | + model.flags = ModelFlag::CUSTOM_GAMMA | ModelFlag::DARK_CALIBRATION; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; model.search_lines = 400; @@ -1838,8 +1814,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_DSM600; model.gpio_id = GpioId::DP665; model.motor_id = MotorId::DSMOBILE_600; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::CUSTOM_GAMMA | + model.flags = ModelFlag::CUSTOM_GAMMA | ModelFlag::DARK_CALIBRATION; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; model.search_lines = 400; @@ -1890,8 +1865,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_DSM600; model.gpio_id = GpioId::DP665; model.motor_id = MotorId::DSMOBILE_600; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::CUSTOM_GAMMA | + model.flags = ModelFlag::CUSTOM_GAMMA | ModelFlag::DARK_CALIBRATION; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; model.search_lines = 400; @@ -1941,8 +1915,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_DSM600; model.gpio_id = GpioId::DP685; model.motor_id = MotorId::XP300; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::CUSTOM_GAMMA | + model.flags = ModelFlag::CUSTOM_GAMMA | ModelFlag::DARK_CALIBRATION; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; model.search_lines = 400; @@ -1994,8 +1967,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_XP300; model.gpio_id = GpioId::XP300; model.motor_id = MotorId::XP300; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::CUSTOM_GAMMA | + model.flags = ModelFlag::CUSTOM_GAMMA | ModelFlag::DARK_CALIBRATION; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; model.search_lines = 400; @@ -2047,8 +2019,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_XP300; model.gpio_id = GpioId::XP300; model.motor_id = MotorId::XP300; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::DARK_CALIBRATION | + model.flags = ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA | ModelFlag::UNTESTED; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; @@ -2099,7 +2070,8 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_5345; model.gpio_id = GpioId::MD_5345; model.motor_id = MotorId::MD_5345; - model.flags = ModelFlag::GAMMA_14BIT | + model.flags = ModelFlag::WARMUP | + ModelFlag::GAMMA_14BIT | ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_COPY_SW | @@ -2154,7 +2126,8 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_5345; model.gpio_id = GpioId::MD_5345; model.motor_id = MotorId::MD_5345; - model.flags = ModelFlag::GAMMA_14BIT | + model.flags = ModelFlag::WARMUP | + ModelFlag::GAMMA_14BIT | ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_COPY_SW | @@ -2210,8 +2183,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::WOLFSON_XP300; model.gpio_id = GpioId::DP665; model.motor_id = MotorId::ROADWARRIOR; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::CUSTOM_GAMMA | + model.flags = ModelFlag::CUSTOM_GAMMA | ModelFlag::DARK_CALIBRATION; model.buttons = GENESYS_HAS_SCAN_SW | GENESYS_HAS_PAGE_LOADED_SW | GENESYS_HAS_CALIBRATE; model.search_lines = 400; @@ -2264,7 +2236,6 @@ void genesys_init_usb_device_tables() model.motor_id = MotorId::PLUSTEK_OPTICPRO_3600; model.flags = ModelFlag::UNTESTED | // not fully working yet ModelFlag::CUSTOM_GAMMA | - ModelFlag::SKIP_WARMUP | ModelFlag::DARK_CALIBRATION; model.buttons = GENESYS_HAS_NO_BUTTONS; model.search_lines = 200; @@ -2329,7 +2300,6 @@ void genesys_init_usb_device_tables() model.motor_id = MotorId::PLUSTEK_OPTICFILM_7200I; model.flags = ModelFlag::CUSTOM_GAMMA | - ModelFlag::SKIP_WARMUP | ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK | ModelFlag::INVERTED_16BIT_DATA; @@ -2408,7 +2378,6 @@ void genesys_init_usb_device_tables() model.motor_id = MotorId::PLUSTEK_OPTICFILM_7300; model.flags = ModelFlag::CUSTOM_GAMMA | - ModelFlag::SKIP_WARMUP | ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK; @@ -2479,7 +2448,6 @@ void genesys_init_usb_device_tables() model.motor_id = MotorId::PLUSTEK_OPTICFILM_7400; model.flags = ModelFlag::CUSTOM_GAMMA | - ModelFlag::SKIP_WARMUP | ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK; @@ -2550,7 +2518,6 @@ void genesys_init_usb_device_tables() model.motor_id = MotorId::PLUSTEK_OPTICFILM_7500I; model.flags = ModelFlag::CUSTOM_GAMMA | - ModelFlag::SKIP_WARMUP | ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK; @@ -2621,7 +2588,6 @@ void genesys_init_usb_device_tables() model.motor_id = MotorId::PLUSTEK_OPTICFILM_8200I; model.flags = ModelFlag::CUSTOM_GAMMA | - ModelFlag::SKIP_WARMUP | ModelFlag::DARK_CALIBRATION | ModelFlag::SHADING_REPARK; @@ -2682,7 +2648,6 @@ void genesys_init_usb_device_tables() ModelFlag::GAMMA_14BIT | ModelFlag::DARK_CALIBRATION | ModelFlag::CUSTOM_GAMMA | - ModelFlag::SKIP_WARMUP | ModelFlag::NO_CALIBRATION; model.buttons = GENESYS_HAS_NO_BUTTONS; @@ -2734,8 +2699,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::PLUSTEK_OPTICBOOK_3800; model.gpio_id = GpioId::PLUSTEK_OPTICBOOK_3800; model.motor_id = MotorId::PLUSTEK_OPTICBOOK_3800; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::CUSTOM_GAMMA; + model.flags = ModelFlag::CUSTOM_GAMMA; model.buttons = GENESYS_HAS_NO_BUTTONS; // TODO there are 4 buttons to support model.search_lines = 100; @@ -2785,8 +2749,7 @@ void genesys_init_usb_device_tables() model.adc_id = AdcId::IMG101; model.gpio_id = GpioId::IMG101; model.motor_id = MotorId::IMG101; - model.flags = ModelFlag::SKIP_WARMUP | - ModelFlag::CUSTOM_GAMMA | + model.flags = ModelFlag::CUSTOM_GAMMA | ModelFlag::UNTESTED; model.buttons = GENESYS_HAS_NO_BUTTONS ; model.search_lines = 100;