From 1cebf3998f4ee1e41facf0ad8c4c7a460c4c5442 Mon Sep 17 00:00:00 2001 From: Alexander Zaft Date: Mon, 21 Oct 2024 10:55:55 +0200 Subject: [PATCH] simulation: fix extra_params default, ccidu1 cfg Change-Id: I80672f1c070054871708961bc6641457f8e409ec Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34843 Reviewed-by: Alexander Zaft Tested-by: Jenkins Automated Tests Reviewed-by: Georg Brandl --- cfg/sim_mlz_ccidu1_cfg.py | 1 + frappy/simulation.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cfg/sim_mlz_ccidu1_cfg.py b/cfg/sim_mlz_ccidu1_cfg.py index 8253b2a..d922e1f 100644 --- a/cfg/sim_mlz_ccidu1_cfg.py +++ b/cfg/sim_mlz_ccidu1_cfg.py @@ -91,6 +91,7 @@ Mod('ccidu1_V6', 'frappy.simulation.SimDrivable', 'Needle valve', value = Param(default=99, datatype={"type":"double", "min":0, "max":100, "unit":"%%"}), + target = Param(min=0, max=100), visibility='expert', ) diff --git a/frappy/simulation.py b/frappy/simulation.py index 0b55e82..0b790b0 100644 --- a/frappy/simulation.py +++ b/frappy/simulation.py @@ -31,7 +31,7 @@ from frappy.modules import Drivable, Module, Parameter, Readable, Writable, Comm class SimBase: def __new__(cls, devname, logger, cfgdict, dispatcher): - extra_params = cfgdict.pop('extra_params', '')['value'] + extra_params = cfgdict.pop('extra_params', {'value': ''})['value'] if isinstance(extra_params, str): extra_params = [v.strip() for v in extra_params.split(',')] attrs = {}