Added channels 12/13

Signed-off-by: Bernardo Carvalho <bernardo.carvalho@tecnico.ulisboa.pt>
This commit is contained in:
2024-04-23 14:53:30 +01:00
parent 66674026f9
commit 7dfc58fd15

View File

@@ -292,140 +292,140 @@ $IsttokApp = {
Class = "IOGAM" Class = "IOGAM"
InputSignals = { InputSignals = {
Counter = { Counter = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "uint32" Type = "uint32"
} }
Time = { Time = {
Frequency = "10000" Frequency = "10000"
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "uint32" Type = "uint32"
} }
ADC0Decim = { ADC0Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC1Decim = { ADC1Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC2Decim = { ADC2Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC3Decim = { ADC3Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC4Decim = { ADC4Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC5Decim = { ADC5Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC6Decim = { ADC6Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC7Decim = { ADC7Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC8Decim = { ADC8Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC9Decim = { ADC9Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC10Decim = { ADC10Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC11Decim = { ADC11Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC12Decim = { ADC12Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC13Decim = { ADC13Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC14Decim = { ADC14Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC15Decim = { ADC15Decim = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int32" Type = "int32"
} }
ADC0Int = { ADC0Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC1Int = { ADC1Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC2Int = { ADC2Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC3Int = { ADC3Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC4Int = { ADC4Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC5Int = { ADC5Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC6Int = { ADC6Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC7Int = { ADC7Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC8Int = { ADC8Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC9Int = { ADC9Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC10Int = { ADC10Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC11Int = { ADC11Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC12Int = { ADC12Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC13Int = { ADC13Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC14Int = { ADC14Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
ADC15Int = { ADC15Int = {
DataSource = "AtcaIop_0_ADC" DataSource = "AtcaIopAdc_DS"
Type = "int64" Type = "int64"
} }
Idle_Thread1_CycleTime = { Idle_Thread1_CycleTime = {
@@ -617,11 +617,11 @@ $IsttokApp = {
} }
OutputSignals = { OutputSignals = {
DAC0 = { DAC0 = {
DataSource = AtcaIop_0_DAC DataSource = AtcaIopDac_DS
Type = float32 Type = float32
} }
DAC1 = { DAC1 = {
DataSource = AtcaIop_0_DAC DataSource = AtcaIopDac_DS
Type = float32 Type = float32
Trigger = 1 Trigger = 1
} }
@@ -645,13 +645,13 @@ $IsttokApp = {
} }
OutputSignals = { OutputSignals = {
EO = { EO = {
DataSource = AtcaIopConfigEoWo_2 DataSource = AtcaIopConfigEoWo_DS
Type = int32 Type = int32
NumberOfElements = "16" NumberOfElements = "16"
Trigger = 1 Trigger = 1
} }
WO = { WO = {
DataSource = AtcaIopConfigEoWo_2 DataSource = AtcaIopConfigEoWo_DS
NumberOfElements = "16" NumberOfElements = "16"
Type = float32 Type = float32
} }
@@ -752,6 +752,14 @@ $IsttokApp = {
DataSource = "DDB1" DataSource = "DDB1"
Type = "int32" Type = "int32"
} }
ADC12DRaw = {
DataSource = "DDB1"
Type = "int32"
}
ADC13DRaw = {
DataSource = "DDB1"
Type = "int32"
}
ADC0Integral = { ADC0Integral = {
DataSource = "DDB1" DataSource = "DDB1"
Type = "int64" Type = "int64"
@@ -800,6 +808,14 @@ $IsttokApp = {
DataSource = "DDB1" DataSource = "DDB1"
Type = "int64" Type = "int64"
} }
ADC12Integral = {
DataSource = "DDB1"
Type = "int64"
}
ADC13Integral = {
DataSource = "DDB1"
Type = "int64"
}
} }
OutputSignals = { OutputSignals = {
ADC0DecimS = { ADC0DecimS = {
@@ -850,6 +866,14 @@ $IsttokApp = {
DataSource = "DDB1" DataSource = "DDB1"
Type = "float32" Type = "float32"
} }
ADC12DecimS = {
DataSource = "DDB1"
Type = "float32"
}
ADC13DecimS = {
DataSource = "DDB1"
Type = "float32"
}
ADC0IntegS = { ADC0IntegS = {
DataSource = "DDB1" DataSource = "DDB1"
Type = "float32" Type = "float32"
@@ -898,6 +922,14 @@ $IsttokApp = {
DataSource = "DDB1" DataSource = "DDB1"
Type = "float32" Type = "float32"
} }
ADC12IntegS = {
DataSource = "DDB1"
Type = "float32"
}
ADC13IntegS = {
DataSource = "DDB1"
Type = "float32"
}
} }
} }
+GAMHistogramCycleTimes = { +GAMHistogramCycleTimes = {
@@ -1058,6 +1090,14 @@ $IsttokApp = {
DataSource = "DDB1" DataSource = "DDB1"
Type = "float32" Type = "float32"
} }
ADC12DecimS = {
DataSource = "DDB1"
Type = "float32"
}
ADC13DecimS = {
DataSource = "DDB1"
Type = "float32"
}
ADC0IntegS = { ADC0IntegS = {
DataSource = "DDB1" DataSource = "DDB1"
Type = "float32" Type = "float32"
@@ -1106,6 +1146,14 @@ $IsttokApp = {
DataSource = "DDB1" DataSource = "DDB1"
Type = "float32" Type = "float32"
} }
ADC12IntegS = {
DataSource = "DDB1"
Type = "float32"
}
ADC13IntegS = {
DataSource = "DDB1"
Type = "float32"
}
} }
OutputSignals = { OutputSignals = {
Time = { Time = {
@@ -1160,6 +1208,14 @@ $IsttokApp = {
DataSource = "SignalsWriter" DataSource = "SignalsWriter"
Type = "float32" Type = "float32"
} }
AdcRawDecim12 = {
DataSource = "SignalsWriter"
Type = "float32"
}
AdcRawDecim13 = {
DataSource = "SignalsWriter"
Type = "float32"
}
AdcInteg0 = { AdcInteg0 = {
DataSource = "SignalsWriter" DataSource = "SignalsWriter"
Type = "float32" Type = "float32"
@@ -1208,6 +1264,14 @@ $IsttokApp = {
DataSource = "SignalsWriter" DataSource = "SignalsWriter"
Type = "float32" Type = "float32"
} }
AdcInteg12 = {
DataSource = "SignalsWriter"
Type = "float32"
}
AdcInteg13 = {
DataSource = "SignalsWriter"
Type = "float32"
}
} }
} }
} }
@@ -1223,7 +1287,7 @@ $IsttokApp = {
+Timings = { +Timings = {
Class = "TimingDataSource" Class = "TimingDataSource"
} }
+AtcaIopConfigEoWo_2 = { +AtcaIopConfigEoWo_DS = {
Class = AtcaIop::AtcaIopConfigEoWo Class = AtcaIop::AtcaIopConfigEoWo
//CPUMask = "0xC" //CPUMask = "0xC"
DeviceName = "/dev/atca_v6" DeviceName = "/dev/atca_v6"
@@ -1237,7 +1301,7 @@ $IsttokApp = {
} }
} }
} }
+AtcaIop_0_DAC = { +AtcaIopDac_DS = {
Class = "AtcaIop::AtcaIopDAC" Class = "AtcaIop::AtcaIopDAC"
//CPUMask = "0xC" //CPUMask = "0xC"
DeviceName = "/dev/atca_v6" DeviceName = "/dev/atca_v6"
@@ -1255,7 +1319,7 @@ $IsttokApp = {
} }
} }
} }
+AtcaIop_0_ADC = { +AtcaIopAdc_DS = {
Class = "AtcaIop::AtcaIopADC" Class = "AtcaIop::AtcaIopADC"
CPUMask = "0xC" CPUMask = "0xC"
DeviceName = "/dev/atca_v6" DeviceName = "/dev/atca_v6"
@@ -1503,6 +1567,24 @@ $IsttokApp = {
SamplePhase = "0" SamplePhase = "0"
AutomaticSegmentation = "0" AutomaticSegmentation = "0"
} }
AdcRawDecim12 = {
NodeName = "ATCAIOP1.ADC12RAW"
Period = "100e-6"
MakeSegmentAfterNWrites = "200"
DecimatedNodeName = "ATCAIOP1.ADC12RAWD"
MinMaxResampleFactor = "100"
SamplePhase = "0"
AutomaticSegmentation = "0"
}
AdcRawDecim13 = {
NodeName = "ATCAIOP1.ADC13RAW"
Period = "100e-6"
MakeSegmentAfterNWrites = "200"
DecimatedNodeName = "ATCAIOP1.ADC13RAWD"
MinMaxResampleFactor = "100"
SamplePhase = "0"
AutomaticSegmentation = "0"
}
AdcInteg0 = { AdcInteg0 = {
NodeName = "ATCAIOP1.ADC0INT" NodeName = "ATCAIOP1.ADC0INT"
Period = "100e-6" Period = "100e-6"
@@ -1611,6 +1693,24 @@ $IsttokApp = {
SamplePhase = "0" SamplePhase = "0"
AutomaticSegmentation = "0" AutomaticSegmentation = "0"
} }
AdcInteg12 = {
NodeName = "ATCAIOP1.ADC12INT"
Period = "100e-6"
MakeSegmentAfterNWrites = "200"
DecimatedNodeName = "ATCAIOP1.ADC12INTD"
MinMaxResampleFactor = "100"
SamplePhase = "0"
AutomaticSegmentation = "0"
}
AdcInteg13 = {
NodeName = "ATCAIOP1.ADC13INT"
Period = "100e-6"
MakeSegmentAfterNWrites = "200"
DecimatedNodeName = "ATCAIOP1.ADC13INTD"
MinMaxResampleFactor = "100"
SamplePhase = "0"
AutomaticSegmentation = "0"
}
} }
} }
+EPICSCAOutput = { +EPICSCAOutput = {