Skip to content

Commit

Permalink
Merge pull request #730 from BCDA-APS/725-stuck-LakeShore336-setpoint
Browse files Browse the repository at this point in the history
ignore Lakeshore336 setpoint's RBV
  • Loading branch information
prjemian authored Oct 13, 2022
2 parents 810730d + 8ea4ee8 commit 7f1365d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
10 changes: 8 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,20 @@ The project `milestones <https://github.com/BCDA-APS/apstools/milestones>`_
describe the future plans.

..
1.6.7
1.6.8
******
release expected by 2023-01-05

1.6.7
******

release expected by 2022-11-18

1.6.6
******

release expected by 2022-11-18
release expected by 2022-10-18

New Features
------------
Expand All @@ -37,6 +42,7 @@ Fixes
------------

* Make sure that YML (and other) files are packaged for pip and conda.
* PVPositioner got stuck if target position was the same as current position.

Deprecations
------------
Expand Down
3 changes: 3 additions & 0 deletions apstools/devices/positioner_soft_done.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@ def _setup_move(self, position):
if self.actuate is not None:
self.log.debug("%s.actuate = %s", self.name, self.actuate_value)
self.actuate.put(self.actuate_value, wait=False)
# This is needed because in a special case the setpoint.put does not
# run the "sub_value" subscriptions.
self.cb_setpoint()
self.cb_readback() # This is needed to force the first check.


Expand Down
4 changes: 2 additions & 2 deletions apstools/utils/tests/test_listdevice.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ def test__list_epics_signals(obj, length, ref):
(None, 0, "value", 0.0),
("epics", 0, "data name", "motor"),
("epics", 0, "value", 0.0),
("epics", 6, "data name", "motor_velocity"),
("epics", 6, "value", 1.0),
("epics", 7, "data name", "motor_acceleration"),
("epics", 7, "value", 0.2),
("epics", 8, "data name", "motor_motor_egu"),
("epics", 8, "value", "degrees"),
("full", 0, "data name", "motor"),
Expand Down

0 comments on commit 7f1365d

Please sign in to comment.