From b82c46921eaaa787a3a6225cae058d56f49c0032 Mon Sep 17 00:00:00 2001 From: Arash Aletayeb Date: Tue, 13 Feb 2024 12:20:36 +0330 Subject: [PATCH] back to develop-ui --- developHw.pro.user | 2 +- .../TrxBoardUtils/PreProcessorDef.h | 2 +- .../hardware/core/lowLevelApi/TrxBoard.cpp | 32 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/developHw.pro.user b/developHw.pro.user index 8996766..dc357e3 100644 --- a/developHw.pro.user +++ b/developHw.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/include/model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h b/include/model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h index 2063672..ed2d061 100644 --- a/include/model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h +++ b/include/model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h @@ -2,6 +2,6 @@ #define PREPROCESSORDEF_H #define MPS_BOARD -//#define DEVELOP_UI +#define DEVELOP_UI #endif //PREPROCESSORDEF_H diff --git a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp index c007061..c53dc47 100644 --- a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp +++ b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp @@ -401,24 +401,24 @@ void TrxBoard::systemLutCompletion() systemRoms.mps.firstMbedCodeVersion = 1; systemRoms.trx.secondMbedCodeVersion = 1; systemRoms.mps.secondMbedCodeVersion = 1; - systemRoms.fpgaCodeVersion.masterCode = 2312111600; - systemRoms.fpgaCodeVersion.slave0Code = 2312111647; - systemRoms.fpgaCodeVersion.slave1Code = 2312111647; - systemRoms.fpgaCodeVersion.slave2Code = 2312111647; + systemRoms.fpgaCodeVersion.masterCode = 2312111808; + systemRoms.fpgaCodeVersion.slave0Code = 2312111657; + systemRoms.fpgaCodeVersion.slave1Code = 2312111657; + systemRoms.fpgaCodeVersion.slave2Code = 2312111657; _systemLut.append(systemStructure2List(systemRoms)); - systemRoms.trx.pcbVersion = 2; - systemRoms.prbCtrl.pcbVersion = 2; - systemRoms.mps.pcbVersion = 2; - systemRoms.trx.firstMbedCodeVersion = 1; - systemRoms.mps.firstMbedCodeVersion = 1; - systemRoms.trx.secondMbedCodeVersion = 2; - systemRoms.mps.secondMbedCodeVersion = 1; - systemRoms.fpgaCodeVersion.masterCode = 2312111600; - systemRoms.fpgaCodeVersion.slave0Code = 2312111647; - systemRoms.fpgaCodeVersion.slave1Code = 2312111647; - systemRoms.fpgaCodeVersion.slave2Code = 2312111647; - _systemLut.append(systemStructure2List(systemRoms)); +// systemRoms.trx.pcbVersion = 2; +// systemRoms.prbCtrl.pcbVersion = 2; +// systemRoms.mps.pcbVersion = 2; +// systemRoms.trx.firstMbedCodeVersion = 1; +// systemRoms.mps.firstMbedCodeVersion = 1; +// systemRoms.trx.secondMbedCodeVersion = 2; +// systemRoms.mps.secondMbedCodeVersion = 1; +// systemRoms.fpgaCodeVersion.masterCode = 2312111600; +// systemRoms.fpgaCodeVersion.slave0Code = 2312111647; +// systemRoms.fpgaCodeVersion.slave1Code = 2312111647; +// systemRoms.fpgaCodeVersion.slave2Code = 2312111647; +// _systemLut.append(systemStructure2List(systemRoms)); } //QList TrxBoard::signedVector2unsignedList (QVector& sgnVec)