Browse Source

New probe ID added.

Arash Aletayeb 1 week ago
parent
commit
def19388b4
  1. 7
      developHw.pro.user
  2. 2
      include/model/hardware/core/lowLevelApi/TrxBoard.h
  3. 71
      mainwindow.cpp
  4. 2
      src/model/hardware/core/HardwareCore.cpp
  5. 6
      src/model/hardware/core/lowLevelApi/TrxBoard.cpp

7
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, 2025-01-27T12:10:59. --> <!-- Written by QtCreator 4.10.0, 2025-05-07T16:59:26. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
@ -283,11 +283,6 @@
<value type="QString" key="Analyzer.Perf.SampleMode">-F</value> <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value> <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
<value type="int" key="Analyzer.Perf.StackSize">4096</value> <value type="int" key="Analyzer.Perf.StackSize">4096</value>
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
<value type="uint" key="Analyzer.QmlProfiler.FlushInterval">0</value>
<value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>

2
include/model/hardware/core/lowLevelApi/TrxBoard.h

@ -225,7 +225,7 @@ public:
~TrxBoard(); ~TrxBoard();
///////////////////////////////// Initialize API ////////////////////////////// ///////////////////////////////// Initialize API //////////////////////////////
void init(void); void init(bool reset);
////////////////////////////////// Scenario API /////////////////////////////// ////////////////////////////////// Scenario API ///////////////////////////////
void setProbeDependParams(ScenPrbDepHardwareParam& prbDepParams); void setProbeDependParams(ScenPrbDepHardwareParam& prbDepParams);

71
mainwindow.cpp

@ -221,7 +221,7 @@ MainWindow::MainWindow(QWidget* parent)
try try
{ {
_trx.init(); _trx.init(true);
if(_trx.isScenarioStart()) if(_trx.isScenarioStart())
{ {
@ -731,6 +731,11 @@ void MainWindow::getPrbChange()
const quint32 idC1_5_D = 0x225; const quint32 idC1_5_D = 0x225;
const quint32 idC_360 = 0xEE00; const quint32 idC_360 = 0xEE00;
const quint32 id_IC5_9_D = 0x210;
const quint32 id_L9_2_H = 0x4C00;
const quint32 id_C5_2_H = 0x4301;
const quint32 id_E9_4_H = 0x4502;
try try
{ {
_trx.prbState(_prb); _trx.prbState(_prb);
@ -759,6 +764,22 @@ void MainWindow::getPrbChange()
ui->table_probe->setItem(0, 0, new QTableWidgetItem("C-360")); ui->table_probe->setItem(0, 0, new QTableWidgetItem("C-360"));
break; break;
case id_IC5_9_D:
ui->table_probe->setItem(0, 0, new QTableWidgetItem("IC5-9-D"));
break;
case id_L9_2_H:
ui->table_probe->setItem(0, 0, new QTableWidgetItem("L9-2-H"));
break;
case id_C5_2_H:
ui->table_probe->setItem(0, 0, new QTableWidgetItem("C5-2-H"));
break;
case id_E9_4_H:
ui->table_probe->setItem(0, 0, new QTableWidgetItem("E9-4-H"));
break;
default: default:
ui->table_probe->setItem(0, 0, new QTableWidgetItem("Unknown")); ui->table_probe->setItem(0, 0, new QTableWidgetItem("Unknown"));
} }
@ -801,6 +822,22 @@ void MainWindow::getPrbChange()
ui->table_probe->setItem(0, 1, new QTableWidgetItem("C-360")); ui->table_probe->setItem(0, 1, new QTableWidgetItem("C-360"));
break; break;
case id_IC5_9_D:
ui->table_probe->setItem(0, 1, new QTableWidgetItem("IC5-9-D"));
break;
case id_L9_2_H:
ui->table_probe->setItem(0, 1, new QTableWidgetItem("L9-2-H"));
break;
case id_C5_2_H:
ui->table_probe->setItem(0, 1, new QTableWidgetItem("C5-2-H"));
break;
case id_E9_4_H:
ui->table_probe->setItem(0, 1, new QTableWidgetItem("E9-4-H"));
break;
default: default:
ui->table_probe->setItem(0, 1, new QTableWidgetItem("Unknown")); ui->table_probe->setItem(0, 1, new QTableWidgetItem("Unknown"));
} }
@ -843,6 +880,22 @@ void MainWindow::getPrbChange()
ui->table_probe->setItem(0, 2, new QTableWidgetItem("C-360")); ui->table_probe->setItem(0, 2, new QTableWidgetItem("C-360"));
break; break;
case id_IC5_9_D:
ui->table_probe->setItem(0, 2, new QTableWidgetItem("IC5-9-D"));
break;
case id_L9_2_H:
ui->table_probe->setItem(0, 2, new QTableWidgetItem("L9-2-H"));
break;
case id_C5_2_H:
ui->table_probe->setItem(0, 2, new QTableWidgetItem("C5-2-H"));
break;
case id_E9_4_H:
ui->table_probe->setItem(0, 2, new QTableWidgetItem("E9-4-H"));
break;
default: default:
ui->table_probe->setItem(0, 2, new QTableWidgetItem("Unknown")); ui->table_probe->setItem(0, 2, new QTableWidgetItem("Unknown"));
} }
@ -885,6 +938,22 @@ void MainWindow::getPrbChange()
ui->table_probe->setItem(0, 3, new QTableWidgetItem("C-360")); ui->table_probe->setItem(0, 3, new QTableWidgetItem("C-360"));
break; break;
case id_IC5_9_D:
ui->table_probe->setItem(0, 3, new QTableWidgetItem("IC5-9-D"));
break;
case id_L9_2_H:
ui->table_probe->setItem(0, 3, new QTableWidgetItem("L9-2-H"));
break;
case id_C5_2_H:
ui->table_probe->setItem(0, 3, new QTableWidgetItem("C5-2-H"));
break;
case id_E9_4_H:
ui->table_probe->setItem(0, 3, new QTableWidgetItem("E9-4-H"));
break;
default: default:
ui->table_probe->setItem(0, 3, new QTableWidgetItem("Unknown")); ui->table_probe->setItem(0, 3, new QTableWidgetItem("Unknown"));
} }

2
src/model/hardware/core/HardwareCore.cpp

@ -59,7 +59,7 @@ void HardwareCore::initTrxBoard()
{ {
try try
{ {
_trxBoard->init(); _trxBoard->init(true);
} }
catch(SonoException exp) catch(SonoException exp)
{ {

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

@ -493,10 +493,14 @@ TrxBoard::ScenGenHardwareParam::~ScenGenHardwareParam()
delete txParams; delete txParams;
} }
void TrxBoard::init() void TrxBoard::init(bool reset)
{ {
this->_device.init(); this->_device.init();
this->_bCtrlMngt->prbCtrlInit(); this->_bCtrlMngt->prbCtrlInit();
if(!reset)
{
return;
}
#ifdef MPS_BOARD #ifdef MPS_BOARD
mpsReset(); mpsReset();
#endif #endif

Loading…
Cancel
Save