The BPI Flash API is added to write and verify the BIN files.

The reducing of the hardware API RAM is done by decreasing the software buffer to 16 instead of 100.
Some features in developedUi are added.
The preprocessors are fixed to using the upper layer of sono software.

developHw.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2021-08-09T09:47:55. -->
+<!-- Written by QtCreator 4.10.0, 2021-09-11T10:25:25. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

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

@@ -23,6 +23,8 @@
 #include "model/hardware/core/lowLevelApi/register/sram/Sram.h"
 #include "model/hardware/core/lowLevelApi/register/dsp/Dsp.h"
 #include "model/hardware/core/lowLevelApi/register/afe/Afe.h"
+
+#include "model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h"
 #include "model/hardware/device/SonoDevice.h"
 #include "TrxBoardUtils/TrxBoardStructures.h"
 #include "TrxBoardUtils/ScenParamsRanges.h"
@@ -33,13 +35,11 @@
 #include "model/hardware/service/HardwarePacketEngine.h"
 
 #define  SLAVE_ELEMENT_SEGMENT 64U
-#define  TOTAL_SLAVE_FPGA_NUM 3U
 #define  TOTAL_SCEN_LUT_SRAM 5U
 #define  MOUNTED_SLAVE_FPGA 7U
 #define  CLOCK_DIVISION 0x55
 
 #define  AFE_CHANNEL_NUM_PER_SLAVE 64U
-#define  TOTAL_AFE_CHANNEL_NUM 192U
 #define  LOGGER_SAMPLE_CNT 2048U
 #define  BITE_INTERVAL 0x0
 
@@ -52,17 +52,17 @@
 #define  EEPROM_IMPULSE_RESPONSE_BEGIN 428U
 #define  EEPROM_IMPULSE_RESPONSE_NUMBER 1024U
 
