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 c41acbd..2bafe26 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 @@ -63,6 +63,7 @@ WGTimerGAM, CCPSWaveformGAM, FHPSStateGAM, + FHPSGainGAM, WGProducerGAM } } @@ -133,6 +134,7 @@ FHPSSetpointGAM, FHPSRampupGAM, FHPSStateGAM, + FHPSGainGAM, WGProducerGAM } } @@ -204,6 +206,7 @@ FHPSSetpointGAM, FHPSRampupGAM, FHPSStateGAM, + FHPSGainGAM, WGProducerGAM } } @@ -278,6 +281,7 @@ FHPSSetpointGAM, FHPSRampupGAM, FHPSStateGAM, + FHPSGainGAM, WGProducerGAM } } @@ -347,6 +351,7 @@ FHPSSetpointGAM, FHPSRampupGAM, FHPSStateGAM, + FHPSGainGAM, WGProducerGAM } } @@ -418,6 +423,7 @@ CCPSWaveformGAM, FHPSRampupGAM, FHPSStateGAM, + FHPSGainGAM, WGProducerGAM } } @@ -482,6 +488,7 @@ CCPSWaveformGAM, FHPSRampupGAM, FHPSStateGAM, + FHPSGainGAM, WGProducerGAM } } @@ -549,6 +556,7 @@ CCPSWaveformGAM, FHPSRampupGAM, FHPSStateGAM, + FHPSGainGAM, WGProducerGAM } } @@ -616,6 +624,7 @@ WGTimerGAM, CCPSWaveformGAM, FHPSStateGAM, + FHPSGainGAM, WGProducerGAM } } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/fhps.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/fhps.marte index a27dca6..e192c07 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/fhps.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/fhps.marte @@ -79,6 +79,20 @@ } } } + +FHPSGainGAM = { + Class = ScaleGAM + InputSignals = { + FHPS_REF = { + DataSource = DDB6 + Factor = 15 + } + } + OutputSignals = { + FHPS_SCALED = { + DataSource = DDB6 + } + } + } } +Data = { +DDB6 = { @@ -86,6 +100,9 @@ FHPS_REF = { Type = float32 } + FHPS_SCALED = { + Type = float32 + } FHPS_TAGV = { Type = float32 } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/synch.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/synch.marte index a6a5031..44178fc 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/synch.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/synch.marte @@ -50,7 +50,7 @@ Alias = CCPS_REF DataSource = DDB6 } - FHPS_REF = { + FHPS_SCALED = { DataSource = DDB6 } FHPS_REF_OUT = {