diff --git a/Configurations/RTApp-AtcaIop.cfg b/Configurations/RTApp-AtcaIop.cfg index a5f3c10..e2fe0a4 100644 --- a/Configurations/RTApp-AtcaIop.cfg +++ b/Configurations/RTApp-AtcaIop.cfg @@ -809,10 +809,13 @@ $IsttokApp = { DataSource = "SignalsWriter" Type = "float32" } - AdcRawDecimOther = { - DataSource = "DDB1" + AdcRawDecim14 = { + DataSource = "SignalsWriter" + Type = "float32" + } + AdcRawDecim15 = { + DataSource = "SignalsWriter" Type = "float32" - NumberOfElements = 2 } AdcInteg0 = { DataSource = "SignalsWriter" @@ -870,10 +873,13 @@ $IsttokApp = { DataSource = "SignalsWriter" Type = "float32" } - AdcIntegOther = { - DataSource = "DDB1" + AdcInteg14 = { + DataSource = "SignalsWriter" + Type = "float32" + } + AdcInteg15 = { + DataSource = "SignalsWriter" Type = "float32" - NumberOfElements = 2 } } } @@ -1105,33 +1111,29 @@ $IsttokApp = { SamplePhase = "0" AutomaticSegmentation = "0" } - /* - AdcRawDecim12 = { - NodeName = "ATCAIOP1.ADC12RAW" + AdcRawDecim14 = { + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_14.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_14.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC12RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } - AdcRawDecim13 = { - NodeName = "ATCAIOP1.ADC13RAW" + AdcRawDecim15 = { + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_15.ADC_DECIM" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_15.ADC_DECIM_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC13RAWD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } - */ AdcInteg0 = { - //NodeName = "ATCAIOP1.ADC0INT" NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG" // node of the tree node Period = "100e-6" MakeSegmentAfterNWrites = "200" DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_0.ADC_INTEG_D" // node of the tree node - //DecimatedNodeName = "ATCAIOP1.ADC0INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" @@ -1253,26 +1255,24 @@ $IsttokApp = { SamplePhase = "0" AutomaticSegmentation = "0" } - /* - AdcInteg12 = { - NodeName = "ATCAIOP1.ADC12INT" + AdcInteg14 = { + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_14.ADC_INTEG" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_14.ADC_INTEG_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC12INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } - AdcInteg13 = { - NodeName = "ATCAIOP1.ADC13INT" + AdcInteg15 = { + NodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_15.ADC_INTEG" + DecimatedNodeName = "\TOP.HARDWARE.ATCA_2.IOP_9.CHANNEL_15.ADC_INTEG_D" Period = "100e-6" MakeSegmentAfterNWrites = "200" - DecimatedNodeName = "ATCAIOP1.ADC13INTD" MinMaxResampleFactor = "100" SamplePhase = "0" AutomaticSegmentation = "0" } - */ } } +EPICSCAOutput = { diff --git a/DataSources/AtcaIop/AtcaIopADC.cpp b/DataSources/AtcaIop/AtcaIopADC.cpp index ca3100f..fe70b2a 100644 --- a/DataSources/AtcaIop/AtcaIopADC.cpp +++ b/DataSources/AtcaIop/AtcaIopADC.cpp @@ -666,20 +666,16 @@ ErrorManagement::ErrorType AtcaIopADC::Execute(ExecutionInfo& info) { //Sleep until the next period. Cannot be < 0 due to while(lastTimeTicks < startTicks) above uint64 sleepTicksCorrection = (startTicks - lastTimeTicks); - //uint64 deltaTicks = sleepTimeTicks - (startTicks - lastTimeTicks); uint64 deltaTicks = sleepTimeTicks - sleepTicksCorrection; timeoutMax = deltaTicks; // debug - //volatile int32 currentDMA = 0u; oldestBufferIdx = GetOldestBufferIdx(); float32 totalSleepTime = static_cast(static_cast(deltaTicks) * HighResolutionTimer::Period()); if (sleepNature == Busy) { if (sleepPercentage > 0u) { - //float32 sleepTime = totalSleepTime * 0.5; float32 sleepTime = totalSleepTime * (static_cast(sleepPercentage) / 100.F); Sleep::NoMore(sleepTime); - //if(PollDmaBuff(startTicks + deltaTicks + 100000u) < 0) } if(PollDmaBuff(deltaTicks + POLL_EXTRA_WAIT) < 0){ //pollTimout++; // TODO check max wait @@ -702,20 +698,16 @@ ErrorManagement::ErrorType AtcaIopADC::Execute(ExecutionInfo& info) { ErrorManagement::ErrorType err = synchSem.Post(); counterAndTimer[0] += nCycles; - //counterAndTimer[1] = mappedDmaBase[oldestBufferIdx * RT_PCKT_SIZE] * timerPeriodUsecTime; counterAndTimer[1] = pdma[oldestBufferIdx].head_time_cnt * timerPeriodUsecTime; // Get adc data from DMA packet uint32 k; uint32 s; for (k=0u; k < ATCA_IOP_N_ADCs ; k++) { - //adcValues[k] = (mappedDmaBase[oldestBufferIdx * RT_PCKT_SIZE + - // IOP_ADC_OFFSET + k] ) / (1<<14); - adcValues[k] = pdma[oldestBufferIdx].adc_decim_data[k] / (1<<14); + //adcValues[k] = pdma[oldestBufferIdx].adc_decim_data[k] / (1<<14); + adcValues[k] = pdma[oldestBufferIdx].adc_decim_data[k]; } - //int64 * mappedDmaBase64 = (int64 *) mappedDmaBase; for (k=0u; k < ATCA_IOP_N_INTEGRALS ; k++) { adcIntegralValues[k] = pdma[oldestBufferIdx].adc_integ_data[k]; - //mappedDmaBase64[oldestBufferIdx * RT_PCKT64_SIZE + IOP_ADC_INTEG_OFFSET + k]; } float64 t = counterAndTimer[1]; diff --git a/DataSources/AtcaIop/AtcaIopADC.h b/DataSources/AtcaIop/AtcaIopADC.h index 9c78775..062df6a 100644 --- a/DataSources/AtcaIop/AtcaIopADC.h +++ b/DataSources/AtcaIop/AtcaIopADC.h @@ -68,88 +68,57 @@ namespace MARTe { * 
      * +AtcaIopADC = {
      *    Class = "AtcaIop::AtcaIopADC"
-      CPUMask = "0x040"
-      StackSize = "1048576"
-      DeviceName = "/dev/atca_v6"
-      BoardId = 9
-      DeviceDmaName = "/dev/atca_v6_dmart_2"
-      NumberOfChannels = "12"
-      IsMaster = "1"
-      SleepNature = "Busy"
-      SleepPercentage = "15"
-      ADCFrequency = "2000000"
-      RTDecimation = "200"
-      ChopperPeriod = "2000"
-      ElectricalOffsets = {"-151" "110" "-417" "-35" "-204" "0" "134" "-59" "-227" "-308" "-120" "-175" "0" "0" "0" "0"}
-      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" "0.0" "0.0" "0.0" "0.0"}
-      //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 = {
-          Type = "uint32"
-        }
-        Time = {
-          Type = "uint32"
-        }
-        TimeoutCount = {
-          Type = "uint32"
-        }
-        TimeoutMax = {
-          Type = "uint32"
-        }
-        ADC0Decim = {
-          Type = "int32"
-        }
-        ADC1Decim = {
-          Type = "int32"
-        }
-
-     *     Class = ADCSimulator
-     *     DeviceName = "/dev/atca_v6" //Mandatory
-     *     BoardId = 0          //   Mandatory
-     *     ChopperPeriod = 2000
-     *     ElectricalOffsets = {1, 10, 20, -30, 1, 1, -10, 10}
-     *     WiringOffsets = {1, 10, 20, -30, 1, 1, -10, 10}
-     *     ADCFrequency = 2000000
-     *     Signals = {
-     *         Counter = {
-     *             Type = uint32
-     *         }
-     *         Time = {
-     *             Type = uint32
-     *             Frequency = 1000
-     *         }
-     *         TimeoutCount = {
-     *             Type = uint32 
-     *         }
-     *         TimeoutMax = {
-     *             Type = uint32
-     *         }
-     *         ADC0 = {
-     *             Type = uint32
-     *         }
-     *         ADC1 = {
-     *             Type = uint32
-     *         }
-     *         ADC2 = {
-     *             Type = uint32
-     *         }
-     *         ADC3 = {
-     *             Type = uint32
-     *         }
-     *         ADC0Decim = {
-     *             Type = uint32
-     *         }
-     *         ADC1Decim = {
-     *             Type = uint32
-     *         }
-     *         ADC2Decim = {
-     *             Type = uint32
-     *         }
-     *         ...
-     *         ADC7Decim = {
-     *             Type = uint32
-     *         }
+     * CPUMask = "0x040"
+     * StackSize = "1048576"
+     * DeviceName = "/dev/atca_v6"
+     * BoardId = 9
+     * DeviceDmaName = "/dev/atca_v6_dmart_2"
+     * NumberOfChannels = "12"
+     * IsMaster = "1"
+     * SleepNature = "Busy"
+     * SleepPercentage = "15"
+     * ADCFrequency = "2000000"
+     * RTDecimation = "200"
+     * ChopperPeriod = "2000"
+     * ElectricalOffsets = {"-151" "110" "-417" "-35" "-204" "0" "134" "-59" "-227" "-308" "-120" "-175" "0" "0" "0" "0"}
+     * 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" "0.0" "0.0" "0.0" "0.0"}
+     * //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 = {
+     *     Type = "uint32"
+     *   }
+     *   Time = {
+     *     Type = "uint32"
+     *   }
+     *   TimeoutCount = {
+     *     Type = "uint32"
+     *   }
+     *   TimeoutMax = {
+     *     Type = "uint32"
+     *   }
+     *   ADCDecim = {
+     *     DataSource = "AtcaIopAdc_DS"
+     *     Type = "int32"
+     *     NumberOfElements = 16
+     *     NumberOfDimensions = 1
+     *   }
+     *   ADCInt = {
+     *     DataSource = "AtcaIopAdc_DS"
+     *     Type = "int64"
+     *     NumberOfElements = 16
+     *     NumberOfDimensions = 1
+     *   }
+     *   Idle_Thread1_CycleTime = {
+     *     DataSource = "Timings"
+     *     Alias = "Idle.Thread1_CycleTime"
+     *     Type = "uint32"
+     *   }
+     *   Run_Thread1_CycleTime = {
+     *     DataSource = "Timings"
+     *     Alias = "Online.Thread1_CycleTime"
+     *     Type = "uint32"
+     *   }
      *     }
      * }
      *