Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Bliss
bliss
Commits
7fbfd0b6
Commit
7fbfd0b6
authored
Sep 04, 2020
by
Matias Guijarro
Browse files
motor_config: rename StaticConfig => MotorConfig
parent
ae280495
Pipeline
#32824
passed with stages
in 99 minutes and 9 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bliss/common/axis.py
View file @
7fbfd0b6
...
...
@@ -12,7 +12,7 @@ and :class:`~bliss.common.axis.GroupMove`)
"""
from
bliss
import
global_map
from
bliss.common.cleanup
import
capture_exceptions
from
bliss.common.motor_config
import
Static
Config
from
bliss.common.motor_config
import
Motor
Config
from
bliss.common.motor_settings
import
AxisSettings
from
bliss.common
import
event
from
bliss.common.greenlet_utils
import
protect_from_one_kill
...
...
@@ -672,7 +672,7 @@ class Axis:
self
.
__encoder
=
config
.
get
(
"encoder"
)
if
self
.
__encoder
is
not
None
:
self
.
__encoder
.
axis
=
self
self
.
__config
=
Static
Config
(
config
)
self
.
__config
=
Motor
Config
(
config
)
self
.
__settings
=
AxisSettings
(
self
)
self
.
_init_config_properties
()
self
.
__no_offset
=
False
...
...
@@ -742,7 +742,7 @@ class Axis:
@
property
def
config
(
self
):
"""Reference to the :class:`~bliss.common.motor_config.
Static
Config`"""
"""Reference to the :class:`~bliss.common.motor_config.
Motor
Config`"""
return
self
.
__config
@
property
...
...
bliss/common/encoder.py
View file @
7fbfd0b6
...
...
@@ -5,7 +5,7 @@
# Copyright (c) 2015-2020 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
from
bliss.common.motor_config
import
Static
Config
from
bliss.common.motor_config
import
Motor
Config
from
bliss.common.counter
import
SamplingCounter
from
bliss.controllers
import
counter
from
bliss.common
import
event
...
...
@@ -37,7 +37,7 @@ class Encoder:
self
.
_counter_controller
.
create_counter
(
SamplingCounter
,
"position"
,
unit
=
config
.
get
(
"unit"
)
)
self
.
__config
=
Static
Config
(
config
)
self
.
__config
=
Motor
Config
(
config
)
self
.
__axis_ref
=
None
@
property
...
...
bliss/common/motor_config.py
View file @
7fbfd0b6
...
...
@@ -10,7 +10,7 @@ from bliss.common.utils import Null
import
time
class
Static
Config
:
class
Motor
Config
:
def
__init__
(
self
,
config_node
):
self
.
__config_dict
=
config_node
self
.
__config_has_changed
=
False
...
...
bliss/controllers/motor.py
View file @
7fbfd0b6
...
...
@@ -7,7 +7,7 @@
import
math
import
numpy
from
bliss.common.motor_config
import
Static
Config
from
bliss.common.motor_config
import
Motor
Config
from
bliss.common.motor_settings
import
ControllerAxisSettings
,
floatOrNone
from
bliss.common.axis
import
Trajectory
from
bliss.common.motor_group
import
Group
,
TrajectoryGroup
...
...
@@ -30,7 +30,7 @@ class Controller:
def
__init__
(
self
,
name
,
config
,
axes
,
encoders
,
shutters
,
switches
):
self
.
__name
=
name
self
.
__config
=
Static
Config
(
config
)
self
.
__config
=
Motor
Config
(
config
)
self
.
__initialized_hw
=
Cache
(
self
,
"initialized"
,
default_value
=
False
)
self
.
__initialized_hw_axis
=
dict
()
self
.
__initialized_encoder
=
dict
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment