Skip to content

Commit 99038ff

Browse files
author
Henri Ervasti
committed
[183-thorlabs-k10crx-devices] Created a base class for Thorlabs K10CRx devices, with K10RC1 now deriving from the base class. Added also K10CR2 device driver. Imports and API remain the same for K10CR1. Modified and added unit-tests as necessary.
1 parent 000b414 commit 99038ff

File tree

11 files changed

+428
-1437
lines changed

11 files changed

+428
-1437
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Added
1010
- `run` method in `QMI_Context` class to accommodate for `threading.Thread` changes in Python 3.14.
1111
- `standard-xdrlib` from "dead batteries" as a dependency to fix issues coming from removal of `xdrlib` from standard library.
12+
- Base class for Thorlabs K10CRx instruments in qmi.instruments.thorlabs.k10crx module.
13+
- Driver for Thorlabs K10RC2 instrument. It is based on the new base class for K10CRx instruments.
1214

1315
### Changed
16+
- Changed Thorlabs K10CR1 to derive from new base class for K10CRx instruments.
1417

1518
### Fixed
1619
- Moving of `_snicaddr` in psutil package v2.7 from `_common` to `_ntuples` module, which caused an error with `qmi_proc`.
1720

1821
### Removed
1922
- Removed `xdrlib-py` import for Python 3.13 version, where it was needed for python-vxi11 package.
23+
- Removed deprecated `get_velocity_params` function in Thorlabs K10CRx driver, and the respective `VelocityParams` dataclass in the APT protocol.
2024

2125
## [0.51.0] - 2025-12-09
2226

documentation/sphinx/source/welcome.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Welcome to QMI!
33
===============
44

5-
You are reading the documentation of QMI, the Quantum Measurement Framework.
5+
You are reading the documentation of QMI, the Quantum Measurement Infrastructure framework.
66

77
What is it?
88
-----------

qmi/instruments/thorlabs/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
The qmi.instruments.thorlabs package provides support for:
55
- KDC101 Brushed DC Servo Motor Controller,
6-
- K10CR1 rotational mount,
6+
- K10CR1 & K10CR2 rotational mounts,
77
- MFF10X filter flip mounts,
88
- MPC320 Polarisation Controller,
99
- PM100D power meter,
@@ -20,6 +20,7 @@
2020

2121
# Alternative, QMI naming convention approved names
2222
from qmi.instruments.thorlabs.k10cr1 import Thorlabs_K10CR1 as Thorlabs_K10Cr1
23+
from qmi.instruments.thorlabs.k10cr2 import Thorlabs_K10CR2 as Thorlabs_K10Cr2
2324
from qmi.instruments.thorlabs.mff10x import Thorlabs_MFF10X as Thorlabs_Mff10X
2425
from qmi.instruments.thorlabs.pm100d import Thorlabs_PM16_120 as Thorlabs_pm16120
2526
from qmi.instruments.thorlabs.pm100d import Thorlabs_PM100D as Thorlabs_Pm100d

qmi/instruments/thorlabs/apt_protocol.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,6 @@ class AptChannelHomeLimitSwitch(Enum):
4949
FORWARD = 0x04
5050

5151

52-
@dataclass
53-
class VelocityParams:
54-
"""Velocity parameters for the controller.
55-
56-
Attributes:
57-
max_velocity: Maximum velocity in degrees/second or mm/second.
58-
acceleration: Acceleration in degrees/second/second or mm/second/second.
59-
"""
60-
max_velocity: float
61-
acceleration: float
62-
63-
6452
@dataclass
6553
class HomeParams:
6654
"""Homing parameters for the controller.

0 commit comments

Comments
 (0)