diff --git a/developHw.pro.user b/developHw.pro.user index a8dfec6..957e20d 100644 --- a/developHw.pro.user +++ b/developHw.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -100,7 +100,7 @@ QtProjectManager.QMakeBuildStep true - true + false false false diff --git a/include/model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h b/include/model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h index ed2d061..2063672 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/include/model/hardware/core/lowLevelApi/TrxBoardUtils/e2promFormat.h b/include/model/hardware/core/lowLevelApi/TrxBoardUtils/e2promFormat.h index db3d8ed..997f3d7 100644 --- a/include/model/hardware/core/lowLevelApi/TrxBoardUtils/e2promFormat.h +++ b/include/model/hardware/core/lowLevelApi/TrxBoardUtils/e2promFormat.h @@ -59,7 +59,7 @@ struct systemE2proms EepromStatus trx; EepromStatus prbCtrl; EepromStatus mps; - FpgaCodeVersion fpgaCodeVersion; +// FpgaCodeVersion fpgaCodeVersion; }; #endif // E2PROMFORMAT_H diff --git a/mainwindow.cpp b/mainwindow.cpp index 544f1e5..b2195f2 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -4274,10 +4274,10 @@ void MainWindow::on_chk_sysCompatibilityCheck_clicked(bool checked) sysRoms.mps.firstMbedCodeVersion = 240001; sysRoms.trx.secondMbedCodeVersion = 230001; sysRoms.mps.secondMbedCodeVersion = 240001; - sysRoms.fpgaCodeVersion.masterCode = 2312111600; - sysRoms.fpgaCodeVersion.slave0Code = 2312111647; - sysRoms.fpgaCodeVersion.slave1Code = 2312111647; - sysRoms.fpgaCodeVersion.slave2Code = 2312111647; +// sysRoms.fpgaCodeVersion.masterCode = 2312111600; +// sysRoms.fpgaCodeVersion.slave0Code = 2312111647; +// sysRoms.fpgaCodeVersion.slave1Code = 2312111647; +// sysRoms.fpgaCodeVersion.slave2Code = 2312111647; systemLut.append(sysRoms); @@ -4288,10 +4288,10 @@ void MainWindow::on_chk_sysCompatibilityCheck_clicked(bool checked) sysRoms.mps.firstMbedCodeVersion = 231203; sysRoms.trx.secondMbedCodeVersion = 240001; sysRoms.mps.secondMbedCodeVersion = 241023; - sysRoms.fpgaCodeVersion.masterCode = 2406241729; - sysRoms.fpgaCodeVersion.slave0Code = 2408031117; - sysRoms.fpgaCodeVersion.slave1Code = 2408031117; - sysRoms.fpgaCodeVersion.slave2Code = 2408031117; +// sysRoms.fpgaCodeVersion.masterCode = 2406241729; +// sysRoms.fpgaCodeVersion.slave0Code = 2408031117; +// sysRoms.fpgaCodeVersion.slave1Code = 2408031117; +// sysRoms.fpgaCodeVersion.slave2Code = 2408031117; systemLut.append(sysRoms); diff --git a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp index 4bacb91..bcd21d8 100644 --- a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp +++ b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp @@ -360,10 +360,10 @@ QList TrxBoard::systemStructure2List(systemE2proms &systemRoms) dataset.append(systemRoms.trx.secondMbedCodeVersion); dataset.append(systemRoms.mps.secondMbedCodeVersion); - dataset.append(systemRoms.fpgaCodeVersion.masterCode); - dataset.append(systemRoms.fpgaCodeVersion.slave0Code); - dataset.append(systemRoms.fpgaCodeVersion.slave1Code); - dataset.append(systemRoms.fpgaCodeVersion.slave2Code); +// dataset.append(systemRoms.fpgaCodeVersion.masterCode); +// dataset.append(systemRoms.fpgaCodeVersion.slave0Code); +// dataset.append(systemRoms.fpgaCodeVersion.slave1Code); +// dataset.append(systemRoms.fpgaCodeVersion.slave2Code); return dataset; } @@ -1753,8 +1753,10 @@ void TrxBoard::scenPlayerStop(bool freezeWithoutScenChanging) this->_device.stopDma(); + this->_scenPlayer->control.setCommand(false); + //uncrustify off - while(_device.isDmaBusy()); +// while(_device.isDmaBusy()); //uncrustify on _sonoLiveTimer->stop(); @@ -1762,8 +1764,6 @@ void TrxBoard::scenPlayerStop(bool freezeWithoutScenChanging) this->_scenPlayer->control.setHeartBeats(_sonoHeartBeats); this->setAfesHeartBeat(_sonoHeartBeats); - this->_scenPlayer->control.setCommand(false); - if(freezeWithoutScenChanging) { afesHvDacsOff(); @@ -1905,7 +1905,7 @@ void TrxBoard::checkSystemCompatibility(QList &systemLut) currentSystemRoms.prbCtrl = prbCtrlE2prom; currentSystemRoms.mps = mpsE2prom; - getFpgasCodeVersion(¤tSystemRoms.fpgaCodeVersion); +// getFpgasCodeVersion(¤tSystemRoms.fpgaCodeVersion); QList currentSystem = systemStructure2List(currentSystemRoms);