Browse Source

The receiver configuration LUTs are changed

develop
Arash Aletayeb 3 years ago
parent
commit
ad7595e4d3
  1. 2
      developHw.pro.user
  2. 10
      hdf5Scenario/hdf5Scenario.cpp
  3. 9
      include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ReceiverConfigurationLut.h
  4. 1
      include/model/scenarioGenerator/core/scenario/type/misc/ReceiverConfig.h
  5. 3
      src/model/hardware/core/lowLevelApi/TrxBoard.cpp

2
developHw.pro.user

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.10.0, 2022-03-08T17:17:29. --> <!-- Written by QtCreator 4.10.0, 2022-03-12T12:49:10. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

10
hdf5Scenario/hdf5Scenario.cpp

@ -574,6 +574,15 @@ void Hdf5::scenarioRead(ScenGenHardwareOutput_t &scenParams)
logEn.push_back(static_cast<quint32>(floatArray[j])); logEn.push_back(static_cast<quint32>(floatArray[j]));
} }
/**************** /registerParameters/receiverConfigProperties/dTgcEn ********************/
datasetBranch <float_t>("/registerParameters/receiverConfigProperties/dTgcEn", floatArray);
QList<quint32> dTgcEn;
for (quint32 j = 0; j < scenParams.hwRegister.receiverConfigTypeNumber; j++)
{
dTgcEn.push_back(static_cast<quint32>(floatArray[j]));
}
/**************** /registerParameters/receiverConfigProperties/ddcEn ********************/ /**************** /registerParameters/receiverConfigProperties/ddcEn ********************/
datasetBranch <float_t>("/registerParameters/receiverConfigProperties/ddcEn", floatArray); datasetBranch <float_t>("/registerParameters/receiverConfigProperties/ddcEn", floatArray);
QList<quint32> ddcEn; QList<quint32> ddcEn;
@ -613,6 +622,7 @@ void Hdf5::scenarioRead(ScenGenHardwareOutput_t &scenParams)
receiverCfgObj.logEn = logEn.at(j); receiverCfgObj.logEn = logEn.at(j);
receiverCfgObj.stbEn = stbEn.at(j); receiverCfgObj.stbEn = stbEn.at(j);
receiverCfgObj.lpfSel = lpfSel.at(j); receiverCfgObj.lpfSel = lpfSel.at(j);
receiverCfgObj.dTgcEn = dTgcEn.at(j);
receiverCfgObj.aTgcSel = aTgcSel.at(j); receiverCfgObj.aTgcSel = aTgcSel.at(j);
receiverCfgObj.focusNo = focusNo.at(j); receiverCfgObj.focusNo = focusNo.at(j);
receiverCfgObj.lineMode = lineMode.at(j); receiverCfgObj.lineMode = lineMode.at(j);

9
include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ReceiverConfigurationLut.h

