diff --git a/Configurations/RTApp-AtcaIop.cfg b/Configurations/RTApp-AtcaIop.cfg index f5888db..6b63080 100644 --- a/Configurations/RTApp-AtcaIop.cfg +++ b/Configurations/RTApp-AtcaIop.cfg @@ -208,7 +208,7 @@ Timeout = 0 +ChangeToRunMsg = { Class = Message - Destination = MdsLoopApp + Destination = IsttokApp Mode = ExpectsReply Function = PrepareNextState +Parameters = { @@ -226,13 +226,13 @@ */ +StopCurrentStateExecutionMsg = { Class = Message - Destination = MdsLoopApp + Destination = IsttokApp Function = StopCurrentStateExecution Mode = ExpectsReply } +StartNextStateExecutionMsg = { Class = Message - Destination = MdsLoopApp + Destination = IsttokApp Function = StartNextStateExecution Mode = ExpectsReply } @@ -1174,7 +1174,8 @@ $IsttokApp = { NumberOfBuffers = "120000" CPUMask = "0x080" StackSize = "10000000" - TreeName = "rtappisttok" + TreeName = "isttokmarte" + //TreeName = "rtappisttok" StoreOnTrigger = "0" TimeRefresh = "5" NumberOfPreTriggers = "0" @@ -1186,109 +1187,109 @@ $IsttokApp = { TimeSignal = "1" } AdcRawDecim0 = { - NodeName = "ATCAIOP1.ADC0RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC0RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim1 = { - NodeName = "ATCAIOP1.ADC1RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_1.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_1.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC1RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim2 = { - NodeName = "ATCAIOP1.ADC2RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_2.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_2.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC2RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim3 = { - NodeName = "ATCAIOP1.ADC3RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_3.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_3.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC3RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim4 = { - NodeName = "ATCAIOP1.ADC4RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_4.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_4.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC4RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim5 = { - NodeName = "ATCAIOP1.ADC5RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_5.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_5.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC5RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim6 = { - NodeName = "ATCAIOP1.ADC6RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_6.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_6.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC6RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim7 = { - NodeName = "ATCAIOP1.ADC7RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_7.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_7.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC7RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim8 = { - NodeName = "ATCAIOP1.ADC8RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_8.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_8.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC8RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim9 = { - NodeName = "ATCAIOP1.ADC9RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_9.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_9.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC9RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim10 = { - NodeName = "ATCAIOP1.ADC10RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_10.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_10.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC10RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcRawDecim11 = { - NodeName = "ATCAIOP1.ADC11RAW" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_11.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_11.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC11RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" @@ -1314,109 +1315,111 @@ $IsttokApp = { } */ AdcInteg0 = { - NodeName = "ATCAIOP1.ADC0INT" + //NodeName = "ATCAIOP1.ADC0INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC0INTD" + //DecimatedNodeName = "ATCAIOP1.ADC0INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg1 = { - NodeName = "ATCAIOP1.ADC1INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC1INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg2 = { - NodeName = "ATCAIOP1.ADC2INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC2INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg3 = { - NodeName = "ATCAIOP1.ADC3INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC3INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg4 = { - NodeName = "ATCAIOP1.ADC4INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC4INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg5 = { - NodeName = "ATCAIOP1.ADC5INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC5INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg6 = { - NodeName = "ATCAIOP1.ADC6INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC6INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg7 = { - NodeName = "ATCAIOP1.ADC7INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC7INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg8 = { - NodeName = "ATCAIOP1.ADC8INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC8INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg9 = { - NodeName = "ATCAIOP1.ADC9INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC9INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg10 = { - NodeName = "ATCAIOP1.ADC10INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC10INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } AdcInteg11 = { - NodeName = "ATCAIOP1.ADC11INT" + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC11INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0"