Fixed types and classes

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

@@ -2,7 +2,7 @@
 
 
 +EPICSCAInput = {
-  Class = EPICSCAInput
+  Class = "EPICSCA::EPICSCAInput"
   Signals = {
     TRIGGER_DAN = {
       PVName = @rfid .. ":DAN_ENABLED"
@@ -244,7 +244,7 @@
     }
     BEAM_ON_STAT = {
       PVName = (@rfid .. "-GAFP:FMC4310-YSTA-GAOP")
-      Type = uint32
+      Type = uint8
     }
     MHVPS_STOP = {
       PVName = (@rfid .. "-PMF:PSU0000-COFF")
@@ -260,15 +260,15 @@
     }
     HVARMED = {
       PVName = (@rfid .. "-GPF:PCF4210-YTS-GA1")
-      Type = uint32
+      Type = uint8
     }
     HVINJECTION = {
       PVName = (@rfid .. "-GPF:PCF4210-YTS-GA2")
-      Type = uint32
+      Type = uint8
     }
     RFON = {
       PVName = (@rfid .. "-GPF:PCF4210-YTS-GA3")
-      Type = uint32
+      Type = uint8
     }
     // Output PVs in Variables-operation tab.
     MHVPS_PREP_WF = {
@@ -309,7 +309,7 @@
     }
     PREP_TIME_WF = {
       PVName = (@rfid .. "-GAF:STAT-PREP-TIME-WF")
-      Type = int32
+      Type = uint32
       NumberOfElements = 8000
       NumberOfDimensions = 1
     }
@@ -474,7 +474,7 @@
       PVName = (@rfid .. "-GAFP:FMC4310-YTRP2")
     }
     PXI_6259_STATE = {
-      Type = uint8
+      Type = uint32
       PVName = (@rfid .. "-HWCF:6259-0-STATUS")
     }
     //! unused: No 6683 DS (TODO)
@@ -493,7 +493,7 @@
       PVName = (@rfid .. "-HWCF:6683-0-SYNCLOST")
     }
     PXI_6528_STATE = {
-      Type = uint8
+      Type = uint32
       PVName = (@rfid .. "-HWCF:6528-0-STATUS")
     }
   }

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

@@ -85,11 +85,7 @@
     }
     //# FHPS Rump Up completed
     FHPS_RU = {
-      Type = float32
+      Type = uint8
-    }
-    //# CCPS In operation flag
-    CCPS_IN_OPERATION = {
-      Type = uint32
     }
   }
 }

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

@@ -123,7 +123,6 @@
     FHPS_AUTO_STAT = {
       DataSource = WGAsyncBridge
     }
-    // Add 20201117
     APS_HVON = {
       DataSource = DDB1
     }
@@ -151,7 +150,7 @@
     PLC_OP_SELECTED = {
       DataSource = DDB1
     }
