Merge pull request #43 from DiamondLightSource/config-update

Update for external dependency changes
DiamondLightSource · Oct 15, 2024 · d36c52c · d36c52c
2 parents 4b9e956 + d5406ee
commit d36c52c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/dev/one_node_fp/odin_server.cfg b/dev/one_node_fp/odin_server.cfg
@@ -8,13 +8,12 @@ adapters = fp, fr, mw
 logging = error
 
 [adapter.fr]
-module = odin_data.control.odin_data_adapter.OdinDataAdapter
+module = odin_data.control.frame_receiver_adapter.FrameReceiverAdapter
 endpoints = 127.0.0.1:10000
 update_interval = 0.2
 
 [adapter.fp]
-module = odin_data.control.odin_data_adapter.OdinDataAdapter
-frame_processor = true
+module = odin_data.control.frame_processor_adapter.FrameProcessorAdapter
 endpoints = 127.0.0.1:10004
 update_interval = 0.2
 

diff --git a/dev/two_node_fp/odin_server.cfg b/dev/two_node_fp/odin_server.cfg
@@ -8,13 +8,12 @@ adapters = fp, fr, mw
 logging = error
 
 [adapter.fr]
-module = odin_data.control.odin_data_adapter.OdinDataAdapter
+module = odin_data.control.frame_receiver_adapter.FrameReceiverAdapter
 endpoints = 127.0.0.1:10000, 127.0.0.1:10010
 update_interval = 0.2
 
 [adapter.fp]
-module = odin_data.control.odin_data_adapter.OdinDataAdapter
-frame_processor = true
+module = odin_data.control.frame_processor_adapter.FrameProcessorAdapter
 endpoints = 127.0.0.1:10004, 127.0.0.1:10014
 update_interval = 0.2
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -45,7 +45,7 @@ dev = [
     "types-requests",
 ]
 odin = [
-    "odin-control @ git+https://github.com/odin-detector/odin-control@param-tree-replace",
+    "odin-control @ git+https://github.com/odin-detector/odin-control",
     "odin-data[meta_writer] @ git+https://github.com/odin-detector/odin-data@fastcs-dev#subdirectory=python",
 ]