Merge pull request #267 from marcporr/HR6

ap-- · Oct 28, 2024 · f1b39ca · f1b39ca
2 parents 1b88a53 + 3fff231
commit f1b39ca
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -103,6 +103,7 @@ To use the pyseabreeze backend (requires `pyusb`) simply run this before importi
 | HDX          |            | [Issue #133][issue133] |           x            |
 | HR2          |            |             x          |                        |
 | HR4          |            |             x          |                        |
+| HR6          |            |             x          |                        |
 | SR2          |            |             x          |                        |
 | SR4          |            |             x          |                        |
 | SR6          |            |             x          |                        |

diff --git a/os_support/10-oceanoptics.rules b/os_support/10-oceanoptics.rules
@@ -101,5 +101,8 @@ ATTR{idVendor}=="0999", ATTR{idProduct}=="1005", SYMLINK+="sr6-%n", MODE:="0666"
 ATTR{idVendor}=="0999", ATTR{idProduct}=="1003", SYMLINK+="hr2-%n", MODE:="0666"
 # Ocean Insight Inc. HR4 Spectrometer
 ATTR{idVendor}=="0999", ATTR{idProduct}=="1004", SYMLINK+="hr4-%n", MODE:="0666"
+# Ocean Insight Inc. HR6 Spectrometer
+ATTR{idVendor}=="0999", ATTR{idProduct}=="1006", SYMLINK+="hr6-%n", MODE:="0666"
+
 
 LABEL="oceanoptics_rules_end"
diff --git a/src/seabreeze/pyseabreeze/devices.py b/src/seabreeze/pyseabreeze/devices.py
@@ -1334,6 +1334,30 @@ class HR4(SeaBreezeDevice):
     feature_classes = (sbf.spectrometer.SeaBreezeSpectrometerFeatureHR4,)
 
 
+class HR6(SeaBreezeDevice):
+    model_name = "HR6"
+
+    # communication config
+    transport = (USBTransport,)
+    usb_vendor_id = 0x0999
+    usb_product_id = 0x1006
+    usb_endpoint_map = EndPointMap(ep_out=0x01, highspeed_in=0x81)
+    usb_protocol = OBP2Protocol
+
+    # spectrometer config
+    dark_pixel_indices = DarkPixelIndices.from_ranges()
+    integration_time_min = 7200  # 7.2ms
+    integration_time_max = 5000000  # 5s
+    integration_time_base = 1
+    spectrum_num_pixel = 2048
+    spectrum_raw_length = (2048 * 2) + 32  # XXX: Metadata
+    spectrum_max_value = 65535
+    trigger_modes = TriggerMode.supported("OBP_NORMAL")
+
+    # features
+    feature_classes = (sbf.spectrometer.SeaBreezeSpectrometerFeatureHR6,)
+
+
 class ST(SeaBreezeDevice):
     model_name = "ST"
 

diff --git a/src/seabreeze/pyseabreeze/features/spectrometer.py b/src/seabreeze/pyseabreeze/features/spectrometer.py
@@ -744,6 +744,10 @@ class SeaBreezeSpectrometerFeatureHR4(SeaBreezeSpectrometerFeatureOBP2):
     pass
 
 
+class SeaBreezeSpectrometerFeatureHR6(SeaBreezeSpectrometerFeatureOBP2):
+    pass
+
+
 class SeaBreezeSpectrometerFeatureFX(SeaBreezeSpectrometerFeatureOBP):
     def _get_spectrum_raw(self) -> NDArray[np.uint8]:
         timeout = int(