Merge branch 'main' into update/lucuma-schemas-0.104.0

gemini-hlsw · Oct 16, 2024 · 6e1dd1c · 6e1dd1c
2 parents d70024d + 06e496f
commit 6e1dd1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/modules/server/src/main/scala/navigate/server/tcs/TcsBaseControllerEpics.scala b/modules/server/src/main/scala/navigate/server/tcs/TcsBaseControllerEpics.scala
@@ -538,9 +538,9 @@ class TcsBaseControllerEpics[F[_]: Async: Parallel: Temporal](
         qlChange
           .map(
             _.fold(
-              sys.oiwfs.startClosedLoopCommand(timeout).zernikes2m2(0).post,
-              sys.oiwfs.startClosedLoopCommand(timeout).zernikes2m2(1).post
-            )
+              sys.oiwfs.startClosedLoopCommand(timeout).zernikes2m2(0),
+              sys.oiwfs.startClosedLoopCommand(timeout).zernikes2m2(1)
+            ).post
           )
           .getOrElse(VerifiedEpics.pureF[F, F, ApplyCommandResult](ApplyCommandResult.Completed))
       val setInterval = (c: TcsCommands[F]) =>
@@ -554,12 +554,8 @@ class TcsBaseControllerEpics[F[_]: Async: Parallel: Temporal](
             .options(i.fold("DHS", "NONE"))
         )
 
-      val setup = setSigProc *>
-        (setInterval >>> setQl)(sys.tcsEpics.startCommand(timeout)).post *>
-        sys.tcsEpics
-          .startCommand(timeout)
-          .oiWfsCommands
-          .observe
+      val setupAndStart = setSigProc *>
+        (setInterval >>> setQl)(sys.tcsEpics.startCommand(timeout)).oiWfsCommands.observe
           .numberOfExposures(-1)
           .oiWfsCommands
           .observe
@@ -589,7 +585,7 @@ class TcsBaseControllerEpics[F[_]: Async: Parallel: Temporal](
                       } {
                         VerifiedEpics.pureF[F, F, ApplyCommandResult](ApplyCommandResult.Completed)
                       } *>
-                        setup
+                        setupAndStart
                     }
       } yield ret).verifiedRun(ConnectionTimeout) <*
         stateRef.update(

diff --git a/project/Settings.scala b/project/Settings.scala
@@ -25,7 +25,7 @@ object Settings {
     val http4sBlaze = "0.23.16"
     val slf4j       = "2.0.16"
     val log4s       = "1.10.0"
-    val logback     = "1.5.10"
+    val logback     = "1.5.11"
     val janino      = "3.1.12"
     val logstash    = "7.0"
     val pureConfig  = "0.17.7"
@@ -54,7 +54,7 @@ object Settings {
     val jca = "2.4.10"
 
     // Lucuma
-    val lucumaCore    = "0.105.1"
+    val lucumaCore    = "0.105.3"
     val lucumaSchemas = "0.104.0"
     val navigateUi    = "0.1.7"