mmtalaie
/
hardware-api
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Some features of preprocessors are modified 

Some bugs of ui are fixed
master
Arash Aletayeb 4 years ago
parent
d1d89bdbc1
commit
c03818a667
10 changed files with 104 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      developHw.pro
  2. 2
      developHw.pro.user
  3. 14
      include/model/hardware/core/TrxBoard.h
  4. 4
      include/model/hardware/core/TrxBoardUtils/PreProcessorDef.h
  5. 10
      include/model/hardware/core/register/fpgaProgram/FpgaProgram.h
  6. 43
      mainwindow.cpp
  7. 12
      mainwindow.h
  8. 99
      mainwindow.ui
  9. 20
      src/model/hardware/core/TrxBoard.cpp
  10. 5
      src/model/hardware/core/register/fpgaProgram/FpgaProgram.cpp

1
developHw.pro
View File

@ -25,7 +25,6 @@ SOURCES += \
$$files(hdf5Scenario/*.cpp, true) \
HEADERS += \
include/model/hardware/core/register/misc/registerDefinition/FrameLostCount.h \
mainwindow.h \
qcustomplot.h \
api.h \

2
developHw.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.10.0, 2021-06-23T14:23:56. -->
<!-- Written by QtCreator 4.10.0, 2021-06-26T16:14:08. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>

14
include/model/hardware/core/TrxBoard.h
View File

@ -77,6 +77,7 @@ private:
BeamFormer* _beamFormerSlave1;
BeamFormer* _beamFormerSlave2;
BoardsCtrlMngt* _bCtrlMngt;
FpgaProgram* _fpgaProgram;
ScenPalyer* _scenPlayer;
BpiFlash* _bpiFlash;
Afe* _afeSlave0;
@ -86,9 +87,6 @@ private:
Misc* _misc;
Sram* _sram;
Dsp* _dsp;
#ifndef DEVELOP_UI
FpgaProgram* _fpgaProgram;
#endif
enum eScenParams : quint8
{
@ -158,6 +156,10 @@ signals:
public:
#ifndef DEVELOP_UI
HardwarePacketEngine packetEngine;
#endif
TrxBoard();
~TrxBoard();
@ -234,12 +236,6 @@ public:
/////////////////////////////// DMA Data Packet ////////////////////////////////////
void readData();
#ifdef DEVELOP_UI
FpgaProgram* _fpgaProgram;
#endif
#ifndef DEVELOP_UI
HardwarePacketEngine packetEngine;
#endif
};
#endif //TRXBOARD_H

4
include/model/hardware/core/TrxBoardUtils/PreProcessorDef.h
View File

@ -2,9 +2,9 @@
#define PREPROCESSORDEF_H
#define MPS_BOARD
//#undef MPS_BOARD
#undef MPS_BOARD
#define DEVELOP_UI
#undef DEVELOP_UI
//#undef DEVELOP_UI
#endif //PREPROCESSORDEF_H

10
include/model/hardware/core/register/fpgaProgram/FpgaProgram.h
View File

@ -5,7 +5,6 @@
#include <QDataStream>
#include <QDebug>
#include <QByteArray>
#include <QProgressDialog>
#include "model/hardware/core/TrxBoardUtils/PreProcessorDef.h"
#include "registerDefinition/SlaveFpgaNumber.h"
@ -27,10 +26,8 @@ T byteArray2UintBigEndian(QByteArray& byte)
return data;
}
class FpgaProgram : public QObject
class FpgaProgram
{
Q_OBJECT
private:
SerialProgramData* _progData;
SlaveFpgaNumber* _fpgaNumber;
@ -49,11 +46,6 @@ private:
void setSlaveFpgaNumber(quint8& number) const;
#ifdef DEVELOP_UI
signals:
void programmingProgress(qint32 progressValue, qint32 bitFileSize);
#endif
public:
explicit FpgaProgram(SonoDevice* device);
~FpgaProgram();

43
mainwindow.cpp
View File

@ -28,6 +28,9 @@ MainWindow::MainWindow(QWidget* parent)
_emul = new EmulatorProperties;
_prb = new PrbCase;
movie = new QMovie("/home/hasis/Desktop/Develop_HardwareTest/gifs/Glass lines.gif");
ui->l_programming->hide();
_colorMap = new QCPColorMap(ui->plot_2->xAxis, ui->plot_2->yAxis);
ui->plot_2->setInteractions(QCP::iRangeZoom | QCP::iRangeDrag);
@ -62,7 +65,6 @@ MainWindow::MainWindow(QWidget* parent)
ui->tb_prbCtrlRomInfo->setPlaceholderText("info");
ui->tb_prbRomIdRead->setPlaceholderText("id(hex)");
ui->tb_prbRomImpulseRead->setPlaceholderText("impulse");
ui->prg_programming->setVisible(false);
//connect(this, &MainWindow::updateBlockProgressValue, this,
//&MainWindow::newBlockProgressValue);
@ -77,6 +79,7 @@ MainWindow::MainWindow(QWidget* parent)
//connect(this, &MainWindow::updateAdcLoggerProgressVisibility, this,
//&MainWindow::newAdcLoggerProgressVisibility);
connect(ui->action_Exit, &QAction::triggered, this, &MainWindow::exitApp);
connect(this, &MainWindow::showMessage, this, &MainWindow::newMessage);
connect(this, &MainWindow::connectedPrbChange, this, &MainWindow::getPrbChange);
connect(this, &MainWindow::frameLostCall, this, &MainWindow::getFrameLost);
@ -84,9 +87,7 @@ MainWindow::MainWindow(QWidget* parent)
connect(this, &MainWindow::scenarioReady, this, &MainWindow::setScenario);
connect(this, &MainWindow::labelState, this, &MainWindow::getLabelState);
connect(this, &MainWindow::fpgaProgrammer, this, &MainWindow::getFpgaProgrammer);
#ifdef DEVELOP_UI
connect(_trx._fpgaProgram,&FpgaProgram::programmingProgress, this, &MainWindow::getProgrammingProgress);
#endif
connect(this, &MainWindow::programmingGif, this, &MainWindow::getProgrammingGif);
//////////////////////// DMA Packet Connections //////////////////////////////
connect(&_trx, &TrxBoard::sendFramePacket, this, &MainWindow::getFramePacket);
@ -170,6 +171,8 @@ MainWindow::~MainWindow()
delete _vec;
delete _emul;
delete movie;
}
///*************************************************************************************************/
@ -895,21 +898,12 @@ void MainWindow::on_btn_fpgaBrowse_clicked()
}
}
/*************************************************************************************************/
void MainWindow::getProgrammingProgress(qint32 progressValue, qint32 bitFileSize)
{
ui->prg_programming->setVisible(true);
ui->prg_programming->setRange(0, bitFileSize);
ui->prg_programming->setValue(progressValue);
}
/*************************************************************************************************/
void MainWindow::getFpgaProgrammer(QString path)
{
try
{
_trx.slaveFpgaProgram(path);
ui->prg_programming->setVisible(false);
}
catch(SonoException& e)
{
@ -917,6 +911,17 @@ void MainWindow::getFpgaProgrammer(QString path)
}
}
/*************************************************************************************************/
void MainWindow::getProgrammingGif()
{
movie->setSpeed(100);
ui->l_programming->setMovie(movie);
ui->l_programming->show();
movie->start();
//ui->l_programming->update();
//qApp->processEvents();
}
/*************************************************************************************************/
void MainWindow::getLabelState(QLabel *label, QString str, QColor color)
{
@ -931,6 +936,8 @@ void MainWindow::on_btn_fpgaProgram_clicked()
{
auto path = ui->tb_fpgaBit->text();
//emit programmingGif();
QString str = "doing";
QColor color = Qt::red;
emit labelState(ui->l_programDone, str, color);
@ -940,6 +947,8 @@ void MainWindow::on_btn_fpgaProgram_clicked()
str = "done";
color = Qt::green;
emit labelState(ui->l_programDone, str, color);
//ui->l_programming->hide();
}
/*************************************************************************************************/
@ -1192,10 +1201,12 @@ void MainWindow::on_chk_continuousShowing_clicked()
{
QtConcurrent::run(this, &MainWindow::on_btn_dmaShow_clicked);
_dmaShow = true;
ui->btn_dmaShow->hide();
}
else
{
_dmaShow = false;
ui->btn_dmaShow->show();
}
}
@ -1227,6 +1238,8 @@ void MainWindow::on_btn_scenStart_clicked()
else
{
ui->btn_scenStart->setText("Scenario Start");
ui->chk_continuousShowing->setChecked(false);
on_chk_continuousShowing_clicked();
ui->btn_dmaLogLast->setHidden(true);
_dmaLog = false;
_dmaRun = false;
@ -3093,3 +3106,7 @@ void MainWindow::setAfeConfig()
}
/*************************************************************************************************/
void MainWindow::exitApp()
{
this->QWidget::close();
}

