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
4f0597cd
Commit
4f0597cd
authored
Aug 27, 2020
by
Matias Guijarro
Browse files
no settings axis: do not force "no offset"
parent
dd3d8b3e
Changes
2
Hide whitespace changes
Inline
Side-by-side
bliss/common/axis.py
View file @
4f0597cd
...
...
@@ -2437,7 +2437,3 @@ class NoSettingsAxis(Axis):
Axis
.
__init__
(
self
,
*
args
,
**
kwags
)
for
setting_name
in
self
.
settings
:
self
.
settings
.
disable_cache
(
setting_name
)
@
property
def
no_offset
(
self
):
return
True
bliss/controllers/motors/icepap/trajectory.py
View file @
4f0597cd
...
...
@@ -54,6 +54,10 @@ class TrajectoryAxis(NoSettingsAxis):
self
.
_velocity
=
-
1
self
.
_acceleration_time
=
-
1
@
property
def
no_offset
(
self
):
return
True
@
property
def
disabled_axes
(
self
):
"""
...
...
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