Skip to content

Fix #156 device_setup checks camera None #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robnagler merged 2 commits into from
Sep 10, 2025
Merged

Fix #156 device_setup checks camera None #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4754d01
Fix #156 device_setup checks camera None
robnagler Sep 10, 2025
81d8f9f
uncomment in_dev
robnagler Sep 10, 2025
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
5 changes: 3 additions & 2 deletions slicops/sliclet/screen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ def _choices():
def __device_change(self, txn, camera):
self.__device_destroy(txn)
txn.multi_set(_DEVICE_DISABLE)
if camera:
self.__device_setup(txn, camera)
self.__device_setup(txn, camera)

def __device_destroy(self, txn=None):
if not self.__device:
Expand Down Expand Up @@ -163,6 +162,8 @@ def _monitors():
m = self.__monitors[n] = _Monitor(a, h)
a.monitor(m)

if camera is None:
return
try:
# If there's an epics issues, we have to clear the device
self.__device = self.__device = slicops.device.Device(camera)
Expand Down
1 change: 1 addition & 0 deletions ui/vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const port = process.env.SLICOPS_VUE_PORT || 8008;

// https://vite.dev/config/
export default defineConfig({
clearScreen: false,
plugins: [
vue(),
],
Expand Down