Skip to content

Commit eafe84f

Browse files
authored
Merge pull request #96 from DCC-Lab/docs/update-device-table
Update supported-devices table to match master
2 parents 5d4aba8 + 04841a4 commit eafe84f

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ The library currently supports the following hardware:
3838
| | Ocean Insight USB2000+ | `USB2000Plus` | `0x2457:0x101E` | USB (PyUSB) |
3939
| | Ocean Insight USB4000 | `USB4000` | `0x2457:0x1022` | USB (PyUSB) |
4040
| | Ocean Insight USB650 | `USB650` | `0x2457:0x1014` | USB (PyUSB) |
41+
| | Ocean Insight SAS | `SAS` | `0x2457:0x1006` | USB (PyUSB) |
4142
| **Motion (linear)** | Sutter MP-285 | `SutterDevice` | `0x1342:0x0001` | Serial (FTDI) |
42-
| | Thorlabs KDC (K-Cube) | `ThorlabsDevice` | `0x0403:0xFAF0` | Serial (FTDI) |
43-
| | Thorlabs Kinesis | `ThorlabsKinesisDevice` | `0x0403:0xFAF0` | pylablib |
4443
| **Motion (rotation)** | Intellidrive | `IntellidriveDevice` | `0x0403:0x6001` | Serial (FTDI) |
4544
| **Laser sources** | Cobolt laser | `CoboltDevice` | (serial) | Serial |
45+
| | Spectra-Physics Millennia eV | `MillenniaEv25Device` | (serial) | Serial |
46+
| | Sirah Matisse | `MatisseDevice` | (TCP) | TCP/IP |
4647
| **Power meters** | Gentec-EO Integra | `IntegraDevice` | `0x1AD5:0x0300` | USB (PyUSB) |
4748
| **DAQ** | LabJack U3 | `LabjackDevice` | `0x0CD5:0x0003` | USB (LabJackPython) |
4849
| **Oscilloscopes** | Tektronix TDS series | `OscilloscopeDevice` | `0x0403:0x6001` | Serial (FTDI/SCPI) |

0 commit comments

Comments
 (0)