Blocking while neglected in scenarioPlayerStop API.

FPGA version code neglected in compatibility check API.

developHw.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2024-12-31T12:13:54. -->
+<!-- Written by QtCreator 4.10.0, 2025-01-13T18:36:18. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -100,7 +100,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>

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

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

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);
 

src/model/hardware/core/lowLevelApi/TrxBoard.cpp

@@ -360,10 +360,10 @@ QList<quint32> 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<systemE2proms> &systemLut)
     currentSystemRoms.prbCtrl = prbCtrlE2prom;
     currentSystemRoms.mps = mpsE2prom;
 
-    getFpgasCodeVersion(&currentSystemRoms.fpgaCodeVersion);
+//    getFpgasCodeVersion(&currentSystemRoms.fpgaCodeVersion);
 
     QList<quint32> currentSystem = systemStructure2List(currentSystemRoms);