APT devices must return serial number to pick the right one #131
Conversation
There was a problem hiding this comment.
Great, thanks for doing this! In addition to the little changes I've asked for, can you also make this work a little better with the generic instrument function? This should be what you need to do
- Add
'port'to the_INST_PARAMS_list. (This isn't due to your changes, it was already missing) - Regenerate
driver_info.py(runpython -m instrumental.parse_modulesfrom theInstrumentaldirectory, or useInstrumental/instrumental/parse_modules.pydirectly) - Test that you can open these devices using
instrument(serial=xxx),instrumental(port=xxx), and/orTDC001_APT(serial=xxx)andTDC001_APT(port=xxx)
Let me know if this doesn't work, or if you have any questions. If that all works, please add driver_info.py to your PR, alongside the other changes.
| @@ -11,8 +11,9 @@ | |||
| from ... import Q_, u | |||
|
|
|||
|
|
|||
| def list_instruments(): | |||
| return [ParamSet(TDC001_APT, port=p.device) for p in comports() if (p.vid, p.pid) == (0x0403, 0xfaf0)] | |||
| def list_instruments(filter_serial_number=None): | |||
There was a problem hiding this comment.
The filter_serial_number parameter is no longer used, so we can remove it
| def list_instruments(): | ||
| return [ParamSet(TDC001_APT, port=p.device) for p in comports() if (p.vid, p.pid) == (0x0403, 0xfaf0)] | ||
| def list_instruments(filter_serial_number=None): | ||
| return [ParamSet(TDC001_APT, port=p.device, serialnumber=p.serial_number) for p in comports() |
There was a problem hiding this comment.
Can you change serialnumber to serial? That will make it consistent with other devices.
instrumental/drivers/motion/apt.py
Outdated
| @@ -127,7 +128,7 @@ def move_completed(self): | |||
| """ Check if the move is completed. | |||
| """ | |||
| rsp = self._ser.read(6) | |||
| if rsp == bytes([0x64, 0x04, 0x0e, 0x00, self.src | 0x80, self.dst ]): | |||
| if rsp[:4] == bytes([0x64, 0x04, 0x0e, 0x00, self.src | 0x80, self.dst ])[:4]: | |||
There was a problem hiding this comment.
Can you add a short comment here (and at the other location) to indicate why we're only taking the first 4 bytes? This is the sort of info that's easy to forget when we want to change the code in the future.
|
OK, thanks. Meanwhile I got my repository into unusable state again and have no expert to help, so tomorrow I will clone the repository anew and submit another PR based on your notes. Programming is easy, git is hard. |
As originally referenced in #130, I suggest the
ParamSetfor Thorlabs motion controllers TDC001 should contain their serial number to tell these apart.Also I noticed my controllers do not report correctly the 5th and 6th byte, causing some commands to stall.
With these two fixes, TDC001s work like charm.