From 78a22daec76ec47e235b8bbb73499c0a87bab486 Mon Sep 17 00:00:00 2001 From: Arash Aletayeb Date: Sat, 14 Dec 2024 11:38:50 +0330 Subject: [PATCH] MainWindow changed. --- developHw.pro.user | 4 ++-- .../TrxBoardUtils/PreProcessorDef.h | 2 +- mainwindow.cpp | 18 +++++------------- mainwindow.h | 2 +- mainwindow.ui | 11 ++++++----- .../hardware/core/lowLevelApi/TrxBoard.cpp | 4 ++-- 6 files changed, 17 insertions(+), 24 deletions(-) diff --git a/developHw.pro.user b/developHw.pro.user index 5fe7745..605bf5b 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/mainwindow.cpp b/mainwindow.cpp index 2ee064c..411f8b0 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -6831,18 +6831,10 @@ void MainWindow::on_btn_spiVerify_clicked() } /*************************************************************************************************/ -void MainWindow::on_chk_quickChanging_clicked(bool checked) +void MainWindow::on_btn_quickChanging_clicked() { - if(checked) - { - _trx.scenPlayerStop(); - delay(1); - _trx.scenPlayerStart(); - delay(50); - } - else - { - _trx.scenPlayerStop(); - } - + _trx.scenPlayerStop(); + delay(1); + _trx.scenPlayerStart(); + delay(100); } diff --git a/mainwindow.h b/mainwindow.h index b2913a6..313da5d 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -588,7 +588,7 @@ private slots: void on_chk_pm5RegEn_clicked(bool checked); - void on_chk_quickChanging_clicked(bool checked); + void on_btn_quickChanging_clicked(); signals: void showMessage(QString message); diff --git a/mainwindow.ui b/mainwindow.ui index 25b3c74..d46f385 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -7051,18 +7051,19 @@ Dynamic Contrast Spi Verify - + - 880 + 870 20 - 201 - 41 + 171 + 31 - 10 + 75 + true diff --git a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp index cc6d118..48077c2 100644 --- a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp +++ b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp @@ -80,7 +80,7 @@ void TrxBoard::readData() if(cnt == 0) { _hwCounter = 0; - std::this_thread::sleep_for(std::chrono::milliseconds(3)); + //std::this_thread::sleep_for(std::chrono::milliseconds(3)); continue; } else if(cnt != _hwCounter) @@ -106,7 +106,7 @@ void TrxBoard::readData() (batch - preBatch > 1) || (batch - preBatch == 1 && subBbatch != 0)) { - //throw HardwareException(DMA_XFER_ERROR, "Batch/subBatch id error occured."); + throw HardwareException(DMA_XFER_ERROR, "Batch/subBatch id error occured."); } preBatch = batch; preSubBatch = subBbatch;