From 7e63addd756beb8e95291ef4bfdae549c0a0419f Mon Sep 17 00:00:00 2001 From: Martino Ferrari Date: Tue, 27 Jan 2026 09:14:31 +0100 Subject: [PATCH] Renamed JAGyroApp to RTApp for shortening and avoid repetition with project name `jada_gyro` --- .../Configurations/src/app.marte | 2 +- .../Configurations/src/app_states.marte | 2 +- .../Configurations/src/data/epics.marte | 2 +- .../Configurations/src/data/pxi.marte | 2 +- .../src/state_machine/disabled.marte | 12 +++---- .../src/state_machine/error.marte | 6 ++-- .../src/state_machine/initial.marte | 4 +-- .../src/state_machine/waithvon.marte | 18 +++++----- .../src/state_machine/waithvon_prep.marte | 18 +++++----- .../src/state_machine/waithvon_sdn.marte | 18 +++++----- .../src/state_machine/waithvon_sdn_prep.marte | 18 +++++----- .../src/state_machine/waitpermit.marte | 36 +++++++++---------- .../src/state_machine/waitready.marte | 18 +++++----- .../src/state_machine/waitstandby.marte | 18 +++++----- .../Configurations/src/thread1/data.marte | 2 +- .../Configurations/src/thread1/epics.marte | 2 +- .../src/thread1/pxi_error_management.marte | 2 +- .../src/thread1/references_generator.marte | 2 +- .../src/thread1/state_management.marte | 2 +- .../Configurations/src/thread2/sdn.marte | 2 +- .../Configurations/src/timers.marte | 2 +- 21 files changed, 94 insertions(+), 94 deletions(-) diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app.marte index 6b1e021..30cdb72 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app.marte @@ -3,7 +3,7 @@ +StateMachine = { Class = StateMachine } -+JAGyroApp = { ++RTApp = { Class = RealTimeApplication +Data = { Class = ReferenceContainer diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app_states.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app_states.marte index 6d4232e..7ebc5fe 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app_states.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app_states.marte @@ -1,4 +1,4 @@ -#package jada_gyro.JAGyroApp.States +#package jada_gyro.RTApp.States +Disabled = { Class = RealTimeState diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte index 7f8608c..170223f 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte @@ -1,4 +1,4 @@ -#package jada_gyro.JAGyroApp.Data +#package jada_gyro.RTApp.Data +EPICSCAInput = { Class = EPICSCAInput diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/pxi.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/pxi.marte index a64f6d9..af562f9 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/pxi.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/pxi.marte @@ -1,4 +1,4 @@ -#package jada_gyro.JAGyroApp.Data +#package jada_gyro.RTApp.Data +DDB1 = { Signals = { diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte index 24cc71b..7d61734 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte @@ -8,13 +8,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -24,7 +24,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -55,13 +55,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -71,7 +71,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte index 25a91ef..94e756a 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte @@ -9,13 +9,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -25,7 +25,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/initial.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/initial.marte index 311af51..ea16009 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/initial.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/initial.marte @@ -8,7 +8,7 @@ NextStateError = "ERROR" +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -18,7 +18,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte index 98d7987..50bf852 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte @@ -8,13 +8,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -24,7 +24,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -55,13 +55,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -71,7 +71,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -102,13 +102,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -118,7 +118,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte index 8eb7ca5..9a361f8 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte @@ -8,13 +8,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -24,7 +24,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -55,13 +55,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -71,7 +71,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -102,13 +102,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -118,7 +118,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte index 7da093b..4b167b5 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte @@ -8,13 +8,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -24,7 +24,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -55,13 +55,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -71,7 +71,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -102,13 +102,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -118,7 +118,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte index e1cb8d1..af96a50 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte @@ -8,13 +8,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -24,7 +24,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -55,13 +55,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -71,7 +71,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -102,13 +102,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -118,7 +118,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte index 79f963e..0c6e9ae 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte @@ -8,13 +8,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -24,7 +24,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -55,13 +55,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -71,7 +71,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -102,13 +102,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -118,7 +118,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -149,13 +149,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -165,7 +165,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -196,13 +196,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -212,7 +212,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -243,13 +243,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -259,7 +259,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte index 3ea40ff..a6788a7 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte @@ -8,13 +8,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -24,7 +24,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -55,13 +55,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -71,7 +71,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -102,13 +102,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -118,7 +118,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte index 221c64d..b85c8d5 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte @@ -8,13 +8,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -24,7 +24,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -55,13 +55,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -71,7 +71,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -102,13 +102,13 @@ NextStateError = "ERROR" +StopCurrentStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StopCurrentStateExecution Mode = ExpectsReply } +PrepareNextStateMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -118,7 +118,7 @@ } +StartNextStateExecutionMsg = { Class = Message - Destination = JAGyroApp + Destination = RTApp Function = StartNextStateExecution Mode = ExpectsReply } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte index 01f0467..2bcdb8d 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte @@ -1,4 +1,4 @@ -#package jada_gyro.JAGyroApp.Data +#package jada_gyro.RTApp.Data +DDB1 = { Signals = { diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/epics.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/epics.marte index fc66b14..09242fa 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/epics.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/epics.marte @@ -1,4 +1,4 @@ -#package jada_gyro.JAGyroApp.Functions +#package jada_gyro.RTApp.Functions //# Copy data from DDB1 to EPICSCAOutput DataSource. +EPICSOutputGAM = { diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/pxi_error_management.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/pxi_error_management.marte index 4b696b7..ae1ff46 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/pxi_error_management.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/pxi_error_management.marte @@ -1,4 +1,4 @@ -#package jada_gyro.JAGyroApp.Functions +#package jada_gyro.RTApp.Functions //# Check PXI board status. +PXI6259ErrorGAM = { diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/references_generator.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/references_generator.marte index b0b03b1..eb6c64c 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/references_generator.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/references_generator.marte @@ -1,4 +1,4 @@ -#package jada_gyro.JAGyroApp.Functions +#package jada_gyro.RTApp.Functions // GAM for trianguler waveform generation. +CCPSWaveformGAM = { 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 16c4a4f..e5baeb2 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 @@ -1,4 +1,4 @@ -#package jada_gyro.JAGyroApp +#package jada_gyro.RTApp +Data = { +DDB1 = { diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread2/sdn.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread2/sdn.marte index 849b2f5..4f344b4 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread2/sdn.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread2/sdn.marte @@ -1,4 +1,4 @@ -#package jada_gyro.JAGyroApp +#package jada_gyro.RTApp +Data = { //# SDN subscriber diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte index 5b7db59..c209972 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte @@ -1,4 +1,4 @@ -#package jada_gyro.JAGyroApp +#package jada_gyro.RTApp +Data = { //# Fast cycle timer