Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
4747c49
Replaced old device.screen with new event driven device.screen in sli…
eloise-nebula Aug 22, 2025
ddfb70a
Fix #151 use fconf to generate image for sliclet/screen_test
robnagler Aug 23, 2025
c5bf978
Better error handling in screen._ActionLoop
eloise-nebula Aug 25, 2025
ad36b29
Replaced slicops.device.screen._ActionLoop with pykern.pkasyncio.Acti…
eloise-nebula Aug 25, 2025
82e52d5
Added ADSimDetector available PVs as dev target_status and target_con…
eloise-nebula Aug 27, 2025
0855d52
Added buttons to screen UI that change the target status.
eloise-nebula Aug 28, 2025
acb376a
Added In/Out Label in Screen UI. sliclet.screen now uses device.Scree…
eloise-nebula Aug 29, 2025
0752040
fmt
eloise-nebula Aug 29, 2025
daff511
target_status fixup only applies to dev camera as intended
eloise-nebula Sep 2, 2025
184eddd
Addressed 150 to propogate action loop errors to the UI.
eloise-nebula Sep 3, 2025
cb5ee21
Added Exception Handling to Sliclet
eloise-nebula Sep 4, 2025
f6fcf44
Merge branch 'main' into device-screen
eloise-nebula Sep 10, 2025
05cc295
Merge branch 'main' into device-screen
eloise-nebula Sep 10, 2025
9b075e1
limit images to 2 frames a second
robnagler Sep 10, 2025
6467a4e
Merge branch 'device-screen' of github.com:slaclab/slicops into devic…
eloise-nebula Sep 10, 2025
c0606a9
fixed device_setup bug in sliclet.screen.
eloise-nebula Sep 11, 2025
eb48b1a
removed assertionerror
eloise-nebula Sep 11, 2025
c49e03d
fixed call handler bug
eloise-nebula Sep 11, 2025
f54c7ff
b
eloise-nebula Sep 11, 2025
df0254f
fmt
eloise-nebula Sep 16, 2025
6545e41
Removed package_lock.json
eloise-nebula Sep 16, 2025
c21d7e0
ckp
eloise-nebula Sep 16, 2025
4e6e038
chkp
eloise-nebula Sep 16, 2025
4628d1a
chkp
eloise-nebula Sep 22, 2025
a546fe0
chkp
eloise-nebula Sep 25, 2025
f3d32dc
Moving target waits until target is initialized and upstream checked
eloise-nebula Sep 25, 2025
f61f82e
Fixed screen1_test.py as well.
eloise-nebula Sep 25, 2025
da0e56e
Merge branch 'main' into device-screen
eloise-nebula Sep 25, 2025
2f88971
Fixed sliclet.screen_test. Why was start_button removed from _BUTTONS…
eloise-nebula Sep 25, 2025
bf4e907
chkp
eloise-nebula Oct 6, 2025
41cbd13
Better handling of DEV_CAMERA add/remove target simulation
moellep Oct 9, 2025
49fc839
Renamed "check_upstream" to "await_upstream"
eloise-nebula Oct 9, 2025
3d77ef6
Merge branch 'device-screen' of github.com:slaclab/slicops into devic…
eloise-nebula Oct 9, 2025
d6c90c6
use thread event rather than polling in target simulator
moellep Oct 15, 2025
d8c7487
Merge branch 'main' into device-screen
robnagler Feb 4, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ tox.ini
\#*
.idea/
.vscode/
*~

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down
14 changes: 9 additions & 5 deletions slicops/ctx.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,16 @@ def group_get(self, field, group, attr=None):
def multi_set(self, *args):
def _args():
if len(args) > 1:
# (("a", 1), ("b", 2), ..)
return args
if len(args) == 0:
raise AssetionError("must be at list one update")
if isinstance(args[0][0], str):
# (("a", 1))
return args
# ((("a", 1), ("b", 2), ..)) or a dict
return args[0]
rv = args[0]
# ({"a": 1, "b": 2, ...})
if isinstance(rv, dict):
return rv.items()
# else ((("a", 1), ("b", 2), ..))
return args if isinstance(rv[0], str) else rv

def _parse():
rv = PKDict()
Expand All @@ -184,6 +186,8 @@ def _parse():
return rv

for k, v in _parse().items():
if not isinstance(v, PKDict):
v = PKDict(value=v)
self.__field_update(k, self.__field(k), v)

def rollback(self):
Expand Down
Loading