-    CCPS_IN_OPERATION = {
+    PLC_CC_OP_SELECTED = {
      DataSource = DDB1 
     }
     PLC_SYNCMODE = {
@@ -271,15 +270,12 @@
     }
     HVARMED = {
       DataSource = EPICSCAOutput
-      Type = uint32
     }
     HVINJECTION = {
       DataSource = EPICSCAOutput
-      Type = uint32
     }
     RFON = {
       DataSource = EPICSCAOutput
-      Type = uint32
     }
     MHVPS_REF = {
       DataSource = EPICSCAOutput

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

@@ -220,8 +220,8 @@
       }
       FHPS_RU = {
         DataSource = DDB1
-        Type = float32
         Comparator = "EQUALS"
+        Type = uint8
         Value = 1
       }
       GY_FHPS_MEAS_ACV = {
@@ -242,9 +242,8 @@
     Class = JAMessageGAM
     Operation = "AND"
     InputSignals = {
-      CCPS_IN_OPERATION = {
+      PLC_CC_OP_SELECTED = {
         DataSource = DDB1
-        Type = uint32
         Comparator = "EQUALS"
         Value = 1
       }

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

@@ -7,6 +7,7 @@
   Class = IOGAM
   InputSignals = {
     PXI6259_Status = {
+      DataSource = SynchThread
       Samples = @fast_slow_ratio
       Frequency = 1
     }

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

@@ -4,7 +4,7 @@
 +Data = {
   //# SDN subscriber
   +SDNCommands = {
-    Class = SDNSubscriber
+    Class = "SDN::SDNSubscriber"
     Topic = "ECPC2SCUJA"
     Interface = "enp35s0f1"
     CPUs = 0x200
@@ -58,7 +58,7 @@
     }
   }
   +SDNReply = {
-    Class = SDNPublisher
+    Class = "SDN::SDNPublisher"
     Topic = "SCUJA2ECPC"
     Interface = "enp35s0f1"
     CPUs = 0x200 // changed from 0x100

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

@@ -1,7 +1,7 @@
 #package jada_gyro.RTApp.Functions
 
 +NI6528_0_ReaderGAM = {
-  Class = ExtractBitGAM
+  Class = "IOExt::ExtractBitGAM"
   InputSignals = {
     DI0 = {
       DataSource = NI6528_0_DIO
@@ -90,7 +90,7 @@
 // Digital Output port access.
 // EPICS PV to one uint8 variable
 +NI6528_0_WriterGAM = {
-  Class = CompactBitGAM
+  Class = "IOExt::CompactBitGAM"
   InputSignals = {
     APS_HVON = {
       DataSource = DDB3

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

@@ -3,7 +3,7 @@
 
 +Data = {
   +FastADC = {
-    Class = NI6368ADC
+    Class = "NI6368::NI6368ADC"
     // The divisor is computed on BaseSampleClockFrequency.
     SamplingFrequency = @sampling_freq
     DeviceName = "/dev/pxie-6368"
@@ -134,7 +134,7 @@
     }
   }
   +FastAnalogDAN = {
-    Class = DANSource
+    Class = "DAN::DANSource"
     NumberOfBuffers = 10
     CPUMask = @cpus_adc
     StackSize = 10000000
@@ -156,57 +156,67 @@
       GY_APS_V_MEAS = {
         Type = float32
         NumberOfElements = @slow_clock
+        SamplingFrequency = @sampling_freq
         NodeName = (@rfid .. ":GY_APS_V_MEAS")
       }
       GY_APS_I_MEAS = {
         Type = float32
         NumberOfElements = @slow_clock
+        SamplingFrequency = @sampling_freq
         NodeName = (@rfid .. ":GY_APS_I_MEAS")
       }
       GY_BPS_V_MEAS = {
         Type = float32
         NumberOfElements = @slow_clock
+        SamplingFrequency = @sampling_freq
         NodeName = (@rfid .. ":GY_BPS_V_MEAS")
       }
       GY_BPS_I_MEAS = {
         Type = float32
         NumberOfElements = @slow_clock
+        SamplingFrequency = @sampling_freq
         NodeName = (@rfid .. ":GY_BPS_I_MEAS")
       }
       GY_MHV_V_MEAS = {
         Type = float32
         NumberOfElements = @slow_clock
+        SamplingFrequency = @sampling_freq
         NodeName = (@rfid .. ":GY_MHV_V_MEAS")
       }
       GY_MHV_I_MEAS = {
         Type = float32
         NumberOfElements = @slow_clock
+        SamplingFrequency = @sampling_freq
         NodeName = (@rfid .. ":GY_MHV_I_MEAS")
       }
       GY_ARC1_V_MEAS = {
         Type = float32
         NumberOfElements = @slow_clock
+        SamplingFrequency = @sampling_freq
         NodeName = (@rfid .. ":GY_ARC1_V_MEAS")
       }
       GY_ARC2_V_MEAS = {
         Type = float32
         NumberOfElements = @slow_clock
+        SamplingFrequency = @sampling_freq
         NodeName = (@rfid .. ":GY_ARC2_V_MEAS")
       }
       GY_ARC3_V_MEAS = {
         Type = float32
         NumberOfElements = @slow_clock
+        SamplingFrequency = @sampling_freq
         NodeName = (@rfid .. ":GY_ARC3_V_MEAS")
       }
       GY_RF_V_MEAS = {
         Type = float32
         NumberOfElements = @slow_clock
+        SamplingFrequency = @sampling_freq
         NodeName = (@rfid .. ":GY_RF_V_MEAS")
       }
     }
   }
   +AnalogEpicsOutput = {
-    Class = EPICSCAOutput
+    Class = "EPICSCA::EPICSCAOutput"
     CPUMask = @cpus_adc // change from 0x200
     StackSize = 10000000
     NumberOfBuffers = 2

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

@@ -4,7 +4,7 @@
 +Data = {
 
   +DANDIODataSource = {
-    Class = DANSource
+    Class = "DAN::DANSource"
     NumberOfBuffers = 10
     CPUMask = 15
     StackSize = 10000000

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

@@ -33,6 +33,7 @@
 
 +Data = {
   +DDB6 = {
+    AllowNoProducer = 1
     Signals = {
       CCPS_REF = {
         Type = float32

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

@@ -72,6 +72,7 @@
       FHPS_REF_OUT = {
         Alias = FHPS_REF
         DataSource = NI6259_AO
+        Trigger = 1
       }
       FHPS_AUTO_STAT = {
         DataSource = WGAsyncBridge