From 6ebd943f9b22850bcbdfa0bf4639e94dcef9e02e Mon Sep 17 00:00:00 2001 From: Martino Ferrari Date: Thu, 5 Feb 2026 14:52:23 +0100 Subject: [PATCH] Using 6258 inversion mask in datasource --- .marte_schema.cue | 6 +----- .../Configurations/src/data/pxi.marte | 3 +++ .../Configurations/src/thread3/pxi_io_gams.marte | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.marte_schema.cue b/.marte_schema.cue index 87ba99c..1ca6f22 100644 --- a/.marte_schema.cue +++ b/.marte_schema.cue @@ -2,11 +2,7 @@ package schema #Classes: { ExtractBitGAM: {...} - CompactBitGAM: { - Invert?: 0 | 1 - InversionMask: uint - ... - } + CompactBitGAM: {...} NI6528: { ... 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 ef257d3..f6babd0 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 @@ -370,6 +370,7 @@ DO3 = { Type = uint8 PortId = 3 + InversionMask = 0xFF } //# P4.0 O.08 RV6 _cRIO //# P4.1 O.09 RV7 _cRIO @@ -382,6 +383,7 @@ DO4 = { Type = uint8 PortId = 4 + InversionMask = 0xFF } //# P5.0 O.16 HVInjection //# P5.1 O.17 RFON @@ -394,6 +396,7 @@ DO5 = { Type = uint8 PortId = 5 + InversionMask = 0xFF } } } 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 033c7aa..2622477 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 @@ -91,7 +91,6 @@ // EPICS PV to one uint8 variable +NI6528_0_WriterGAM = { Class = CompactBitGAM - Invert = 1 InputSignals = { APS_HVON = { DataSource = DDB3