Merge branch 'genesys-plustek' into 'master'

genesys: Enable support for several Plustek OpticFilm scanner models

See merge request sane-project/backends!387

backend/genesys/genesys.cpp

@@ -4848,9 +4848,7 @@ static Genesys_Device* attach_device_by_name(SANE_String_Const devname, bool may
     int vendor, product;
     usb_dev.get_vendor_product(vendor, product);
 
-    // FIXME: enable when get_bcd_device call can be recorded and replayed
-    // auto bcd_device = usb_dev.get_bcd_device();
-    std::uint16_t bcd_device = 0xffff;
+    auto bcd_device = usb_dev.get_bcd_device();
     usb_dev.close();
 
   /* KV-SS080 is an auxiliary device which requires a master device to be here */

backend/genesys/tables_model.cpp

@@ -2338,6 +2338,19 @@ void genesys_init_usb_device_tables()
     s_usb_devices->emplace_back(0x07b3, 0x0c04, model);
 
 
+    // same as 7200i, just without the infrared channel
+    model.name = "plustek-opticfilm-7200-v2";
+    model.model = "OpticFilm 7200 v2";
+    model.resolutions = {
+        {
+            { ScanMethod::TRANSPARENCY },
+            { 7200, 3600, 1800, 900 },
+            { 7200, 3600, 1800, 900 },
+        }
+    };
+    s_usb_devices->emplace_back(0x07b3, 0x0c07, model);
+
+
     model = Genesys_Model();
     model.name = "plustek-opticfilm-7300";
     model.vendor = "PLUSTEK";
@@ -2403,10 +2416,16 @@ void genesys_init_usb_device_tables()
     s_usb_devices->emplace_back(0x07b3, 0x0c12, model);
 
 
+    // same as 7300, same USB ID as 7400-v2
+    model.name = "plustek-opticfilm-7400-v1";
+    model.model = "OpticFilm 7400 (v1)";
+    s_usb_devices->emplace_back(0x07b3, 0x0c3a, 0x0400, model);
+
+
     model = Genesys_Model();
-    model.name = "plustek-opticfilm-7400";
+    model.name = "plustek-opticfilm-7400-v2";
     model.vendor = "PLUSTEK";
-    model.model = "OpticFilm 7400";
+    model.model = "OpticFilm 7400 (v2)";
     model.model_id = ModelId::PLUSTEK_OPTICFILM_7400;
     model.asic_type = AsicType::GL845;
 
@@ -2465,7 +2484,13 @@ void genesys_init_usb_device_tables()
                   ModelFlag::SHADING_REPARK;
 
     model.search_lines = 200;
-    s_usb_devices->emplace_back(0x07b3, 0x0c3a, model);
+    s_usb_devices->emplace_back(0x07b3, 0x0c3a, 0x0605, model);
+
+
+    // same as 7400-v2
+    model.name = "plustek-opticfilm-8100";
+    model.model = "OpticFilm 8100";
+    s_usb_devices->emplace_back(0x07b3, 0x130c, model);
 
 
     model = Genesys_Model();
@@ -2533,6 +2558,12 @@ void genesys_init_usb_device_tables()
     s_usb_devices->emplace_back(0x07b3, 0x0c13, model);
 
 
+    // same as 7500i
+    model.name = "plustek-opticfilm-7600i-v1";
+    model.model = "OpticFilm 7600i (v1)";
+    s_usb_devices->emplace_back(0x07b3, 0x0c3b, 0x0400, model);
+
+
     model = Genesys_Model();
     model.name = "plustek-opticfilm-8200i";
     model.vendor = "PLUSTEK";
@@ -2598,6 +2629,12 @@ void genesys_init_usb_device_tables()
     s_usb_devices->emplace_back(0x07b3, 0x130d, model);
 
 
+    // same as 8200i
+    model.name = "plustek-opticfilm-7600i-v2";
+    model.model = "OpticFilm 7600i (v2)";
+    s_usb_devices->emplace_back(0x07b3, 0x0c3b, 0x0605, model);
+
+
     model = Genesys_Model();
     model.name = "hewlett-packard-scanjet-N6310";
     model.vendor = "Hewlett Packard";

doc/descriptions/genesys.desc

@@ -17,6 +17,11 @@
 :status :basic
 :comment "Has a Primax USB ID"
 
+:model "OpticFilm 7200 (v2)"
+:interface "USB"
+:usbid "0x07b3" "0x0c07"
+:status :basic
+
 :model "OpticFilm 7200i"
 :interface "USB"
 :usbid "0x07b3" "0x0c04"
@@ -37,6 +42,16 @@
 :usbid "0x07b3" "0x0c13"
 :status :basic
 
+:model "OpticFilm 7600i"
+:interface "USB"
+:usbid "0x07b3" "0x0c3b"
+:status :basic
+
+:model "OpticFilm 8100"
+:interface "USB"
+:usbid "0x07b3" "0x130c"
+:status :basic
+
 :model "OpticFilm 8200i"
 :interface "USB"
 :usbid "0x07b3" "0x130d"