bernardo/MARTe2-isttok
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EoWo Datasource running

Browse Source 
Signed-off-by: Bernardo Carvalho <bernardo.carvalho@tecnico.ulisboa.pt>
This commit is contained in:
Bernardo Brotas de Carvalho
2024-04-23 14:28:19 +01:00
parent 70ae1b862c
commit 66674026f9
3 changed files with 135 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
Configurations/RTApp-AtcaIop.cfg
View File

@@ -348,51 +348,83 @@ $IsttokApp = {
DataSource = "AtcaIop_0_ADC"
Type = "int32"
}
ADC0Integral = {
ADC12Decim = {
DataSource = "AtcaIop_0_ADC"
Type = "int32"
}
ADC13Decim = {
DataSource = "AtcaIop_0_ADC"
Type = "int32"
}
ADC14Decim = {
DataSource = "AtcaIop_0_ADC"
Type = "int32"
}
ADC15Decim = {
DataSource = "AtcaIop_0_ADC"
Type = "int32"
}
ADC0Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC1Integral = {
ADC1Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC2Integral = {
ADC2Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC3Integral = {
ADC3Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC4Integral = {
ADC4Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC5Integral = {
ADC5Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC6Integral = {
ADC6Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC7Integral = {
ADC7Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC8Integral = {
ADC8Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC9Integral = {
ADC9Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC10Integral = {
ADC10Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC11Integral = {
ADC11Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC12Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC13Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC14Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
ADC15Int = {
DataSource = "AtcaIop_0_ADC"
Type = "int64"
}
@@ -464,6 +496,22 @@ $IsttokApp = {
DataSource = "DDB1"
Type = "int32"
}
ADC12DRaw = {
DataSource = "DDB1"
Type = "int32"
}
ADC13DRaw = {
DataSource = "DDB1"
Type = "int32"
}
ADC14DRaw = {
DataSource = "DDB1"
Type = "int32"
}
ADC15DRaw = {
DataSource = "DDB1"
Type = "int32"
}
ADC0Integral = {
DataSource = "DDB1"
Type = "int64"
@@ -512,6 +560,22 @@ $IsttokApp = {
DataSource = "DDB1"
Type = "int64"
}
ADC12Integral = {
DataSource = "DDB1"
Type = "int64"
}
ADC13Integral = {
DataSource = "DDB1"
Type = "int64"
}
ADC14Integral = {
DataSource = "DDB1"
Type = "int64"
}
ADC15Integral = {
DataSource = "DDB1"
Type = "int64"
}
Idle_Thread1_CycleTime = {
DataSource = "DDB1"
Type = "uint32"
@@ -1204,11 +1268,11 @@ $IsttokApp = {
ADCFrequency = "2000000"
RTDecimation = "200"
ChopperPeriod = "2000"
ElectricalOffsets = {"-151" "110" "-417" "-35" "-204" "0" "134" "-59" "-227" "-308" "-120" "-175"}
ElectricalOffsets = {"-151" "110" "-417" "-35" "-204" "0" "134" "-59" "-227" "-308" "-120" "-175" "0" "0" "0" "0"}
// "-141" "123" "-415" "-31" "-202" "8" "139" "-53" "-228" "-308" "-111" "-160"
//WiringOffsets = {"0.0" "0.0" "0.0" "0.0" "0.0" "0.0" "0.0" "0.0" "0.0" "0.0" "0.0" "0.0"}
//WiringOffsets = { }
WiringOffsets = {0.354 0.288 -0.010 -0.083 0.347 0.228 0.088 0.186 -0.297 -0.101 0.025 -0.012 }
WiringOffsets = {0.354 0.288 -0.010 -0.083 0.347 0.228 0.088 0.186 -0.297 -0.101 0.025 -0.012 0.0 0.0 0.0 0.0}
//WiringOffsets = {"0.271" "0.211" "0.098" "0.141" "0.312" "0.203" "0.212" "0.361" "-0.546" "-0.433" "-0.598" "1.362"}
Signals = {
Counter = {
@@ -1253,100 +1317,64 @@ $IsttokApp = {
ADC11Decim = {
Type = "int32"
}
ADC0Integral = {
ADC12Decim = {
Type = "int32"
}
ADC13Decim = {
Type = "int32"
}
ADC14Decim = {
Type = "int32"
}
ADC15Decim = {
Type = "int32"
}
ADC0Int = {
Type = "int64"
}
ADC1Integral = {
ADC1Int = {
Type = "int64"
}
ADC2Integral = {
ADC2Int = {
Type = "int64"
}
ADC3Integral = {
ADC3Int = {
Type = "int64"
}
ADC4Integral = {
ADC4Int = {
Type = "int64"
}
ADC5Integral = {
ADC5Int = {
Type = "int64"
}
ADC6Integral = {
Type = "int64"
+AtcaGAMEoWoOutput = {
Class = "IOGAM"
InputSignals = {
EoArr = {
DataSource = "DDB1"
NumberOfDimensions = "1"
NumberOfElements = "16"
Type = "int32"
+AtcaGAMEoWoOutput = {
Class = "IOGAM"
InputSignals = {
EoArr = {
DataSource = "DDB1"
NumberOfDimensions = "1"
NumberOfElements = "16"
Type = "int32"
}
WoArr = {
DataSource = "DDB1"
NumberOfDimensions = "1"
NumberOfElements = "16"
Type = "float32"
}
}
OutputSignals = {
EO = {
DataSource = AtcaIopConfigEoWo_2
Type = int32
NumberOfElements = "16"
Trigger = 1
}
WO = {
DataSource = AtcaIopConfigEoWo_2
NumberOfElements = "16"
Type = float32
}
}
}
}
WoArr = {
DataSource = "DDB1"
NumberOfDimensions = "1"
NumberOfElements = "16"
Type = "float32"
}
}
OutputSignals = {
EO = {
DataSource = AtcaIopConfigEoWo_2
Type = int32
NumberOfElements = "16"
Trigger = 1
}
WO = {
DataSource = AtcaIopConfigEoWo_2
NumberOfElements = "16"
Type = float32
}
}
}
}
ADC7Integral = {
ADC6Int = {
Type = "int64"
}
ADC8Integral = {
ADC7Int = {
Type = "int64"
}
ADC9Integral = {
ADC8Int = {
Type = "int64"
}
ADC10Integral = {
ADC9Int = {
Type = "int64"
}
ADC11Integral = {
ADC10Int = {
Type = "int64"
}
ADC11Int = {
Type = "int64"
}
ADC12Int = {
Type = "int64"
}
ADC13Int = {
Type = "int64"
}
ADC14Int = {
Type = "int64"
}
ADC15Int = {
Type = "int64"
}
}
@@ -1666,7 +1694,7 @@ $IsttokApp = {
+Thread1 = {
Class = "RealTimeThread"
CPUs = "0x4"
Functions = {"AtcaGAMInput" "DacConstants" "AtcaGAMOutput" "GAMConvert2Volt" "GAMConvert2Float" "GAMHistogramCycleTimes" "GAMCAOutput" "GAMSignalsWriter"}
Functions = {"AtcaGAMInput" "DacConstants" "AtcaGAMOutput" "AtcaGAMEoWoOutput" "GAMConvert2Volt" "GAMConvert2Float" "GAMHistogramCycleTimes" "GAMCAOutput" "GAMCAInput" "GAMSignalsWriter"}
}
}
}

4
DataSources/AtcaIop/AtcaIopADC.h
View File

@@ -53,8 +53,8 @@ namespace MARTe {
const uint32 ATCA_IOP_MAX_CHANNELS = 32u;
const uint32 ATCA_IOP_N_TIMCNT = 2u;
const uint32 ATCA_IOP_N_ADCs = 12u;
const uint32 ATCA_IOP_N_INTEGRALS = ATCA_IOP_N_ADCs ; //12u;
const uint32 ATCA_IOP_N_ADCs = 16u;
const uint32 ATCA_IOP_N_INTEGRALS = ATCA_IOP_N_ADCs;
//const uint32 ADC_SIMULATOR_N_ADCs = 2u;
const uint32 ATCA_IOP_N_SIGNALS = (ATCA_IOP_N_TIMCNT + ATCA_IOP_N_ADCs +
ATCA_IOP_N_INTEGRALS);

16
Startup/CreateIsttokMDSplusTree.tcl
View File

@@ -35,6 +35,14 @@ add node ADC10RAW/usage=signal
add node ADC10RAWD/usage=signal
add node ADC11RAW/usage=signal
add node ADC11RAWD/usage=signal
add node ADC12RAW/usage=signal
add node ADC12RAWD/usage=signal
add node ADC13RAW/usage=signal
add node ADC13RAWD/usage=signal
add node ADC14RAW/usage=signal
add node ADC14RAWD/usage=signal
add node ADC15RAW/usage=signal
add node ADC15RAWD/usage=signal
add node ADC0INT/usage=signal
add node ADC0INTD/usage=signal
@@ -60,6 +68,14 @@ add node ADC10INT/usage=signal
add node ADC10INTD/usage=signal
add node ADC11INT/usage=signal
add node ADC11INTD/usage=signal
add node ADC12INT/usage=signal
add node ADC12INTD/usage=signal
add node ADC13INT/usage=signal
add node ADC13INTD/usage=signal
add node ADC14INT/usage=signal
add node ADC14INTD/usage=signal
add node ADC15INT/usage=signal
add node ADC15INTD/usage=signal
set def \RTAPPISTTOK::TOP.INP
add node MEAS0D/usage=signal