Skip to content

Commit f747587

Browse files
authored
Merge branch 'master' into remove-status-from-readables
2 parents 18eeda6 + 88e990c commit f747587

File tree

1 file changed

+27
-4
lines changed

1 file changed

+27
-4
lines changed

src/secop_ophyd/SECoPDevices.py

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ def __init__(
250250
)
251251

252252
self.logger.info(f"Initializing SECoPBaseDevice for module {module_name}")
253-
# Add configuration Signal
253+
# Add configuration Signals
254254
with self.add_children_as_readables(
255255
format=StandardReadableFormat.CONFIG_SIGNAL
256256
):
@@ -270,7 +270,7 @@ def __init__(
270270

271271
# generate Signals from Module parameters eiter r or rw
272272
for parameter, properties in module_desc["parameters"].items():
273-
if parameter in READABLE_PARAMS:
273+
if parameter in HINTED_PARAMS + UNCACHED_PARAMS:
274274
continue
275275
# generate new root path
276276
param_path = Path(parameter_name=parameter, module_name=module_name)
@@ -286,11 +286,34 @@ def __init__(
286286
)
287287
self.param_devices[parameter] = getattr(self, parameter)
288288

289-
# Add readables Signals
289+
# Add hinted readable Signals
290290
with self.add_children_as_readables(
291291
format=StandardReadableFormat.HINTED_SIGNAL
292292
):
293-
for parameter in READABLE_PARAMS:
293+
for parameter in HINTED_PARAMS:
294+
if parameter not in module_desc["parameters"].keys():
295+
continue
296+
properties = module_desc["parameters"][parameter]
297+
298+
# generate new root path
299+
param_path = Path(parameter_name=parameter, module_name=module_name)
300+
301+
# readonly propertyns to plans and plan stubs.
302+
readonly = properties.get("readonly", None)
303+
304+
# Normal types + (struct and tuple as JSON object Strings)
305+
self._signal_from_parameter(
306+
path=param_path,
307+
sig_name=parameter,
308+
readonly=readonly,
309+
)
310+
self.param_devices[parameter] = getattr(self, parameter)
311+
312+
# Add uncached readable Signals
313+
with self.add_children_as_readables(
314+
format=StandardReadableFormat.UNCACHED_SIGNAL
315+
):
316+
for parameter in UNCACHED_PARAMS:
294317
if parameter not in module_desc["parameters"].keys():
295318
continue
296319
properties = module_desc["parameters"][parameter]

0 commit comments

Comments
 (0)