Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/fastcs_eiger/controllers/eiger_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class EigerController(Controller):
# Internal Attributes
stale_parameters = AttrR(Bool())
arm_timeout = AttrRW(
Int(min=1),
Int(min=0),
initial_value=3,
description="Timeout for arm command",
group=COMMAND_GROUP,
Expand Down
1 change: 1 addition & 0 deletions src/fastcs_eiger/controllers/eiger_subsystem_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
# TODO: Is it a bad idea to include these?
"test_image_mode",
"test_image_value",
"description", # Shadows description field on controllers
]

# Parameters that are in the API but missing from keys
Expand Down
2 changes: 1 addition & 1 deletion src/fastcs_eiger/controllers/odin/eiger_odin_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class EigerOdinController(EigerController):
"""Eiger controller with Odin sub controller"""

start_writing_timeout = AttrRW(
Int(min=1),
Int(min=0),
initial_value=5,
description="Timeout for start writing command",
group=COMMAND_GROUP,
Expand Down
2 changes: 1 addition & 1 deletion src/fastcs_eiger/fastcs-eiger-odin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ controllers:
port: 8888
api_version: "1.8.0"
transport:
- epicsca: {}
- epicspva: {}
gui:
title: "Eiger - EIGER"
output_dir: ./opi/
2 changes: 1 addition & 1 deletion src/fastcs_eiger/fastcs-eiger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ controllers:
port: 8081
api_version: "1.8.0"
transport:
- epicsca: {}
- epicspva: {}
gui:
title: "Eiger - EIGER"
output_dir: ./opi/
9 changes: 0 additions & 9 deletions tests/system/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,15 +215,6 @@
"value_type": "string"
}
},
"description": {
"subsystem": "detector",
"mode": "config",
"key": "description",
"response": {
"access_mode": "r",
"value_type": "string"
}
},
"detector_distance": {
"subsystem": "detector",
"mode": "config",
Expand Down
2 changes: 1 addition & 1 deletion tests/system/test_eiger_introspection.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ async def test_attribute_creation(sim_eiger):
detector_attributes = EigerDetectorController._create_attributes(
subsystem_parameters["detector"]
)
assert len(detector_attributes) == 76
assert len(detector_attributes) == 75
monitor_attributes = EigerMonitorController._create_attributes(
subsystem_parameters["monitor"]
)
Expand Down
Loading