@ -22,6 +22,7 @@
#define FRAME_TYPE_PRP_MASK 0x0F000000 #define FRAME_TYPE_PRP_MASK 0x0F000000
#define IQ_DATA_CROSS_EN_PRP_MASK 0x10000000 #define IQ_DATA_CROSS_EN_PRP_MASK 0x10000000
#define LOG_EN_PRP_MASK 0x20000000 #define LOG_EN_PRP_MASK 0x20000000
#define DTGC_EN_PRP_MASK 0x40000000
#define BAR 0U #define BAR 0U
#define OFFSET 0X80000 #define OFFSET 0X80000
@ -45,6 +46,7 @@ struct ReceiverConfiguration
QList<quint32> frameType; QList<quint32> frameType;
QList<quint32> iqDataCrossEn; QList<quint32> iqDataCrossEn;
QList<quint32> logEn; QList<quint32> logEn;
QList<quint32> dTgcEn;
void clear() void clear()
{ {
mla.clear(); mla.clear();
@ -63,6 +65,7 @@ struct ReceiverConfiguration
frameType.clear(); frameType.clear();
iqDataCrossEn.clear(); iqDataCrossEn.clear();
logEn.clear(); logEn.clear();
dTgcEn.clear();
} }
}; };
@ -114,6 +117,9 @@ private:
//value = _configLut->logEn.at(static_cast<qint32>(index)) ? 1 : 0; //value = _configLut->logEn.at(static_cast<qint32>(index)) ? 1 : 0;
logEnPrp->setValue(_configLut->logEn.at(static_cast<qint32>(index))); logEnPrp->setValue(_configLut->logEn.at(static_cast<qint32>(index)));
//value = _configLut->dTgcEnPrp.at(static_cast<qint32>(index)) ? 1 : 0;
dTgcEnPrp->setValue(_configLut->dTgcEn.at(static_cast<qint32>(index)));
} }
public: public:
@ -133,6 +139,7 @@ public:
Field* frameTypePrp; Field* frameTypePrp;
Field* iqDataCrossEncPrp; Field* iqDataCrossEncPrp;
Field* logEnPrp; Field* logEnPrp;
Field* dTgcEnPrp;
void setReceiverConfigurationLut (ReceiverConfiguration* configLut) void setReceiverConfigurationLut (ReceiverConfiguration* configLut)
{ {
@ -157,6 +164,7 @@ public:
ADD_UNSIGNED_FIELD(frameTypePrp, FRAME_TYPE_PRP_MASK); ADD_UNSIGNED_FIELD(frameTypePrp, FRAME_TYPE_PRP_MASK);
ADD_UNSIGNED_FIELD(iqDataCrossEncPrp, IQ_DATA_CROSS_EN_PRP_MASK); ADD_UNSIGNED_FIELD(iqDataCrossEncPrp, IQ_DATA_CROSS_EN_PRP_MASK);
ADD_UNSIGNED_FIELD(logEnPrp, LOG_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 FRAME_TYPE_PRP_MASK
#undef IQ_DATA_CROSS_EN_PRP_MASK #undef IQ_DATA_CROSS_EN_PRP_MASK
#undef LOG_EN_PRP_MASK #undef LOG_EN_PRP_MASK
#undef DTGC_EN_PRP_MASK
#undef BAR #undef BAR
#undef OFFSET #undef OFFSET

1
include/model/scenarioGenerator/core/scenario/type/misc/ReceiverConfig.h

@ -20,6 +20,7 @@ struct ReceiverConfig_t {
quint32 frameType; quint32 frameType;
quint32 iqDataCrossEn; quint32 iqDataCrossEn;
quint32 logEn; quint32 logEn;
quint32 dTgcEn;
}; };
#endif //RECEIVERCONFIG_H #endif //RECEIVERCONFIG_H

3
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->logEn.append(k.logEn);
_scenParams->hwRegister->configLut->stbEn.append(k.stbEn); _scenParams->hwRegister->configLut->stbEn.append(k.stbEn);
_scenParams->hwRegister->configLut->lpfSel.append(k.lpfSel); _scenParams->hwRegister->configLut->lpfSel.append(k.lpfSel);
_scenParams->hwRegister->configLut->dTgcEn.append(k.dTgcEn);
_scenParams->hwRegister->configLut->aTgcSel.append(k.aTgcSel); _scenParams->hwRegister->configLut->aTgcSel.append(k.aTgcSel);
_scenParams->hwRegister->configLut->focusNo.append(k.focusNo); _scenParams->hwRegister->configLut->focusNo.append(k.focusNo);
_scenParams->hwRegister->configLut->lineMode.append(k.lineMode); _scenParams->hwRegister->configLut->lineMode.append(k.lineMode);
_scenParams->hwRegister->configLut->frameType.append(k.frameType); _scenParams->hwRegister->configLut->frameType.append(k.frameType);
_scenParams->hwRegister->configLut->iqDataCrossEn.append(k.iqDataCrossEn);
_scenParams->hwRegister->configLut->ncoFreqSel.append(k.ncoFreqSel); _scenParams->hwRegister->configLut->ncoFreqSel.append(k.ncoFreqSel);
_scenParams->hwRegister->configLut->dcCancelerEn.append(k.dcCancelEn); _scenParams->hwRegister->configLut->dcCancelerEn.append(k.dcCancelEn);
_scenParams->hwRegister->configLut->iqDataCrossEn.append(k.iqDataCrossEn);
_scenParams->hwRegister->configLut->noiseRejectionEn.append(k.noiseRejectEn); _scenParams->hwRegister->configLut->noiseRejectionEn.append(k.noiseRejectEn);
_scenParams->hwRegister->configLut->subtractFilterEn.append(k.subtractFilterEn); _scenParams->hwRegister->configLut->subtractFilterEn.append(k.subtractFilterEn);
} }

Loading…
Cancel
Save