Merge pull request #2125 from jluhrs/gems_ttgs_fix

Fixed GeMS NGS status, added tests.
gemini-hlsw · Jun 1, 2022 · 7bfa0f1 · 7bfa0f1
2 parents 9702565 + 88ffb8f
commit 7bfa0f1
Show file tree

Hide file tree

Showing 8 changed files with 801 additions and 170 deletions.
diff --git a/.gitignore b/.gitignore
@@ -78,3 +78,4 @@ package-lock.json
 # Project specific
 modules/edu.gemini.seqexec.web/edu.gemini.seqexec.web.server/log/
 .direnv/
+/modules/server/src/main/scala/seqexec/server/scrapbook.sc
diff --git a/modules/server/src/main/scala/seqexec/server/gems/GemsControllerEpics.scala b/modules/server/src/main/scala/seqexec/server/gems/GemsControllerEpics.scala
@@ -69,9 +69,9 @@ class GemsControllerEpics[F[_]: Async](
 
     reasons.nonEmpty.option {
       L.debug(s"Send pause command to GeMS, reasons: $reasons") *>
-        epicsSys.LoopControl.setCommand(PauseCmd) *>
-        epicsSys.LoopControl.setReasons(reasons.mkString("|")) *>
-        epicsSys.LoopControl.post(CmdTimeout) *>
+        epicsSys.loopControl.setCommand(PauseCmd) *>
+        epicsSys.loopControl.setReasons(reasons.mkString("|")) *>
+        epicsSys.loopControl.post(CmdTimeout) *>
         L.debug("Pause command sent to GeMS")
     }
 
@@ -87,9 +87,9 @@ class GemsControllerEpics[F[_]: Async](
 
     reasons.nonEmpty.option {
       L.debug(s"Send resume command to GeMS, reasons: $reasons") *>
-        epicsSys.LoopControl.setCommand(ResumeCmd) *>
-        epicsSys.LoopControl.setReasons(reasons.mkString("|")) *>
-        epicsSys.LoopControl.post(CmdTimeout) *>
+        epicsSys.loopControl.setCommand(ResumeCmd) *>
+        epicsSys.loopControl.setReasons(reasons.mkString("|")) *>
+        epicsSys.loopControl.post(CmdTimeout) *>
         epicsSys.waitForStableLoops(LoopStabilizationTimeout) *>
         L.debug("Resume command sent to GeMS")
     }