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 0b78f9b..651ef4b 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 @@ -112,9 +112,14 @@ CPUMask = 15 StackSize = 10000000 DanBufferMultiplier = 4 - StoreOnTrigger = 0 + StoreOnTrigger = 1 ICProgName = @app_name + NumberOfPreTriggers = 0 + NumberOfPostTriggers = 0 Signals = { + Trigger_DAN = { + Type = uint8 + } GY_APS_V_MEAS = { Type = float32 NumberOfElements = @slow_clock @@ -159,6 +164,9 @@ } +AnalogEpicsOutput = { Class = EPICSCAOutput + CPUMask = @cpus_adccs// change from 0x200 + StackSize = 10000000 + NumberOfBuffers = 2 Signals = { PXI6368_Status = { Type = uint32 @@ -335,6 +343,9 @@ +PushADCtoDAN = { Class = IOGAM InputSignals = { + TRIGGER_DAN = { + DataSource = EPICSCAInput + } GY_APS_V_MEAS = { DataSource = DDB4 } @@ -367,7 +378,10 @@ } } OutputSignals = { - GY_APS_V_MEAS = { + Trigger_DAN = { + DataSource = FastAnalogDAN + } + GY_APS_V_MEAS = { DataSource = FastAnalogDAN } GY_APS_I_MEAS = {