From 9f110481ad0ed9bae0071d8f0e1bdaa991abd1e8 Mon Sep 17 00:00:00 2001 From: Martino Ferrari Date: Fri, 6 Feb 2026 18:05:05 +0100 Subject: [PATCH] Updated triangualr waveform gen --- .../JATriangleWaveGAM/JATriangleWaveGAM.cpp | 6 +-- .../JATriangleWaveGAM/JATriangleWaveGAM.h | 2 +- .../Configurations/src/thread3/datasync.marte | 9 ---- .../src/thread4/adc_2_dan.marte | 44 +++++++++---------- .../src/thread5/dio_dan_writer.marte | 8 ++-- 5 files changed, 30 insertions(+), 39 deletions(-) diff --git a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JATriangleWaveGAM/JATriangleWaveGAM.cpp b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JATriangleWaveGAM/JATriangleWaveGAM.cpp index 7004a1f..73b8320 100644 --- a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JATriangleWaveGAM/JATriangleWaveGAM.cpp +++ b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JATriangleWaveGAM/JATriangleWaveGAM.cpp @@ -51,7 +51,7 @@ JATriangleWaveGAM::JATriangleWaveGAM() { frequency = NULL_PTR(MARTe::float32 *); amplitude = NULL_PTR(MARTe::float32 *); offset = NULL_PTR(MARTe::float32 *); - plcStandby = NULL_PTR(MARTe::uint32 *); + plcStandby = NULL_PTR(MARTe::uint8 *); waveOutput = NULL_PTR(MARTe::float32 *); time = 0.0f; } @@ -130,7 +130,7 @@ bool JATriangleWaveGAM::Setup() { } else { TypeDescriptor inputType = GetSignalType(InputSignals, plcStandbyIndex); - ok = (inputType == UnsignedInteger32Bit); + ok = (inputType == UnsignedInteger8Bit); if (!ok) { REPORT_ERROR(ErrorManagement::ParametersError, "PLCSTANDBY shall be defined as uint32."); } @@ -147,7 +147,7 @@ bool JATriangleWaveGAM::Setup() { frequency = reinterpret_cast(GetInputSignalMemory(freqIndex)); amplitude = reinterpret_cast(GetInputSignalMemory(ampIndex)); offset = reinterpret_cast(GetInputSignalMemory(offsetIndex)); - plcStandby = reinterpret_cast(GetInputSignalMemory(plcStandbyIndex)); + plcStandby = reinterpret_cast(GetInputSignalMemory(plcStandbyIndex)); waveOutput = reinterpret_cast(GetOutputSignalMemory(0)); } return ok; diff --git a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JATriangleWaveGAM/JATriangleWaveGAM.h b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JATriangleWaveGAM/JATriangleWaveGAM.h index 22e34c3..8fd6763 100644 --- a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JATriangleWaveGAM/JATriangleWaveGAM.h +++ b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JATriangleWaveGAM/JATriangleWaveGAM.h @@ -114,7 +114,7 @@ private: //MARTe::uint32 *plcReady; // Input signal condition CCPS_STANDBY - MARTe::uint32 *plcStandby; + MARTe::uint8 *plcStandby; MARTe::float32 *waveOutput; diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/datasync.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/datasync.marte index a8357d0..aa75979 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/datasync.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/datasync.marte @@ -6,9 +6,6 @@ Class = RealTimeThreadSynchronisation Timeout = 0xFFFFFFFF Signals = { - Time = { - Type = uint64 - } PXI6259_Status = { Type = uint32 } @@ -149,9 +146,6 @@ +SyncThreadProducerGAM = { Class = IOGAM InputSignals = { - AbsoluteTime = { - DataSource = FastTimer - } PXI6259_Status = { Alias = Status DataSource = NI6259_DIO_P0 @@ -257,9 +251,6 @@ } } OutputSignals = { - Time = { - DataSource = SynchThread - } PXI6259_Status = { DataSource = SynchThread } diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte index b576f44..4ec8322 100644 --- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte +++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte @@ -469,101 +469,101 @@ PXI6368_Status_Async = { Alias = PXI6368_Status DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } PXI6368_Status = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_APS_V_MEAS_Async = { Alias = GY_APS_V_MEAS DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_APS_V_MEAS = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_APS_I_MEAS_Async = { Alias = GY_APS_I_MEAS DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_APS_I_MEAS = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_BPS_V_MEAS_Async = { Alias = GY_BPS_V_MEAS DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_BPS_V_MEAS = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_BPS_I_MEAS_Async = { Alias = GY_BPS_I_MEAS DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_BPS_I_MEAS = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_MHV_V_MEAS_Async = { Alias = GY_MHV_V_MEAS DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_MHV_V_MEAS = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_MHV_I_MEAS_Async = { Alias = GY_MHV_I_MEAS DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_MHV_I_MEAS = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_ARC1_V_MEAS_Async = { Alias = GY_ARC1_V_MEAS DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_ARC1_V_MEAS = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_ARC2_V_MEAS_Async = { Alias = GY_ARC2_V_MEAS DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_ARC2_V_MEAS = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_ARC3_V_MEAS_Async = { Alias = GY_ARC3_V_MEAS DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_ARC3_V_MEAS = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_RF_V_MEAS_Async = { Alias = GY_RF_V_MEAS DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } GY_RF_V_MEAS = { DataSource = DDB4 - Range = { { 0, 0 } } + Ranges = { { 0, 0 } } } } OutputSignals = { 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 fc6fdb8..b15b7e7 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 @@ -29,7 +29,7 @@ GYA_APS_READY = { SamplingFrequency = @fast_clock NumberOfElements = @dan_ratio - Type = uint32 + Type = uint8 NodeName = @rfid .. ":GYA_APS_READY" } GYA_APS_FLT = { @@ -203,13 +203,13 @@ Class = IOGAM InputSignals = { Time = { - DataSource = SynchThread - Samples = @dan_ratio - Frequency = 1 + DataSource = FastTimer + Alias = AbsoluteTime } PXI6528_Status = { DataSource = SynchThread Samples = @dan_ratio + Frequency = 1 } GYA_APS_READY = { DataSource = SynchThread