zaber-motion 7.8.1__py3-none-win_amd64.whl → 7.8.3__py3-none-win_amd64.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- zaber_motion/ascii/setting_constants.py +25 -0
- zaber_motion/dto/ascii/can_set_state_device_response.py +13 -13
- zaber_motion/library.py +1 -1
- zaber_motion/microscopy/wdi_autofocus_provider.py +2 -2
- zaber_motion/units.py +11 -6
- zaber_motion/version.py +1 -1
- {zaber_motion-7.8.1.dist-info → zaber_motion-7.8.3.dist-info}/METADATA +1 -1
- {zaber_motion-7.8.1.dist-info → zaber_motion-7.8.3.dist-info}/RECORD +12 -12
- zaber_motion_bindings/zaber-motion-core-windows-amd64.dll +0 -0
- {zaber_motion-7.8.1.dist-info → zaber_motion-7.8.3.dist-info}/LICENSE.txt +0 -0
- {zaber_motion-7.8.1.dist-info → zaber_motion-7.8.3.dist-info}/WHEEL +0 -0
- {zaber_motion-7.8.1.dist-info → zaber_motion-7.8.3.dist-info}/top_level.txt +0 -0
|
@@ -9,6 +9,11 @@ class SettingConstants:
|
|
|
9
9
|
"""
|
|
10
10
|
ACCEL = "accel"
|
|
11
11
|
|
|
12
|
+
"""
|
|
13
|
+
Autodetect Coil Mode.
|
|
14
|
+
"""
|
|
15
|
+
AUTODETECT_COIL_MODE = "autodetect.coil.mode"
|
|
16
|
+
|
|
12
17
|
"""
|
|
13
18
|
Brake Mode.
|
|
14
19
|
"""
|
|
@@ -24,6 +29,26 @@ class SettingConstants:
|
|
|
24
29
|
"""
|
|
25
30
|
CALIBRATION_TYPE = "calibration.type"
|
|
26
31
|
|
|
32
|
+
"""
|
|
33
|
+
Cia 402 Controlword.
|
|
34
|
+
"""
|
|
35
|
+
CIA_402_CONTROLWORD = "cia402.controlword"
|
|
36
|
+
|
|
37
|
+
"""
|
|
38
|
+
Cia 402 Modes.
|
|
39
|
+
"""
|
|
40
|
+
CIA_402_MODES = "cia402.modes"
|
|
41
|
+
|
|
42
|
+
"""
|
|
43
|
+
Cia 402 Modes Display.
|
|
44
|
+
"""
|
|
45
|
+
CIA_402_MODES_DISPLAY = "cia402.modes.display"
|
|
46
|
+
|
|
47
|
+
"""
|
|
48
|
+
Cia 402 Statusword.
|
|
49
|
+
"""
|
|
50
|
+
CIA_402_STATUSWORD = "cia402.statusword"
|
|
51
|
+
|
|
27
52
|
"""
|
|
28
53
|
Cloop Continuous Enable.
|
|
29
54
|
"""
|
|
@@ -13,7 +13,7 @@ class CanSetStateDeviceResponse:
|
|
|
13
13
|
An object containing any setup issues that will prevent setting a state to a given device.
|
|
14
14
|
"""
|
|
15
15
|
|
|
16
|
-
|
|
16
|
+
axis_responses: List[CanSetStateAxisResponse]
|
|
17
17
|
"""
|
|
18
18
|
A list of axis responses, potentially with messages for errors
|
|
19
19
|
which would block setting the state of the device's axes.
|
|
@@ -28,7 +28,7 @@ class CanSetStateDeviceResponse:
|
|
|
28
28
|
def zero_values() -> 'CanSetStateDeviceResponse':
|
|
29
29
|
return CanSetStateDeviceResponse(
|
|
30
30
|
error=None,
|
|
31
|
-
|
|
31
|
+
axis_responses=[],
|
|
32
32
|
)
|
|
33
33
|
|
|
34
34
|
@staticmethod
|
|
@@ -45,14 +45,14 @@ class CanSetStateDeviceResponse:
|
|
|
45
45
|
def to_dict(self) -> Dict[str, Any]:
|
|
46
46
|
return {
|
|
47
47
|
'error': str(self.error) if self.error is not None else None,
|
|
48
|
-
'
|
|
48
|
+
'axisResponses': [item.to_dict() for item in self.axis_responses] if self.axis_responses is not None else [],
|
|
49
49
|
}
|
|
50
50
|
|
|
51
51
|
@staticmethod
|
|
52
52
|
def from_dict(data: Dict[str, Any]) -> 'CanSetStateDeviceResponse':
|
|
53
53
|
return CanSetStateDeviceResponse(
|
|
54
54
|
error=data.get('error'), # type: ignore
|
|
55
|
-
|
|
55
|
+
axis_responses=[CanSetStateAxisResponse.from_dict(item) for item in data.get('axisResponses')], # type: ignore
|
|
56
56
|
)
|
|
57
57
|
|
|
58
58
|
def validate(self) -> None:
|
|
@@ -61,15 +61,15 @@ class CanSetStateDeviceResponse:
|
|
|
61
61
|
if not isinstance(self.error, str):
|
|
62
62
|
raise ValueError(f'Property "Error" of "CanSetStateDeviceResponse" is not a string.')
|
|
63
63
|
|
|
64
|
-
if self.
|
|
65
|
-
if not isinstance(self.
|
|
66
|
-
raise ValueError('Property "
|
|
64
|
+
if self.axis_responses is not None:
|
|
65
|
+
if not isinstance(self.axis_responses, Iterable):
|
|
66
|
+
raise ValueError('Property "AxisResponses" of "CanSetStateDeviceResponse" is not iterable.')
|
|
67
67
|
|
|
68
|
-
for i,
|
|
69
|
-
if
|
|
70
|
-
raise ValueError(f'Item {i} in property "
|
|
68
|
+
for i, axis_responses_item in enumerate(self.axis_responses):
|
|
69
|
+
if axis_responses_item is None:
|
|
70
|
+
raise ValueError(f'Item {i} in property "AxisResponses" of "CanSetStateDeviceResponse" is None.')
|
|
71
71
|
|
|
72
|
-
if not isinstance(
|
|
73
|
-
raise ValueError(f'Item {i} in property "
|
|
72
|
+
if not isinstance(axis_responses_item, CanSetStateAxisResponse):
|
|
73
|
+
raise ValueError(f'Item {i} in property "AxisResponses" of "CanSetStateDeviceResponse" is not an instance of "CanSetStateAxisResponse".')
|
|
74
74
|
|
|
75
|
-
|
|
75
|
+
axis_responses_item.validate()
|
zaber_motion/library.py
CHANGED
|
@@ -198,7 +198,7 @@ class WdiAutofocusProvider:
|
|
|
198
198
|
Generic write operation.
|
|
199
199
|
|
|
200
200
|
Args:
|
|
201
|
-
register_id: Register address to
|
|
201
|
+
register_id: Register address to write to.
|
|
202
202
|
size: Data size to write. Valid values are (0,1,2,4). Determines the data type (Nil, Byte, Word, DWord).
|
|
203
203
|
data: Array of values to write to the register. Empty array is allowed.
|
|
204
204
|
offset: Offset within the register (defaults to 0).
|
|
@@ -226,7 +226,7 @@ class WdiAutofocusProvider:
|
|
|
226
226
|
Generic write operation.
|
|
227
227
|
|
|
228
228
|
Args:
|
|
229
|
-
register_id: Register address to
|
|
229
|
+
register_id: Register address to write to.
|
|
230
230
|
size: Data size to write. Valid values are (0,1,2,4). Determines the data type (Nil, Byte, Word, DWord).
|
|
231
231
|
data: Array of values to write to the register. Empty array is allowed.
|
|
232
232
|
offset: Offset within the register (defaults to 0).
|
zaber_motion/units.py
CHANGED
|
@@ -130,12 +130,12 @@ class Units(Enum):
|
|
|
130
130
|
FREQUENCY_NANOHERTZ = 'Frequency:nanohertz'
|
|
131
131
|
|
|
132
132
|
|
|
133
|
-
UnitsAndLiterals = Union[Units, Literal["m", "cm", "mm", "µm", "um", "nm", "in", "m/s", "cm/s", "mm/s", "µm/s", "um/s", "nm/s", "in/s", "m/s²", "m/s^2", "cm/s²", "cm/s^2", "mm/s²", "mm/s^2", "µm/s²", "um/s^2", "nm/s²", "nm/s^2", "in/s²", "in/s^2", "°", "deg", "rad", "°/s", "deg/s", "rad/s", "°/s²", "deg/s^2", "rad/s²", "rad/s^2", "%", "s", "ms", "µs", "us", "GHz", "MHz", "kHz", "Hz", "mHz", "µHz", "uHz", "nHz"]]
|
|
134
|
-
LengthUnits = Union[Units, Literal["m", "cm", "mm", "µm", "um", "nm", "in", "°", "deg", "rad"]]
|
|
135
|
-
VelocityUnits = Union[Units, Literal["m/s", "cm/s", "mm/s", "µm/s", "um/s", "nm/s", "in/s", "°/s", "deg/s", "rad/s"]]
|
|
136
|
-
AccelerationUnits = Union[Units, Literal["m/s²", "m/s^2", "cm/s²", "cm/s^2", "mm/s²", "mm/s^2", "µm/s²", "um/s^2", "nm/s²", "nm/s^2", "in/s²", "in/s^2", "°/s²", "deg/s^2", "rad/s²", "rad/s^2"]]
|
|
137
|
-
TimeUnits = Union[Units, Literal["s", "ms", "µs", "us"]]
|
|
138
|
-
FrequencyUnits = Union[Units, Literal["GHz", "MHz", "kHz", "Hz", "mHz", "µHz", "uHz", "nHz"]]
|
|
133
|
+
UnitsAndLiterals = Union[Units, Literal["m", "cm", "mm", "µm", "um", "μm", "nm", "in", "m/s", "cm/s", "mm/s", "µm/s", "um/s", "μm/s", "nm/s", "in/s", "m/s²", "m/s^2", "cm/s²", "cm/s^2", "mm/s²", "mm/s^2", "µm/s²", "um/s^2", "μm/s²", "nm/s²", "nm/s^2", "in/s²", "in/s^2", "°", "deg", "rad", "°/s", "deg/s", "rad/s", "°/s²", "deg/s^2", "rad/s²", "rad/s^2", "%", "s", "ms", "µs", "us", "μs", "GHz", "MHz", "kHz", "Hz", "mHz", "µHz", "uHz", "μHz", "nHz"]]
|
|
134
|
+
LengthUnits = Union[Units, Literal["m", "cm", "mm", "µm", "um", "μm", "nm", "in", "°", "deg", "rad"]]
|
|
135
|
+
VelocityUnits = Union[Units, Literal["m/s", "cm/s", "mm/s", "µm/s", "um/s", "μm/s", "nm/s", "in/s", "°/s", "deg/s", "rad/s"]]
|
|
136
|
+
AccelerationUnits = Union[Units, Literal["m/s²", "m/s^2", "cm/s²", "cm/s^2", "mm/s²", "mm/s^2", "µm/s²", "um/s^2", "μm/s²", "nm/s²", "nm/s^2", "in/s²", "in/s^2", "°/s²", "deg/s^2", "rad/s²", "rad/s^2"]]
|
|
137
|
+
TimeUnits = Union[Units, Literal["s", "ms", "µs", "us", "μs"]]
|
|
138
|
+
FrequencyUnits = Union[Units, Literal["GHz", "MHz", "kHz", "Hz", "mHz", "µHz", "uHz", "μHz", "nHz"]]
|
|
139
139
|
|
|
140
140
|
LITERALS_TO_UNITS = {
|
|
141
141
|
"m": Units.LENGTH_METRES,
|
|
@@ -143,6 +143,7 @@ LITERALS_TO_UNITS = {
|
|
|
143
143
|
"mm": Units.LENGTH_MILLIMETRES,
|
|
144
144
|
"µm": Units.LENGTH_MICROMETRES,
|
|
145
145
|
"um": Units.LENGTH_MICROMETRES,
|
|
146
|
+
"μm": Units.LENGTH_MICROMETRES,
|
|
146
147
|
"nm": Units.LENGTH_NANOMETRES,
|
|
147
148
|
"in": Units.LENGTH_INCHES,
|
|
148
149
|
"m/s": Units.VELOCITY_METRES_PER_SECOND,
|
|
@@ -150,6 +151,7 @@ LITERALS_TO_UNITS = {
|
|
|
150
151
|
"mm/s": Units.VELOCITY_MILLIMETRES_PER_SECOND,
|
|
151
152
|
"µm/s": Units.VELOCITY_MICROMETRES_PER_SECOND,
|
|
152
153
|
"um/s": Units.VELOCITY_MICROMETRES_PER_SECOND,
|
|
154
|
+
"μm/s": Units.VELOCITY_MICROMETRES_PER_SECOND,
|
|
153
155
|
"nm/s": Units.VELOCITY_NANOMETRES_PER_SECOND,
|
|
154
156
|
"in/s": Units.VELOCITY_INCHES_PER_SECOND,
|
|
155
157
|
"m/s²": Units.ACCELERATION_METRES_PER_SECOND_SQUARED,
|
|
@@ -160,6 +162,7 @@ LITERALS_TO_UNITS = {
|
|
|
160
162
|
"mm/s^2": Units.ACCELERATION_MILLIMETRES_PER_SECOND_SQUARED,
|
|
161
163
|
"µm/s²": Units.ACCELERATION_MICROMETRES_PER_SECOND_SQUARED,
|
|
162
164
|
"um/s^2": Units.ACCELERATION_MICROMETRES_PER_SECOND_SQUARED,
|
|
165
|
+
"μm/s²": Units.ACCELERATION_MICROMETRES_PER_SECOND_SQUARED,
|
|
163
166
|
"nm/s²": Units.ACCELERATION_NANOMETRES_PER_SECOND_SQUARED,
|
|
164
167
|
"nm/s^2": Units.ACCELERATION_NANOMETRES_PER_SECOND_SQUARED,
|
|
165
168
|
"in/s²": Units.ACCELERATION_INCHES_PER_SECOND_SQUARED,
|
|
@@ -179,6 +182,7 @@ LITERALS_TO_UNITS = {
|
|
|
179
182
|
"ms": Units.TIME_MILLISECONDS,
|
|
180
183
|
"µs": Units.TIME_MICROSECONDS,
|
|
181
184
|
"us": Units.TIME_MICROSECONDS,
|
|
185
|
+
"μs": Units.TIME_MICROSECONDS,
|
|
182
186
|
"GHz": Units.FREQUENCY_GIGAHERTZ,
|
|
183
187
|
"MHz": Units.FREQUENCY_MEGAHERTZ,
|
|
184
188
|
"kHz": Units.FREQUENCY_KILOHERTZ,
|
|
@@ -186,6 +190,7 @@ LITERALS_TO_UNITS = {
|
|
|
186
190
|
"mHz": Units.FREQUENCY_MILLIHERTZ,
|
|
187
191
|
"µHz": Units.FREQUENCY_MICROHERTZ,
|
|
188
192
|
"uHz": Units.FREQUENCY_MICROHERTZ,
|
|
193
|
+
"μHz": Units.FREQUENCY_MICROHERTZ,
|
|
189
194
|
"nHz": Units.FREQUENCY_NANOHERTZ,
|
|
190
195
|
}
|
|
191
196
|
|
zaber_motion/version.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
__version__ = "7.8.
|
|
1
|
+
__version__ = "7.8.3"
|
|
@@ -9,13 +9,13 @@ zaber_motion/call.py,sha256=lH72duqcNvzh3Mae5JYZ5kIsyMRftSxSCgmWk9TjYik,5206
|
|
|
9
9
|
zaber_motion/convert_exception.py,sha256=TZrdGkmaTR7QOAwoxIQ9sOkHtuVg1bVs-sxbEDn22V8,8487
|
|
10
10
|
zaber_motion/dto_object.py,sha256=3gJU6AQCjiZcx2o7p2C9VTqw9apOM0i21ssmAM-VmEY,359
|
|
11
11
|
zaber_motion/events.py,sha256=3Ebp8zEjlRSjKG-b3WVrncZ6juHlKJTNeL-oeYIGpuk,3398
|
|
12
|
-
zaber_motion/library.py,sha256=
|
|
12
|
+
zaber_motion/library.py,sha256=5F3AgE6pTKwfyB2cUfDJgTbZv2f2mj_wB4Gh2fVtk74,4934
|
|
13
13
|
zaber_motion/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
14
14
|
zaber_motion/serialization.py,sha256=Fm53Bd_oAZ7yaTjtBss23Dps3ynWv8wUJT5JVQyqKVs,987
|
|
15
15
|
zaber_motion/tools.py,sha256=O9IGJNGaaG7Sz2jGkexdJfgyJ5L4vsLXJKFUhZlKlCI,2213
|
|
16
16
|
zaber_motion/unit_table.py,sha256=FV-6VegAm499BJBJ4tdXgkP2Hl2h-fIlLJWkMrHlPAM,2497
|
|
17
|
-
zaber_motion/units.py,sha256=
|
|
18
|
-
zaber_motion/version.py,sha256=
|
|
17
|
+
zaber_motion/units.py,sha256=RCkeTZwhZFJg2hffBJFweAhDHLHZOkLUPel0e1Wzi3g,10853
|
|
18
|
+
zaber_motion/version.py,sha256=JIiqKVlC37vx2_EuUX8eP9h5GTBlrpFCV2Ic9kex9YA,22
|
|
19
19
|
zaber_motion/ascii/__init__.py,sha256=hB91yrB-iTGuk270V97TQK09fMiMUwL3FEIKhLqMJfc,4848
|
|
20
20
|
zaber_motion/ascii/all_axes.py,sha256=ob_LjrgU9jNCW3t9k0U7QSa-92ap9HspmHCsv7dkzgI,10783
|
|
21
21
|
zaber_motion/ascii/axis.py,sha256=Ks5MGJRUeKIwyUZOQ-13-fWpjt3ZJu9oyoGNT2yEJSg,57618
|
|
@@ -33,7 +33,7 @@ zaber_motion/ascii/pvt_buffer.py,sha256=wrxf3n2hNL82QdyCiBG3c3jDwQb9tnDpaxBW1aiY
|
|
|
33
33
|
zaber_motion/ascii/pvt_io.py,sha256=FiwJG6FQTPPtLRgH3AQhjfHRwWmDwiRri77dgyz4zXs,22237
|
|
34
34
|
zaber_motion/ascii/pvt_sequence.py,sha256=B4gAYjKtBkp4DGj30RxXv6aNOgtFlBly-ZacvclqHug,51329
|
|
35
35
|
zaber_motion/ascii/servo_tuner.py,sha256=uV3UxXIgz1xx-_lRaaxMVjF45Fp1AGpPgO1vKTYx8ro,23339
|
|
36
|
-
zaber_motion/ascii/setting_constants.py,sha256=
|
|
36
|
+
zaber_motion/ascii/setting_constants.py,sha256=ztScMyFkFec1F9zLvmmD4jysXDFXE5dfHF3uByPqnkw,29929
|
|
37
37
|
zaber_motion/ascii/storage.py,sha256=nB4adzPAZI4YL3lUgB3hrFHmP7Rof8dl_b_AsgOGEP0,26131
|
|
38
38
|
zaber_motion/ascii/stream.py,sha256=dwzm4OQQhedQsi0NPWi3_hvYaP1cK4zN192zeMnMbnE,80492
|
|
39
39
|
zaber_motion/ascii/stream_buffer.py,sha256=4cLM917qAw393H90V3mvEnT2X5NKCl37ZvSqGc092gU,3079
|
|
@@ -62,7 +62,7 @@ zaber_motion/dto/ascii/alert_event.py,sha256=ov3oTWjcru4UoYvPSiXuJaCvrOvS31DHSK9
|
|
|
62
62
|
zaber_motion/dto/ascii/axis_identity.py,sha256=EZ-E8XCvfDRfcq8s27nHGSQHHvaxEMsL0rk46Mrt7pk,4268
|
|
63
63
|
zaber_motion/dto/ascii/axis_type.py,sha256=bMG3ienP4BKf-b3hhZW2f_kYAyRP2_lYVbZdstqmUwA,237
|
|
64
64
|
zaber_motion/dto/ascii/can_set_state_axis_response.py,sha256=-6zTOvCDXDYmeAlmZ4CCc5nfKGimtHWcb3AjSuQFhyc,2506
|
|
65
|
-
zaber_motion/dto/ascii/can_set_state_device_response.py,sha256=
|
|
65
|
+
zaber_motion/dto/ascii/can_set_state_device_response.py,sha256=aDHSsDN6jNBhFCVCM2j3eX5UfK2fPAZ3Bxm_GkKG0XM,3142
|
|
66
66
|
zaber_motion/dto/ascii/conversion_factor.py,sha256=V_gP9RZI-wKurPUPLiSB-L_Zeb4gwZk7-aciqZMWjWY,2656
|
|
67
67
|
zaber_motion/dto/ascii/device_identity.py,sha256=kyirom_PHXdYuvxMz_1N7sdmKaobYjClq9ivN8uTcnE,4717
|
|
68
68
|
zaber_motion/dto/ascii/device_io_info.py,sha256=mLMlmUzjyb9BgzXeRs3zrhJbcxgS9g9i97_z6Pwq9z8,4337
|
|
@@ -476,13 +476,13 @@ zaber_motion/microscopy/illuminator.py,sha256=778WTQ1HfZG2MiLVug8tv1ZipJBInlNl-L
|
|
|
476
476
|
zaber_motion/microscopy/illuminator_channel.py,sha256=146pzU8Xz3Kj0_KIG5BjLQVNPPO3keALgu6KJYFGFMI,20451
|
|
477
477
|
zaber_motion/microscopy/microscope.py,sha256=cza7f0hqs5maNOyEIzNrtQ0iRt572TR-rjbmgVEAgTU,8602
|
|
478
478
|
zaber_motion/microscopy/objective_changer.py,sha256=rTI7-bytHqcbc0iLmY6Eytv4EXr_Jgk78dj-Y8tj_yw,13543
|
|
479
|
-
zaber_motion/microscopy/wdi_autofocus_provider.py,sha256=
|
|
479
|
+
zaber_motion/microscopy/wdi_autofocus_provider.py,sha256=V-cDWA9SJXQ1WRNCMT78VoMwbhd-5d948VeofKmZSlM,11490
|
|
480
480
|
zaber_motion/product/__init__.py,sha256=lno0C-gLBsHNPGnjp6bbXHX0cEk27cA8uFjq5vzmE9Q,531
|
|
481
481
|
zaber_motion/product/process.py,sha256=42wF55BvUcUY36_6HvpdWLC0b2ap6suoCItpR88pp14,27458
|
|
482
482
|
zaber_motion/product/process_controller.py,sha256=a5BM42BP82gcHtub98SkUsxsRoKByNbYmaBXzRYT1ao,4185
|
|
483
|
-
zaber_motion_bindings/zaber-motion-core-windows-amd64.dll,sha256=
|
|
484
|
-
zaber_motion-7.8.
|
|
485
|
-
zaber_motion-7.8.
|
|
486
|
-
zaber_motion-7.8.
|
|
487
|
-
zaber_motion-7.8.
|
|
488
|
-
zaber_motion-7.8.
|
|
483
|
+
zaber_motion_bindings/zaber-motion-core-windows-amd64.dll,sha256=08_XXQjlU6CFR_gNQpBARzUBkYFkDXF2ve0NvVrBFHU,15186944
|
|
484
|
+
zaber_motion-7.8.3.dist-info/LICENSE.txt,sha256=xNj9QcKqsI3WK5EBPeYbQAiDcnVe4xmIpCy65NYNVhA,109244
|
|
485
|
+
zaber_motion-7.8.3.dist-info/METADATA,sha256=_6PCpD5kkzxXwfmgGLas1jXr0Gzmh9LzptCzvXEBOFw,129815
|
|
486
|
+
zaber_motion-7.8.3.dist-info/WHEEL,sha256=EsfqhE0qd6WfVs85_gPJMVnnwjseveFUmeew0JBezok,97
|
|
487
|
+
zaber_motion-7.8.3.dist-info/top_level.txt,sha256=ypgkPvPad6Oge50CT6unnvxCEliKUB6olL6CUUER1SA,51
|
|
488
|
+
zaber_motion-7.8.3.dist-info/RECORD,,
|
|
Binary file
|
|
File without changes
|
|
File without changes
|
|
File without changes
|