Commit 7fbfd0b6 authored by Matias Guijarro's avatar Matias Guijarro
Browse files

motor_config: rename StaticConfig => MotorConfig

parent ae280495
Pipeline #32824 passed with stages
in 99 minutes and 9 seconds
...@@ -12,7 +12,7 @@ and :class:`~bliss.common.axis.GroupMove`) ...@@ -12,7 +12,7 @@ and :class:`~bliss.common.axis.GroupMove`)
""" """
from bliss import global_map from bliss import global_map
from bliss.common.cleanup import capture_exceptions from bliss.common.cleanup import capture_exceptions
from bliss.common.motor_config import StaticConfig from bliss.common.motor_config import MotorConfig
from bliss.common.motor_settings import AxisSettings from bliss.common.motor_settings import AxisSettings
from bliss.common import event from bliss.common import event
from bliss.common.greenlet_utils import protect_from_one_kill from bliss.common.greenlet_utils import protect_from_one_kill
...@@ -672,7 +672,7 @@ class Axis: ...@@ -672,7 +672,7 @@ class Axis:
self.__encoder = config.get("encoder") self.__encoder = config.get("encoder")
if self.__encoder is not None: if self.__encoder is not None:
self.__encoder.axis = self self.__encoder.axis = self
self.__config = StaticConfig(config) self.__config = MotorConfig(config)
self.__settings = AxisSettings(self) self.__settings = AxisSettings(self)
self._init_config_properties() self._init_config_properties()
self.__no_offset = False self.__no_offset = False
...@@ -742,7 +742,7 @@ class Axis: ...@@ -742,7 +742,7 @@ class Axis:
@property @property
def config(self): def config(self):
"""Reference to the :class:`~bliss.common.motor_config.StaticConfig`""" """Reference to the :class:`~bliss.common.motor_config.MotorConfig`"""
return self.__config return self.__config
@property @property
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Copyright (c) 2015-2020 Beamline Control Unit, ESRF # Copyright (c) 2015-2020 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info. # Distributed under the GNU LGPLv3. See LICENSE for more info.
from bliss.common.motor_config import StaticConfig from bliss.common.motor_config import MotorConfig
from bliss.common.counter import SamplingCounter from bliss.common.counter import SamplingCounter
from bliss.controllers import counter from bliss.controllers import counter
from bliss.common import event from bliss.common import event
...@@ -37,7 +37,7 @@ class Encoder: ...@@ -37,7 +37,7 @@ class Encoder:
self._counter_controller.create_counter( self._counter_controller.create_counter(
SamplingCounter, "position", unit=config.get("unit") SamplingCounter, "position", unit=config.get("unit")
) )
self.__config = StaticConfig(config) self.__config = MotorConfig(config)
self.__axis_ref = None self.__axis_ref = None
@property @property
......
...@@ -10,7 +10,7 @@ from bliss.common.utils import Null ...@@ -10,7 +10,7 @@ from bliss.common.utils import Null
import time import time
class StaticConfig: class MotorConfig:
def __init__(self, config_node): def __init__(self, config_node):
self.__config_dict = config_node self.__config_dict = config_node
self.__config_has_changed = False self.__config_has_changed = False
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
import math import math
import numpy import numpy
from bliss.common.motor_config import StaticConfig from bliss.common.motor_config import MotorConfig
from bliss.common.motor_settings import ControllerAxisSettings, floatOrNone from bliss.common.motor_settings import ControllerAxisSettings, floatOrNone
from bliss.common.axis import Trajectory from bliss.common.axis import Trajectory
from bliss.common.motor_group import Group, TrajectoryGroup from bliss.common.motor_group import Group, TrajectoryGroup
...@@ -30,7 +30,7 @@ class Controller: ...@@ -30,7 +30,7 @@ class Controller:
def __init__(self, name, config, axes, encoders, shutters, switches): def __init__(self, name, config, axes, encoders, shutters, switches):
self.__name = name self.__name = name
self.__config = StaticConfig(config) self.__config = MotorConfig(config)
self.__initialized_hw = Cache(self, "initialized", default_value=False) self.__initialized_hw = Cache(self, "initialized", default_value=False)
self.__initialized_hw_axis = dict() self.__initialized_hw_axis = dict()
self.__initialized_encoder = dict() self.__initialized_encoder = dict()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment