Fixed HTTP Interface and DAN DIO time

EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app.marte

@@ -17,23 +17,23 @@
     Plot0 = {
       APS_HVON = {
         Component = RTApp.Data.DDB3
-        Signal = "APS_HVON"
+        Signal = "Signals.APS_HVON"
       }
       APS_SWON = {
         Component = RTApp.Data.DDB3
-        Signal = "APS_SWON"
+        Signal = "Signals.APS_SWON"
       }
       BPS_HVON = {
         Component = RTApp.Data.DDB3
-        Signal = "BPS_HVON"
+        Signal = "Signals.BPS_HVON"
       }
       BPS_SWON = {
         Component = RTApp.Data.DDB3
-        Signal = "BPS_SWON"
+        Signal = "Signals.BPS_SWON"
       }
       HVPS_HVON = {
         Component = RTApp.Data.DDB3
-        Signal = "MHVPS_HVON"
+        Signal = "Signals.MHVPS_HVON"
       }
     }
   }

EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app_states.marte

@@ -53,7 +53,7 @@
     +DANThread = {
       Class = RealTimeThread
       CPUs = @cpus_dan
-      Functions = { DANDIOPublisherGAM }
+      Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
     }
     +ReferenceGenerationThread = {
       Class = RealTimeThread
@@ -118,7 +118,7 @@
     }
     +DANThread = {
       Class = RealTimeThread
-      Functions = { DANDIOPublisherGAM }
+      Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
       CPUs = @cpus_dan
     }
     +ReferenceGenerationThread = {
@@ -187,7 +187,7 @@
     }
     +DANThread = {
       Class = RealTimeThread
-      Functions = { DANDIOPublisherGAM }
+      Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
       CPUs = @cpus_dan
     }
     +ReferenceGenerationThread = {
@@ -259,7 +259,7 @@
     }
     +DANThread = {
       Class = RealTimeThread
-      Functions = { DANDIOPublisherGAM }
+      Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
       CPUs = @cpus_dan
     }
     +ReferenceGenerationThread = {
@@ -326,7 +326,7 @@
     }
     +DANThread = {
       Class = RealTimeThread
-      Functions = { DANDIOPublisherGAM }
+      Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
       CPUs = @cpus_dan
     }
     +ReferenceGenerationThread = {
@@ -396,7 +396,7 @@
     }
     +DANThread = {
       Class = RealTimeThread
-      Functions = { DANDIOPublisherGAM }
+      Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
       CPUs = @cpus_dan
     }
     +ReferenceGenerationThread = {
@@ -458,7 +458,7 @@
     }
     +DANThread = {
       Class = RealTimeThread
-      Functions = { DANDIOPublisherGAM }
+      Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
       CPUs = @cpus_dan
     }
     +ReferenceGenerationThread = {
@@ -523,7 +523,7 @@
     }
     +DANThread = {
       Class = RealTimeThread
-      Functions = { DANDIOPublisherGAM }
+      Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
       CPUs = @cpus_dan
     }
     +ReferenceGenerationThread = {
@@ -589,7 +589,7 @@
     }
     +DANThread = {
       Class = RealTimeThread
-      Functions = { DANDIOPublisherGAM }
+      Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
       CPUs = @cpus_dan
     }
     +ReferenceGenerationThread = {

EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/pxi.marte

@@ -464,7 +464,7 @@
 +NI6528_0_DIO = {
   Class = NI6528
   DeviceName = "/dev/pxi6528"
-  BoardId = 0 // TODO: check if not 1
+  BoardId = 1 // TODO: check if not 1
   Signals = {
     //# P0.0 I.00 APS A Ready
     //# P0.1 I.01 APS A Fault

EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/0_initial.marte

@@ -6,6 +6,12 @@
     Class = StateMachineEvent
     NextState = "WAITSTANDBY"
     NextStateError = "ERROR"
+    +StartHttpServer = {
+      Class = Message
+      Destination = WebServer
+      Function = "Start"
+      Mode = "ExpectsReply"
+    }
     +PrepareNextStateMsg = {
       Class = Message
       Destination = RTApp

EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread5/dio_dan_writer.marte

@@ -2,7 +2,14 @@
 
 
 +Data = {
-
+  +DDB5 = {
+    AllowNoProducers = 1
+    Signals = {
+      CurrTime = {
+        Type = uint64
+      }
+    }
+  }
   +DANDIODataSource = {
     Class = "DAN::DANSource"
     NumberOfBuffers = 1000
@@ -199,12 +206,21 @@
 }
 
 +Functions = {
+  +CurrentTimeDIO = {
+    Class = "IOExt::SystemClockGAM"
+    OutputSignals = {
+      CurrTime = {
+        DataSource = DDB5
+        Type = uint64
+      }
+    }
+  }
   +DANDIOPublisherGAM = {
     Class = IOGAM
     InputSignals = {
       Time = {
-        DataSource = FastTimer
-        Alias = AbsoluteTime
+        DataSource = DDB5
+        Alias = CurrTime
       }
       PXI6528_Status = {
         DataSource = SynchThread