-#define  EEPROM_NO_ERROR    0x0
-#define  EEPROM_CRC_ERROR   0x1
+#define  EEPROM_NO_ERROR 0x0
+#define  EEPROM_CRC_ERROR 0x1
 
 class TrxBoard : public QObject
 {
 	Q_OBJECT
 
 private:
-    QVector<quint8>  _swapVec;
+    QVector<quint8> _swapVec;
     QVector<quint32> _unsignedQntzrVec;
-    QList<quint32>  _unsignedQntzrList;
+    QList<quint32> _unsignedQntzrList;
 	QList<quint32> _afeModuleOffset;
 	QList<quint32> _fpgaOffset;
     QByteArray _eepromCrc;
@@ -144,11 +144,14 @@ private:
 
     * _scenParams;
 
-    void fpgaProgram(const QString path) const;
+    void sendPacket(void);
+
+    void delay(quint16 ms) const;
+    void fpgaProgram(const QString path, const quint8& slaveMounted) const;
     void mcsRead(const QString path) const;
     void setScenario(ScenGenHardwareParam* _scenParams);
 
-    void sramClear (eSramClear clearMode);
+    void sramClear(eSramClear clearMode);
 	void setSwapVector(void);
     void setRomCrc(void);
 	void setFpgaOffset(void);
@@ -157,12 +160,13 @@ private:
     //QList<quint32> signedVector2unsignedList(QVector<qint32>& sgnVec);
 
 #ifndef DEVELOP_UI
-    void afeAdcsSync(void) const;
+    void afeAdcsSync(const quint8& slaveMounted);
+    void gtReadReset(void);
 #endif
-    void waitForCaptureDone(Debug* _dbg) const;
-    void adcCaptureStop(Debug *_dbg) const;
-    void adcCaptureStart(Debug *_dbg) const;
-    void adcLogTransferRoutine (Debug* _dbg, quint8 chNumPerFpga);
+    void waitForCaptureDone(Debug* _dbg);
+    void adcCaptureStop(Debug* _dbg) const;
+    void adcCaptureStart(Debug* _dbg) const;
+    void adcLogTransferRoutine(Debug* _dbg, quint8 chNumPerFpga);
     void debuggerMode(Debug* _dbg, DebugMode& debug, DebugMode& debugRb, QString slaveN) const;
 
     template<class T>
@@ -171,19 +175,19 @@ private:
     template<class T>
     T byteArray2UintLittleEndian(QByteArray& byte) const;
 
-
 signals:
     void sendFramePacket(QByteArray newPacket);
+
     void sramBinaryCreateFlag(void);
     void registerCsvCompareFlag(void);
     void sramVerifyMessage(QString message);
 
 public:
-
 #ifndef DEVELOP_UI
     HardwarePacketEngine packetEngine;
 #else
-    void afeAdcsSync(void) const;
+    void afeAdcsSync(const quint8& slaveMounted);
+    void gtReadReset(void);
 #endif
 
 	TrxBoard();
@@ -193,8 +197,8 @@ public:
 	void init(void);
 
     ////////////////////////////////// Scenario API ///////////////////////////////
-    void setProbeDependParams(ScenPrbDepHardwareParam &prbDepParams);
-    void setScenario(ScenGenHardwareOutput_t &scenGenHw);
+    void setProbeDependParams(ScenPrbDepHardwareParam& prbDepParams);
+    void setScenario(ScenGenHardwareOutput_t& scenGenHw);
 
 	void setLineFilterCoefficient(QVector<float>& lineFilterLut);
 	void setStbCoefficient(QVector<quint32>& stbLut);
@@ -204,20 +208,22 @@ public:
     void scenPlayerStop(bool afeHvPwrOff = false);
 	//void scenPlayerPause (bool pause) const;
 
-    void setFramesMetaData(const QByteArray &metaData) const;
+    void setFramesMetaData(const QByteArray& metaData) const;
 
     /////////////////////////////// Built-in Test API /////////////////////////////
-    void setBiteDacData(const QByteArray& iData,const QByteArray& qData) const;
+    void setBiteDacData(const QByteArray& iData, const QByteArray& qData) const;
     void biteScenPlayerStart(void);
     void biteScenPlayerStop(void);
 
     ////////////////////////////////// UI Test API ////////////////////////////////
-    void setScenarioCompare (const QString scenPath);
+    void setScenarioCompare(const QString scenPath);
     void setAtgcMode(eAtgcMode mode, quint16 value) const;
     QList<quint32> getAfeReg(eSlaveSelect sel, quint32 afeRegAddr);
     void setAdgCfg(eBiteDacOutput adg) const;
     void setTxDacEnable(quint8 biteInterval, bool cmd) const;
 
+    void powerAo(bool flag);
+
     ////////////////////////////// Slave Programming API //////////////////////////
     void slaveFpgaProgram(const QString path);
 
@@ -234,10 +240,10 @@ public:
 	quint32 deviceId(void) const;
 	quint32 vendorId(void) const;
 
-    void trxState(EepromStatus &romStatus) const;
-    void mpsState(EepromStatus &romStatus) const;
-    void prbCtrlState(EepromStatus &romStatus) const;
-    void selectedPrbState(EepromStatus &romStatus, eSelectProbe prbSel) const;
+    void trxState(EepromStatus& romStatus) const;
+    void mpsState(EepromStatus& romStatus) const;
+    void prbCtrlState(EepromStatus& romStatus) const;
+    void selectedPrbState(EepromStatus& romStatus, eSelectProbe prbSel) const;
     void prbState(PrbCase* prb) const;
 
     QString trxInfo(void) const;
@@ -267,9 +273,9 @@ public:
     quint32 getFrameLostCounter(void) const;
 
     ////////////////////////////////// Logger API /////////////////////////////////
-    void adcCaptureConfig(captureConfig &capCfg) const;
+    void adcCaptureConfig(captureConfig& capCfg) const;
     void adcCaptureStart(void) const;
-    void adcCaptureDone(void) const;
+    void adcCaptureDone(void);
     void setCaptureManualSync(void) const;
     void adcLoggerStart(const QString path, const QString fileName);
     void setDebuggerMode(eDebugMode bfMode, bool enable);

include/model/hardware/core/lowLevelApi/register/Register.h

@@ -28,6 +28,8 @@ protected:
 
 	bool _isUpdated;
 
+    SonoDevice* _device;
+
 	QList<Field*> _fields;
 
 public:
@@ -35,8 +37,6 @@ public:
 	Register(quint8 bar, quint32 offset, SonoDevice* device, quint32 arrayLength = 0);
 	virtual ~Register();
 
-    SonoDevice* _device;
-
 	quint32 getValue();
 	void setValue(quint32 value);
 

include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/BoardsCtrlMngt.h

@@ -2,7 +2,6 @@
 #define BOARDSCTRLMNGT_H
 
 #include <QObject>
-#include <QDebug>
 #include <QTimer>
 #include <QByteArray>
 #include "registerDefinition/BoardsSpecs.h"
@@ -16,7 +15,7 @@
 
 #define SUPERVISOR_RB_RESOLUTION 65535
 #define SUPERVISOR_RB_V_REF 2.048f
-#define F_SYS_CLK  1E8f     //FPGAclk = 100MHz
+#define F_SYS_CLK 1E8f      //FPGAclk = 100MHz
 #define CWD_Offset 1.53f
 #define CWD_GAIN 47.065f
 #define HVA_Offset 1.525f
@@ -25,7 +24,7 @@
 #define HVB_GAIN 2.635f
 
 #define HVA_MAX_VALUE 66.0f
-#define HVB_MAX_VALUE 66.0f // must be check
+#define HVB_MAX_VALUE 66.0f //must be check
 
 enum ePg : bool
 {
@@ -225,11 +224,11 @@ private:
     float fanTacho(T7* tachoMean);
 	float resDiv(float r1, float r2, quint32 adcValue);
 	QVector<float> voltPg(float adcVolt);
-    float fpgaVoltage (quint32 coreVolt) const;
-    float fpgaTemp(FpgaXadc1 *coreTemp) const;
-    float fpgaVccInt(FpgaXadc1 *coreVccInt) const;
-    float fpgaVccAux(FpgaXadc2 *coreVccAux) const;
-    float fpgaVccBram(FpgaXadc2 *coreVccBram) const;
+    float fpgaVoltage(quint32 coreVolt) const;
+    float fpgaTemp(FpgaXadc1* coreTemp) const;
+    float fpgaVccInt(FpgaXadc1* coreVccInt) const;
+    float fpgaVccAux(FpgaXadc2* coreVccAux) const;
+    float fpgaVccBram(FpgaXadc2* coreVccBram) const;
 
 	float getCWdpValue(void) const;
 	float getCurr24vValue(void) const;
@@ -279,8 +278,8 @@ public:
 	}
 
     void timerShot(quint16 ms) const;
-    void timerStop(void) const;
     bool checkTimeout(void) const;
+    void timerStop(void) const;
 
 	quint32 getPid(void) const;
 	quint32 getVid(void) const;
@@ -301,10 +300,10 @@ public:
     void mpsDacsOff(void) const;
     void mpsDacsOn(void) const;
 	void mpsHvSet(float& hva, float& hvb) const;
-    void getFpgaTemp(criticalComponentTemperature *coreTemp);
-    void getFpgaVccInt(FpgaVccInt &coreVcc);
-    void getFpgaVccAux(FpgaVccAux &coreAux);
-    void getFpgaVccBram(FpgaVccBram &coreBram);
+    void getFpgaTemp(criticalComponentTemperature* coreTemp);
+    void getFpgaVccInt(FpgaVccInt& coreVcc);
+    void getFpgaVccAux(FpgaVccAux& coreAux);
+    void getFpgaVccBram(FpgaVccBram& coreBram);
     void getFanRpm(FanRpm* _rpm);
 
 	QByteArray trxEepromRead(quint32 address, quint32 length);

include/model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.h

@@ -1,29 +1,50 @@
 #ifndef BPIFLASH_H
 #define BPIFLASH_H
 
-#include "registerDefinition/McsRdWr.h"
-#include "model/hardware/core/lowLevelApi/register/fpgaProgram/FpgaProgram.h"
+#include "model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h"
+#include "model/hardware/device/SonoDevice.h"
+#include <QDataStream>
+#include <QTimer>
 
-class BpiFlash
+#define BPI_FLASH_SIZE 64 * 1024 * 1024 //Byte
+#define UNLOCK_ERASE_BLOCK 256U
+#define BPI_NO_ERR_STATUS 0x80
+#define MAXIMUM_WR_NUM 1024
+#define STEP_128KB 0x20000
+
+class BpiFlash : public QObject
 {
+    Q_OBJECT
+
 private:
-    McsRdWr*    _mcsRdWr;
+    SonoDevice* _device;
+    QTimer* _timer;
+
+    template<class T>
+    T byteArray2UintLittleEndian(QByteArray& byte) const;
 
-    void bpiInitialize(void) const;
-    void bpiReset(void) const;
-    void bpiErase(void) const;
+    void timerShot(quint16 ms) const;
+    bool checkTimeout(void) const;
+    void timerStop(void) const;
+
+    void bpiClearStatus(void) const;
+    void bpiUnlock(quint16& blockOffset);
+    void bpiErase(quint16& blockOffset);
+    void bpiWrite(quint16& wrCount); //max = 511 word
+    void bpiWriteCmplt(quint16& num);
     void bpiRead(void) const;
-    void bpiWrite(void) const;
+
+signals:
+    void startTimerShot(quint16 ms);
+    void remainingTime(QString message);
+    void stopTimer(void);
 
 public:
     explicit BpiFlash(SonoDevice* device);
     ~BpiFlash();
 
-    void writeMcs (QByteArray& mcs) const;
-    QList<quint32> readMcs (void) const;
-
-    void readCommand(void) const;
-    void writeCommand(void) const;
+    void writeMcs(QByteArray& mcs);
+    QList<quint32> readMcs(void) const;
 };
 
-#endif // BPIFLASH_H
+#endif //BPIFLASH_H

include/model/hardware/core/lowLevelApi/register/bpiFlash/registerDefinition/McsRdWr.h

@@ -1,49 +0,0 @@
-#ifndef MCSRDWR_H
-#define MCSRDWR_H
-
-#include "model/hardware/core/lowLevelApi/register/Register.h"
-#include "model/hardware/core/lowLevelApi/register/RegUtils.h"
-
-#undef  BAR
-
-#define MASTER_MCS_DATA_MASK    0xFFFFFFFF
-
-#define BAR     1U
-#define OFFSET  0X4000000
-#define MCS_FILE_SIZE           32*1024*1024
-
-class McsRdWr : public Register
-{
-private:
-    QList<quint32> _mcsListWr;
-
-    void prepareData(quint32 index) override
-    {
-        masterMcsData->setValue(_mcsListWr[static_cast<qint32>(index)]);
-    }
-
-public:
-    Field* masterMcsData;
-    QList<quint32> mcsListRd;
-
-    void mcsWrite (QList<quint32>& mcsList) {
-         _mcsListWr = mcsList;
-    }
-
-    void receiveData (void) override
-    {
-        mcsListRd.push_back(this->masterMcsData->getValue());
-    }
-
-    McsRdWr(SonoDevice* device) : Register(BAR, OFFSET, device, MCS_FILE_SIZE)
-    {
-        ADD_UNSIGNED_FIELD(masterMcsData, MASTER_MCS_DATA_MASK);
-    }
-};
-
-#undef MASTER_MCS_DATA_MASK
-
-#undef BAR
-#undef OFFSET
-
-#endif // MCSRDWR_H