From 46f5010426dece672e57fbc9ccd74eff8af402ee Mon Sep 17 00:00:00 2001
From: Martino Ferrari <martinogiordano.ferrari@iter.org>
Date: Thu, 5 Feb 2026 12:08:07 +0100
Subject: [PATCH] Simplified fields of JAMessageGAM

---
 .../src/thread1/state_management.marte        | 54 ++++++++++++-------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/state_management.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/state_management.marte
index 8548a6d..7468fd9 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/state_management.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/state_management.marte
@@ -47,31 +47,38 @@
     InputSignals = {
       GYA_APS_FLT = {
         DataSource = DDB1
-        ExpectedValue = 1
+        Comparator = "EQUALS"
+        Value = 1
       }
       GYA_BPS_FLT = {
         DataSource = DDB1
-        ExpectedValue = 1
+        Comparator = "EQUALS"
+        Value = 1
       }
       MHVPS_OV = {
         DataSource = DDB1
-        ExpectedValue = 1
+        Comparator = "EQUALS"
+        Value = 1
       }
       MHVPS_OC = {
         DataSource = DDB1
-        ExpectedValue = 1
+        Comparator = "EQUALS"
+        Value = 1
       }
       MHVPS_FLT = {
         DataSource = DDB1
-        ExpectedValue = 1
+        Comparator = "EQUALS"
+        Value = 1
       }
       MIS_ITL = {
         DataSource = EPICSCAInput
-        ExpectedValue = 1
+        Comparator = "EQUALS"
+        Value = 1
       }
       PLC_ITL = {
         DataSource = DDB1
-        ExpectedValue = 1
+        Comparator = "EQUALS"
+        Value = 1
       }
     }
     +Event = {
@@ -87,35 +94,43 @@
     InputSignals = {
       RESET_FLT = {
         DataSource = EPICSCAInput
-        ExpectedValue = 1
+        Comparator = "EQUALS"
+        Value = 1
       }
       GYA_APS_FLT = {
         DataSource = DDB1
-        ExpectedValue = 0
+        Comparator = "EQUALS"
+        Value = 0
       }
       GYA_BPS_FLT = {
         DataSource = DDB1
-        ExpectedValue = 0
+        Comparator = "EQUALS"
+        Value = 0
       }
       MHVPS_OV = {
         DataSource = DDB1
-        ExpectedValue = 0
+        Comparator = "EQUALS"
+        Value = 0
       }
       MHVPS_OC = {
         DataSource = DDB1
-        ExpectedValue = 0
+        Comparator = "EQUALS"
+        Value = 0
       }
       MHVPS_FLT = {
         DataSource = DDB1
-        ExpectedValue = 0
+        Comparator = "EQUALS"
+        Value = 0
       }
       MIS_ITL = {
         DataSource = EPICSCAInput
-        ExpectedValue = 0
+        Comparator = "EQUALS"
+        Value = 0
       }
       PLC_ITL = {
         DataSource = DDB1
-        ExpectedValue = 0
+        Comparator = "EQUALS"
+        Value = 0
       }
     }
     +Event = {
@@ -131,7 +146,8 @@
     InputSignals = {
       PLC_SELECT = {
         DataSource = EPICSCAInput
-        ExpectedValue = 1
+        Comparator = "EQUALS"
+        Value = 1
       }
     }
     +Event = {
@@ -245,11 +261,13 @@
     InputSignals = {
       PLC_STANDBY = {
         DataSource = DDB1
-        ExpectedValue = 0
+        Value = 0
+        Comparator = "EQUALS"
       }
       PLC_READY = {
         DataSource = DDB1
-        ExpectedValue = 0
+        Value = 0
+        Comparator = "EQUALS"
       }
     }
     +Event = {