From def19388b43c49a0c19599d4bef32b32bffa7767 Mon Sep 17 00:00:00 2001 From: Arash Aletayeb Date: Wed, 7 May 2025 17:03:59 +0330 Subject: [PATCH] New probe ID added. --- developHw.pro.user | 7 +- .../hardware/core/lowLevelApi/TrxBoard.h | 2 +- mainwindow.cpp | 71 ++++++++++++++++++- src/model/hardware/core/HardwareCore.cpp | 2 +- .../hardware/core/lowLevelApi/TrxBoard.cpp | 6 +- 5 files changed, 78 insertions(+), 10 deletions(-) diff --git a/developHw.pro.user b/developHw.pro.user index f1ece54..e9c707d 100644 --- a/developHw.pro.user +++ b/developHw.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -283,11 +283,6 @@ -F true 4096 - false - false - 0 - - true false false diff --git a/include/model/hardware/core/lowLevelApi/TrxBoard.h b/include/model/hardware/core/lowLevelApi/TrxBoard.h index 6c033d8..1c5134d 100644 --- a/include/model/hardware/core/lowLevelApi/TrxBoard.h +++ b/include/model/hardware/core/lowLevelApi/TrxBoard.h @@ -225,7 +225,7 @@ public: ~TrxBoard(); ///////////////////////////////// Initialize API ////////////////////////////// - void init(void); + void init(bool reset); ////////////////////////////////// Scenario API /////////////////////////////// void setProbeDependParams(ScenPrbDepHardwareParam& prbDepParams); diff --git a/mainwindow.cpp b/mainwindow.cpp index b2195f2..763f146 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -221,7 +221,7 @@ MainWindow::MainWindow(QWidget* parent) try { - _trx.init(); + _trx.init(true); if(_trx.isScenarioStart()) { @@ -731,6 +731,11 @@ void MainWindow::getPrbChange() const quint32 idC1_5_D = 0x225; 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 { _trx.prbState(_prb); @@ -759,6 +764,22 @@ void MainWindow::getPrbChange() ui->table_probe->setItem(0, 0, new QTableWidgetItem("C-360")); 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: 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")); 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: 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")); 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: 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")); 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: ui->table_probe->setItem(0, 3, new QTableWidgetItem("Unknown")); } diff --git a/src/model/hardware/core/HardwareCore.cpp b/src/model/hardware/core/HardwareCore.cpp index ea3e411..31ce106 100644 --- a/src/model/hardware/core/HardwareCore.cpp +++ b/src/model/hardware/core/HardwareCore.cpp @@ -59,7 +59,7 @@ void HardwareCore::initTrxBoard() { try { - _trxBoard->init(); + _trxBoard->init(true); } catch(SonoException exp) { diff --git a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp index bcd21d8..facac5a 100644 --- a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp +++ b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp @@ -493,10 +493,14 @@ TrxBoard::ScenGenHardwareParam::~ScenGenHardwareParam() delete txParams; } -void TrxBoard::init() +void TrxBoard::init(bool reset) { this->_device.init(); this->_bCtrlMngt->prbCtrlInit(); + if(!reset) + { + return; + } #ifdef MPS_BOARD mpsReset(); #endif