12
mainwindow.h
View File

@ -19,6 +19,7 @@
#include <string.h>
#include <QFuture>
#include <QFutureWatcher>
#include <QMovie>
#include "qcustomplot.h"
#include "include/model/hardware/core/TrxBoard.h"
@ -60,7 +61,7 @@
#define TRANSFER_RATE 30.0f
#define RAM_BUFFER_OFFSET 0U
#define ULTIMATE_LOG_COUNT 1000
#define ULTIMATE_LOG_COUNT 100000
QT_BEGIN_NAMESPACE
namespace Ui { class MainWindow; }
@ -82,6 +83,8 @@ private:
TrxBoard _trx;
QMovie *movie;
QSettings* _settings;
UltraSoundDevice* _usd;
@ -161,6 +164,8 @@ private:
private slots:
void exitApp();
void setScenario(const string& h5Path);
void getFramePacket (QByteArray packet);
@ -175,12 +180,12 @@ private slots:
void getFrameLost();
void getProgrammingProgress(qint32 progressValue, qint32 bitFileSize);
void getLabelState(QLabel* label, QString str, QColor color);
void getFpgaProgrammer (QString path);
void getProgrammingGif(void);
void on_rbtn_reg_toggled(bool checked);
void on_rbtn_offset_toggled(bool checked);
@ -370,6 +375,7 @@ signals:
void labelState(QLabel* label, QString str, QColor color);
void fpgaProgrammer(QString path);
void scenarioReady(const string& h5Path);
void programmingGif();
};
#endif // MAINWINDOW_H

