diff --git a/developHw.pro.user b/developHw.pro.user index 24a6304..d015d0a 100644 --- a/developHw.pro.user +++ b/developHw.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/hdf5Scenario/hdf5Scenario.cpp b/hdf5Scenario/hdf5Scenario.cpp index ff375da..935f2ed 100644 --- a/hdf5Scenario/hdf5Scenario.cpp +++ b/hdf5Scenario/hdf5Scenario.cpp @@ -574,6 +574,15 @@ void Hdf5::scenarioRead(ScenGenHardwareOutput_t &scenParams) logEn.push_back(static_cast(floatArray[j])); } + /**************** /registerParameters/receiverConfigProperties/dTgcEn ********************/ + datasetBranch ("/registerParameters/receiverConfigProperties/dTgcEn", floatArray); + QList dTgcEn; + + for (quint32 j = 0; j < scenParams.hwRegister.receiverConfigTypeNumber; j++) + { + dTgcEn.push_back(static_cast(floatArray[j])); + } + /**************** /registerParameters/receiverConfigProperties/ddcEn ********************/ datasetBranch ("/registerParameters/receiverConfigProperties/ddcEn", floatArray); QList ddcEn; @@ -613,6 +622,7 @@ void Hdf5::scenarioRead(ScenGenHardwareOutput_t &scenParams) receiverCfgObj.logEn = logEn.at(j); receiverCfgObj.stbEn = stbEn.at(j); receiverCfgObj.lpfSel = lpfSel.at(j); + receiverCfgObj.dTgcEn = dTgcEn.at(j); receiverCfgObj.aTgcSel = aTgcSel.at(j); receiverCfgObj.focusNo = focusNo.at(j); receiverCfgObj.lineMode = lineMode.at(j); diff --git a/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ReceiverConfigurationLut.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ReceiverConfigurationLut.h index 966d24e..fe1f698 100644 --- a/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ReceiverConfigurationLut.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ReceiverConfigurationLut.h @@ -22,6 +22,7 @@ #define FRAME_TYPE_PRP_MASK 0x0F000000 #define IQ_DATA_CROSS_EN_PRP_MASK 0x10000000 #define LOG_EN_PRP_MASK 0x20000000 +#define DTGC_EN_PRP_MASK 0x40000000 #define BAR 0U #define OFFSET 0X80000 @@ -45,6 +46,7 @@ struct ReceiverConfiguration QList frameType; QList iqDataCrossEn; QList logEn; + QList dTgcEn; void clear() { mla.clear(); @@ -63,6 +65,7 @@ struct ReceiverConfiguration frameType.clear(); iqDataCrossEn.clear(); logEn.clear(); + dTgcEn.clear(); } }; @@ -114,6 +117,9 @@ private: //value = _configLut->logEn.at(static_cast(index)) ? 1 : 0; logEnPrp->setValue(_configLut->logEn.at(static_cast(index))); + + //value = _configLut->dTgcEnPrp.at(static_cast(index)) ? 1 : 0; + dTgcEnPrp->setValue(_configLut->dTgcEn.at(static_cast(index))); } public: @@ -133,6 +139,7 @@ public: Field* frameTypePrp; Field* iqDataCrossEncPrp; Field* logEnPrp; + Field* dTgcEnPrp; void setReceiverConfigurationLut (ReceiverConfiguration* configLut) { @@ -157,6 +164,7 @@ public: ADD_UNSIGNED_FIELD(frameTypePrp, FRAME_TYPE_PRP_MASK); ADD_UNSIGNED_FIELD(iqDataCrossEncPrp, IQ_DATA_CROSS_EN_PRP_MASK); ADD_UNSIGNED_FIELD(logEnPrp, LOG_EN_PRP_MASK); + ADD_UNSIGNED_FIELD(dTgcEnPrp, DTGC_EN_PRP_MASK); } }; @@ -176,6 +184,7 @@ public: #undef FRAME_TYPE_PRP_MASK #undef IQ_DATA_CROSS_EN_PRP_MASK #undef LOG_EN_PRP_MASK +#undef DTGC_EN_PRP_MASK #undef BAR #undef OFFSET diff --git a/include/model/scenarioGenerator/core/scenario/type/misc/ReceiverConfig.h b/include/model/scenarioGenerator/core/scenario/type/misc/ReceiverConfig.h index af8e967..cf9e87a 100644 --- a/include/model/scenarioGenerator/core/scenario/type/misc/ReceiverConfig.h +++ b/include/model/scenarioGenerator/core/scenario/type/misc/ReceiverConfig.h @@ -20,6 +20,7 @@ struct ReceiverConfig_t { quint32 frameType; quint32 iqDataCrossEn; quint32 logEn; + quint32 dTgcEn; }; #endif //RECEIVERCONFIG_H diff --git a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp index cd2ad0f..1d6ccf1 100644 --- a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp +++ b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp @@ -741,13 +741,14 @@ void TrxBoard::setScenario(ScenGenHardwareOutput_t& scenGenHw) _scenParams->hwRegister->configLut->logEn.append(k.logEn); _scenParams->hwRegister->configLut->stbEn.append(k.stbEn); _scenParams->hwRegister->configLut->lpfSel.append(k.lpfSel); + _scenParams->hwRegister->configLut->dTgcEn.append(k.dTgcEn); _scenParams->hwRegister->configLut->aTgcSel.append(k.aTgcSel); _scenParams->hwRegister->configLut->focusNo.append(k.focusNo); _scenParams->hwRegister->configLut->lineMode.append(k.lineMode); _scenParams->hwRegister->configLut->frameType.append(k.frameType); - _scenParams->hwRegister->configLut->iqDataCrossEn.append(k.iqDataCrossEn); _scenParams->hwRegister->configLut->ncoFreqSel.append(k.ncoFreqSel); _scenParams->hwRegister->configLut->dcCancelerEn.append(k.dcCancelEn); + _scenParams->hwRegister->configLut->iqDataCrossEn.append(k.iqDataCrossEn); _scenParams->hwRegister->configLut->noiseRejectionEn.append(k.noiseRejectEn); _scenParams->hwRegister->configLut->subtractFilterEn.append(k.subtractFilterEn); }