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
c4100c84
Commit
c4100c84
authored
Nov 24, 2020
by
Linus Pithan
Committed by
Matias Guijarro
Nov 24, 2020
Browse files
fix issue
#2049
: do not check SCLIMPOS in home_state
parent
a62651b3
Changes
2
Hide whitespace changes
Inline
Side-by-side
bliss/common/axis.py
View file @
c4100c84
...
...
@@ -2124,7 +2124,7 @@ class Axis:
return
dial_positions
/
self
.
steps_per_unit
class
AxisState
(
object
)
:
class
AxisState
:
"""
Standard states:
MOVING : 'Axis is moving'
...
...
bliss/controllers/motors/icepap/__init__.py
View file @
c4100c84
...
...
@@ -451,6 +451,13 @@ class Icepap(Controller):
home_state
=
_command
(
self
.
_cnx
,
"%s:?HOMESTAT"
%
axis
.
address
)
if
not
home_state
.
startswith
(
"FOUND"
):
raise
RuntimeError
(
"Home switch not found."
)
hs
=
self
.
home_source
(
axis
)
if
hs
==
"Lim+"
and
home_state
==
"FOUND +1"
:
state
.
unset
(
"FAULT"
)
state
.
unset
(
"LIMPOS"
)
elif
hs
==
"Lim-"
and
home_state
==
"FOUND -1"
:
state
.
unset
(
"FAULT"
)
state
.
unset
(
"LIMNEG"
)
return
state
@
object_method
(
types_info
=
(
"None"
,
"float"
),
filter
=
_object_method_filter
)
...
...
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