99
mainwindow.ui
View File

@ -17,7 +17,7 @@
<widget class="QTabWidget" name="tabWidget">
<property name="geometry">
<rect>
<x>0</x>
<x>10</x>
<y>0</y>
<width>811</width>
<height>331</height>
@ -27,7 +27,7 @@
<string/>
</property>
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@ -296,7 +296,7 @@
<x>0</x>
<y>150</y>
<width>741</width>
<height>141</height>
<height>111</height>
</rect>
</property>
<property name="sizePolicy">
@ -365,7 +365,7 @@
<height>19</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_28">
<layout class="QHBoxLayout" name="layout_programming">
<item>
<widget class="QLabel" name="label_36">
<property name="text">
@ -395,17 +395,17 @@
<string>Program</string>
</property>
</widget>
<widget class="QProgressBar" name="prg_programming">
<widget class="QLabel" name="l_programming">
<property name="geometry">
<rect>
<x>10</x>
<y>100</y>
<width>721</width>
<height>23</height>
<x>260</x>
<y>70</y>
<width>221</width>
<height>20</height>
</rect>
</property>
<property name="value">
<number>24</number>
<property name="text">
<string/>
</property>
</widget>
</widget>
@ -1395,7 +1395,7 @@
<widget class="QGroupBox" name="groupBox_6">
<property name="geometry">
<rect>
<x>0</x>
<x>10</x>
<y>330</y>
<width>811</width>
<height>161</height>
@ -1422,8 +1422,8 @@
<rect>
<x>0</x>
<y>30</y>
<width>126</width>
<height>21</height>
<width>117</width>
<height>17</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_11">
@ -1656,8 +1656,8 @@
<rect>
<x>470</x>
<y>30</y>
<width>63</width>
<height>134</height>
<width>58</width>
<height>122</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">
@ -1728,8 +1728,8 @@
<rect>
<x>540</x>
<y>90</y>
<width>156</width>
<height>62</height>
<width>145</width>
<height>42</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_17">
@ -1782,8 +1782,8 @@
<rect>
<x>0</x>
<y>60</y>
<width>302</width>
<height>98</height>
<width>285</width>
<height>90</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_8">
@ -2011,8 +2011,8 @@
<rect>
<x>140</x>
<y>30</y>
<width>176</width>
<height>21</height>
<width>163</width>
<height>17</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_10">
@ -2035,10 +2035,10 @@
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>710</x>
<x>720</x>
<y>40</y>
<width>101</width>
<height>119</height>
<width>91</width>
<height>109</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
@ -2095,10 +2095,10 @@
<widget class="QGroupBox" name="groupBox_7">
<property name="geometry">
<rect>
<x>0</x>
<x>10</x>
<y>490</y>
<width>821</width>
<height>91</height>
<height>81</height>
</rect>
</property>
<property name="font">
@ -2215,8 +2215,8 @@
<widget class="QGroupBox" name="groupBox_8">
<property name="geometry">
<rect>
<x>0</x>
<y>590</y>
<x>10</x>
<y>570</y>
<width>821</width>
<height>271</height>
</rect>
@ -3443,6 +3443,28 @@
</widget>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>854</width>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menu">
<property name="title">
<string>&amp;File</string>
</property>
<addaction name="action_Exit"/>
</widget>
<addaction name="menu"/>
</widget>
<action name="action_Exit">
<property name="text">
<string>Exit</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
@ -3453,22 +3475,5 @@
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
<sender>chk_continuousShowing</sender>
<signal>clicked(bool)</signal>
<receiver>btn_dmaShow</receiver>
<slot>setHidden(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>727</x>
<y>216</y>
</hint>
<hint type="destinationlabel">
<x>733</x>
<y>88</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>

20
src/model/hardware/core/TrxBoard.cpp
View File

@ -106,10 +106,7 @@ void TrxBoard::afeAdcsSync() const
quint32 syncErr(0);
this->_bCtrlMngt->timerShot(20);
while(!(this->_bCtrlMngt->checkTimeout()))
{
;
}
while(!(this->_bCtrlMngt->checkTimeout()));
this->_misc->setSyncMode(AdcSyncMode);
this->_misc->setManualSync(true);
@ -844,10 +841,7 @@ QList<quint32> TrxBoard::getAfeReg(eSlaveSelect sel, quint32 afeRegAddr)
this->_afeSlave0->setReadRegEnable(true);
this->_bCtrlMngt->timerShot(1);
while(!(this->_bCtrlMngt->checkTimeout()))
{
;
}
while(!(this->_bCtrlMngt->checkTimeout()));
for(quint8 i = 0; i < _afeModuleOffset.size(); i++)
{
@ -861,10 +855,7 @@ QList<quint32> TrxBoard::getAfeReg(eSlaveSelect sel, quint32 afeRegAddr)
this->_afeSlave1->setReadRegEnable(true);
this->_bCtrlMngt->timerShot(1);
while(!(this->_bCtrlMngt->checkTimeout()))
{
;
}
while(!(this->_bCtrlMngt->checkTimeout()));
for(quint8 i = 0; i < _afeModuleOffset.size(); i++)
{
@ -878,10 +869,7 @@ QList<quint32> TrxBoard::getAfeReg(eSlaveSelect sel, quint32 afeRegAddr)
this->_afeSlave2->setReadRegEnable(true);
this->_bCtrlMngt->timerShot(1);
while(!(this->_bCtrlMngt->checkTimeout()))
{
;
}
while(!(this->_bCtrlMngt->checkTimeout()));
for(quint8 i = 0; i < _afeModuleOffset.size(); i++)
{

5
src/model/hardware/core/register/fpgaProgram/FpgaProgram.cpp
View File

@ -56,11 +56,6 @@ void FpgaProgram::program(QByteArray& bitFileData, quint8 number)
temp.clear();
progByte += sizeof(quint32);
#ifdef DEVELOP_UI
emit programmingProgress(progByte, bitFileSize);
#endif
}
while(!(_status->getProgramFail() || _status->getProgramDone()));

Write Preview
Loading…
Cancel
Save