From 4c6f0a5bb4c9273296f3ab44e85fb4bb12589a95 Mon Sep 17 00:00:00 2001 From: Martino Ferrari Date: Mon, 9 Feb 2026 18:17:26 +0100 Subject: [PATCH] Fixed minors typos --- .../Configurations/src/data/pxi.marte | 4 ---- .../Configurations/src/thread1/state_management.marte | 4 ---- .../Configurations/src/thread3/pxi_io_gams.marte | 2 +- .../Configurations/src/thread5/dio_dan_writer.marte | 1 + .../Configurations/src/timers.marte | 4 ++-- 5 files changed, 4 insertions(+), 11 deletions(-) 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 439eec5..ceb47a2 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 @@ -3,10 +3,6 @@ +DDB1 = { Signals = { - //# PXI Status - PXI_FAULT = { - Type = uint32 - } PXI6528_Status = { Type = uint32 } 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 58056e9..be23154 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 @@ -16,10 +16,6 @@ PCF_STATE = { Type = uint32 } - //# Fast controller fault stata variable - PCF_FAULT = { - Type = uint32 - } } } } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/pxi_io_gams.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/pxi_io_gams.marte index 9281400..9e015e6 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/pxi_io_gams.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/pxi_io_gams.marte @@ -93,7 +93,7 @@ // Digital Output port access. // EPICS PV to one uint8 variable +NI6528_0_WriterGAM = { - Class = "IOExt::CompactBitGAM" + Class = IOExt::CompactBitGAM InputSignals = { APS_HVON = { DataSource = DDB3 diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread5/dio_dan_writer.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread5/dio_dan_writer.marte index da1bf2b..c4227df 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread5/dio_dan_writer.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread5/dio_dan_writer.marte @@ -3,6 +3,7 @@ +Data = { +DDB5 = { + Class = GAMDataSource AllowNoProducers = 1 Signals = { CurrTime = { 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 a50fd22..ce7b754 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 @@ -131,10 +131,10 @@ Counter = { DataSource = DDB3 } - PCF_FAULT = { + PCF_FLT = { DataSource = DDB3 } - PXI_FAULT = { + PXI_FLT = { DataSource = DDB3 } }