From 8e4db8492c47951122335dcf811120fc74a1a0ac Mon Sep 17 00:00:00 2001 From: Arash Aletayeb Date: Sun, 8 Aug 2021 16:35:20 +0200 Subject: [PATCH] The mpsSetAo is modified to new conditions of HVA and HVB. Some features of bpi flash are added. --- developHw.pro.user | 2 +- hdf5Scenario/hdf5Scenario.cpp | 8 +- hdf5Scenario/hdf5Scenario.h | 2 +- include/model/hardware/core/HardwareCore.h | 2 +- .../core/{ => lowLevelApi}/TrxBoard.h | 29 +- .../TrxBoardUtils/PreProcessorDef.h | 0 .../TrxBoardUtils/ScenParamsRanges.h | 0 .../TrxBoardUtils/TrxBoardEnums.h | 0 .../TrxBoardUtils/TrxBoardStructures.h | 8 +- .../core/{ => lowLevelApi}/register/Field.h | 0 .../{ => lowLevelApi}/register/RegUtils.h | 0 .../{ => lowLevelApi}/register/Register.h | 6 +- .../core/{ => lowLevelApi}/register/afe/Afe.h | 0 .../afe/registerDefinition/ActiveTerm.h | 4 +- .../afe/registerDefinition/AdcLatency.h | 4 +- .../afe/registerDefinition/AdcSyncStatus.h | 4 +- .../register/afe/registerDefinition/Global.h | 4 +- .../register/afe/registerDefinition/LnaHpf.h | 4 +- .../register/afe/registerDefinition/LowNf.h | 4 +- .../register/afe/registerDefinition/Pga.h | 4 +- .../register/beamFormer/BeamFormer.h | 0 .../beamFormer/registerDefinition/AfeLut.h | 4 +- .../registerDefinition/ApodizationLut.h | 4 +- .../registerDefinition/ElementPositionLut.h | 4 +- .../beamFormer/registerDefinition/PulseLut.h | 4 +- .../beamFormer/registerDefinition/RegValid.h | 4 +- .../registerDefinition/RxBeamformerLut.h | 4 +- .../register/boardsCtrlMngt/BoardsCtrlMngt.h | 3 +- .../registerDefinition/BoardsSpecs.h | 0 .../registerDefinition/mps/FanStatus.h | 4 +- .../registerDefinition/mps/FanTacho1.h | 4 +- .../registerDefinition/mps/FanTacho2.h | 4 +- .../registerDefinition/mps/MpsEepromRwReq.h | 4 +- .../mps/MpsEepromRwStatus.h | 4 +- .../mps/MpsHvRegulatorClk.h | 4 +- .../registerDefinition/mps/MpsHvStopState.h | 4 +- .../mps/MpsPm5RegulatorClk.h | 4 +- .../mps/SupervisorDacValue.h | 4 +- .../mps/SupervisorFaultStatus.h | 4 +- .../mps/SupervisorI2cStatus.h | 4 +- .../registerDefinition/mps/SupervisorRbCmd.h | 4 +- .../mps/SupervisorRbCurr24V.h | 4 +- .../registerDefinition/mps/SupervisorRbCwdp.h | 4 +- .../mps/SupervisorRbHvStop.h | 4 +- .../registerDefinition/mps/SupervisorRbHvap.h | 4 +- .../registerDefinition/mps/SupervisorRbHvbp.h | 4 +- .../registerDefinition/mps/SupervisorRbM5V.h | 4 +- .../registerDefinition/mps/SupervisorRbP12V.h | 4 +- .../registerDefinition/mps/SupervisorRbP24V.h | 4 +- .../registerDefinition/mps/SupervisorRbP4d.h | 4 +- .../registerDefinition/mps/SupervisorRbP5V.h | 4 +- .../registerDefinition/mps/SupervisorRdData.h | 4 +- .../registerDefinition/mps/SupervisorRwReq.h | 4 +- .../mps/SupervisorSetupCmd.h | 4 +- .../registerDefinition/probe/PrbCtrlCmd.h | 4 +- .../probe/PrbCtrlEepromRwReq.h | 4 +- .../probe/PrbCtrlEepromRwStatus.h | 4 +- .../registerDefinition/probe/PrbCtrlStatus.h | 4 +- .../registerDefinition/probe/PrbEepromRwReq.h | 4 +- .../probe/PrbEepromRwStatus.h | 4 +- .../registerDefinition/trx/Adc12Vin.h | 4 +- .../registerDefinition/trx/Adc3P3V.h | 4 +- .../registerDefinition/trx/Adc5Vin.h | 4 +- .../registerDefinition/trx/AdcAfeA1P8V.h | 4 +- .../registerDefinition/trx/AdcAfeD1P8V.h | 4 +- .../registerDefinition/trx/AdcAfeVcntlp.h | 4 +- .../registerDefinition/trx/AdcPrbCtrl3P3V.h | 4 +- .../trx/AdcPrbZeroEncoder.h | 4 +- .../registerDefinition/trx/FpgaXadc1.h | 4 +- .../registerDefinition/trx/FpgaXadc2.h | 4 +- .../trx/OnBoardTempSensor.h | 4 +- .../registerDefinition/trx/PcieId.h | 4 +- .../registerDefinition/trx/TrxEepromRwReq.h | 4 +- .../trx/TrxEepromRwStatus.h | 4 +- .../registerDefinition/trx/TrxRegulatorPg.h | 4 +- .../lowLevelApi/register/bpiFlash/BpiFlash.h | 29 + .../bpiFlash/registerDefinition/McsRdWr.h | 8 +- .../register/builtInTest/BuiltInTest.h | 0 .../registerDefinition/BiteDacMemory.h | 4 +- .../registerDefinition/BiteDacMemoryCmd.h | 4 +- .../registerDefinition/BiteDacOutputSelect.h | 4 +- .../clockDistributer/ClockDistributer.h | 0 .../registerDefinition/ClkDistributionId.h | 4 +- .../registerDefinition/CwModeEnable.h | 4 +- .../registerDefinition/CwModeStatus.h | 4 +- .../{ => lowLevelApi}/register/debug/Debug.h | 0 .../registerDefinition/AdcLoggerCapCmd.h | 4 +- .../AdcLoggerDataTransfer.h | 4 +- .../registerDefinition/AdcLoggerStatus.h | 4 +- .../debug/registerDefinition/DebuggerMode.h | 4 +- .../core/{ => lowLevelApi}/register/dsp/Dsp.h | 0 .../register/dsp/registerDefinition/AtgcLut.h | 4 +- .../register/dsp/registerDefinition/BfScale.h | 4 +- .../dsp/registerDefinition/BlendWeight.h | 4 +- .../register/dsp/registerDefinition/DtgcLut.h | 4 +- .../dsp/registerDefinition/FrequencyLut.h | 4 +- .../LineFilterCoefficient.h | 4 +- .../register/dsp/registerDefinition/LpfLut.h | 4 +- .../dsp/registerDefinition/ManualAtgc.h | 4 +- .../ReceiverConfigurationLut.h | 4 +- .../dsp/registerDefinition/StbCoefficient.h | 4 +- .../register/emulator/Emulator.h | 0 .../registerDefinition/EmulatorActivation.h | 4 +- .../emulator/registerDefinition/RamAddress.h | 4 +- .../registerDefinition/TransferMode.h | 4 +- .../registerDefinition/TransferRate.h | 4 +- .../register/fpgaProgram/FpgaProgram.h | 2 +- .../registerDefinition/SerialProgramData.h | 4 +- .../registerDefinition/SerialProgramStatus.h | 4 +- .../registerDefinition/SlaveFpgaNumber.h | 4 +- .../{ => lowLevelApi}/register/misc/Misc.h | 0 .../misc/registerDefinition/AdcDataBram.h | 4 +- .../registerDefinition/AdcSamplerControl.h | 4 +- .../registerDefinition/AdcSamplerStatus.h | 4 +- .../misc/registerDefinition/FpgaVersion.h | 4 +- .../misc/registerDefinition/FrameLostCount.h | 4 +- .../misc/registerDefinition/GtSendMode.h | 4 +- .../misc/registerDefinition/StatusVector.h | 4 +- .../misc/registerDefinition/SyncMode.h | 4 +- .../register/scenPlayer/ScenPlayer.h | 0 .../registerDefinition/ScenPlayerCtrl.h | 4 +- .../registerDefinition/ScenPlayerEndIndex.h | 4 +- .../registerDefinition/ScenPlayerErrorCount.h | 4 +- .../registerDefinition/ScenPlayerStartIndex.h | 4 +- .../{ => lowLevelApi}/register/sram/Sram.h | 0 .../register/sram/registerDefinition/Index.h | 4 +- .../sram/registerDefinition/RxParams.h | 4 +- .../sram/registerDefinition/RxParamsDegree.h | 4 +- .../sram/registerDefinition/RxParamsDelay.h | 4 +- .../sram/registerDefinition/RxParamsPos.h | 4 +- .../registerDefinition/SoftwareMetaData.h | 4 +- .../sram/registerDefinition/SramStructures.h | 4 +- .../sram/registerDefinition/TxParams.h | 4 +- .../sram/registerDefinition/TxParamsFocus.h | 4 +- .../core/register/bpiFlash/BpiFlash.h | 20 - .../hardware/service/HardwarePacketEngine.h | 1 + .../core/scenario/type/misc/ReceiverConfig.h | 2 +- .../dto/hardware/HardwareOutput.h | 4 +- mainwindow.cpp | 709 ++++++++++++++---- mainwindow.h | 43 +- mainwindow.ui | 545 ++++++++++++-- .../core/{ => lowLevelApi}/TrxBoard.cpp | 106 +-- .../core/{ => lowLevelApi}/register/Field.cpp | 2 +- .../{ => lowLevelApi}/register/Register.cpp | 2 +- .../{ => lowLevelApi}/register/afe/Afe.cpp | 2 +- .../register/beamFormer/BeamFormer.cpp | 2 +- .../boardsCtrlMngt/BoardsCtrlMngt.cpp | 35 +- .../register/bpiFlash/BpiFlash.cpp | 102 +++ .../register/builtInTest/BuiltInTest.cpp | 2 +- .../clockDistributer/ClockDistributer.cpp | 2 +- .../register/debug/Debug.cpp | 2 +- .../{ => lowLevelApi}/register/dsp/Dsp.cpp | 2 +- .../register/emulator/Emulator.cpp | 2 +- .../register/fpgaProgram/FpgaProgram.cpp | 2 +- .../{ => lowLevelApi}/register/misc/Misc.cpp | 2 +- .../register/scenPlayer/ScenPlayer.cpp | 2 +- .../{ => lowLevelApi}/register/sram/Sram.cpp | 2 +- .../core/register/bpiFlash/BpiFlash.cpp | 46 -- .../hardware/service/HardwarePacketEngine.cpp | 7 +- 159 files changed, 1532 insertions(+), 641 deletions(-) rename include/model/hardware/core/{ => lowLevelApi}/TrxBoard.h (88%) rename include/model/hardware/core/{ => lowLevelApi}/TrxBoardUtils/PreProcessorDef.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/TrxBoardUtils/ScenParamsRanges.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/TrxBoardUtils/TrxBoardEnums.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/TrxBoardUtils/TrxBoardStructures.h (86%) rename include/model/hardware/core/{ => lowLevelApi}/register/Field.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/RegUtils.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/Register.h (92%) rename include/model/hardware/core/{ => lowLevelApi}/register/afe/Afe.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/afe/registerDefinition/ActiveTerm.h (92%) rename include/model/hardware/core/{ => lowLevelApi}/register/afe/registerDefinition/AdcLatency.h (88%) rename include/model/hardware/core/{ => lowLevelApi}/register/afe/registerDefinition/AdcSyncStatus.h (88%) rename include/model/hardware/core/{ => lowLevelApi}/register/afe/registerDefinition/Global.h (77%) rename include/model/hardware/core/{ => lowLevelApi}/register/afe/registerDefinition/LnaHpf.h (77%) rename include/model/hardware/core/{ => lowLevelApi}/register/afe/registerDefinition/LowNf.h (83%) rename include/model/hardware/core/{ => lowLevelApi}/register/afe/registerDefinition/Pga.h (88%) rename include/model/hardware/core/{ => lowLevelApi}/register/beamFormer/BeamFormer.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/beamFormer/registerDefinition/AfeLut.h (93%) rename include/model/hardware/core/{ => lowLevelApi}/register/beamFormer/registerDefinition/ApodizationLut.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/beamFormer/registerDefinition/ElementPositionLut.h (83%) rename include/model/hardware/core/{ => lowLevelApi}/register/beamFormer/registerDefinition/PulseLut.h (91%) rename include/model/hardware/core/{ => lowLevelApi}/register/beamFormer/registerDefinition/RegValid.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/beamFormer/registerDefinition/RxBeamformerLut.h (88%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/BoardsCtrlMngt.h (94%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/BoardsSpecs.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/FanStatus.h (76%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/FanTacho1.h (77%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/FanTacho2.h (77%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwReq.h (90%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwStatus.h (88%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/MpsHvRegulatorClk.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/MpsHvStopState.h (83%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/MpsPm5RegulatorClk.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorDacValue.h (83%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorFaultStatus.h (94%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorI2cStatus.h (80%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCmd.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCurr24V.h (75%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCwdp.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvStop.h (74%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvap.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvbp.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbM5V.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP12V.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP24V.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP4d.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP5V.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRdData.h (72%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRwReq.h (81%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/mps/SupervisorSetupCmd.h (86%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlCmd.h (89%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwReq.h (90%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwStatus.h (88%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlStatus.h (86%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwReq.h (89%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwStatus.h (88%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/Adc12Vin.h (71%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/Adc3P3V.h (71%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/Adc5Vin.h (71%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeA1P8V.h (72%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeD1P8V.h (72%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeVcntlp.h (72%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbCtrl3P3V.h (72%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbZeroEncoder.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc1.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc2.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/OnBoardTempSensor.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/PcieId.h (76%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwReq.h (90%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwStatus.h (88%) rename include/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/registerDefinition/trx/TrxRegulatorPg.h (75%) create mode 100644 include/model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.h rename include/model/hardware/core/{ => lowLevelApi}/register/bpiFlash/registerDefinition/McsRdWr.h (76%) rename include/model/hardware/core/{ => lowLevelApi}/register/builtInTest/BuiltInTest.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/builtInTest/registerDefinition/BiteDacMemory.h (85%) rename include/model/hardware/core/{ => lowLevelApi}/register/builtInTest/registerDefinition/BiteDacMemoryCmd.h (78%) rename include/model/hardware/core/{ => lowLevelApi}/register/builtInTest/registerDefinition/BiteDacOutputSelect.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/clockDistributer/ClockDistributer.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/clockDistributer/registerDefinition/ClkDistributionId.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/clockDistributer/registerDefinition/CwModeEnable.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/clockDistributer/registerDefinition/CwModeStatus.h (83%) rename include/model/hardware/core/{ => lowLevelApi}/register/debug/Debug.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/debug/registerDefinition/AdcLoggerCapCmd.h (90%) rename include/model/hardware/core/{ => lowLevelApi}/register/debug/registerDefinition/AdcLoggerDataTransfer.h (87%) rename include/model/hardware/core/{ => lowLevelApi}/register/debug/registerDefinition/AdcLoggerStatus.h (88%) rename include/model/hardware/core/{ => lowLevelApi}/register/debug/registerDefinition/DebuggerMode.h (89%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/Dsp.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/registerDefinition/AtgcLut.h (80%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/registerDefinition/BfScale.h (86%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/registerDefinition/BlendWeight.h (81%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/registerDefinition/DtgcLut.h (79%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/registerDefinition/FrequencyLut.h (80%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/registerDefinition/LineFilterCoefficient.h (86%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/registerDefinition/LpfLut.h (79%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/registerDefinition/ManualAtgc.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/registerDefinition/ReceiverConfigurationLut.h (95%) rename include/model/hardware/core/{ => lowLevelApi}/register/dsp/registerDefinition/StbCoefficient.h (84%) rename include/model/hardware/core/{ => lowLevelApi}/register/emulator/Emulator.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/emulator/registerDefinition/EmulatorActivation.h (79%) rename include/model/hardware/core/{ => lowLevelApi}/register/emulator/registerDefinition/RamAddress.h (77%) rename include/model/hardware/core/{ => lowLevelApi}/register/emulator/registerDefinition/TransferMode.h (85%) rename include/model/hardware/core/{ => lowLevelApi}/register/emulator/registerDefinition/TransferRate.h (77%) rename include/model/hardware/core/{ => lowLevelApi}/register/fpgaProgram/FpgaProgram.h (93%) rename include/model/hardware/core/{ => lowLevelApi}/register/fpgaProgram/registerDefinition/SerialProgramData.h (74%) rename include/model/hardware/core/{ => lowLevelApi}/register/fpgaProgram/registerDefinition/SerialProgramStatus.h (87%) rename include/model/hardware/core/{ => lowLevelApi}/register/fpgaProgram/registerDefinition/SlaveFpgaNumber.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/misc/Misc.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/misc/registerDefinition/AdcDataBram.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/misc/registerDefinition/AdcSamplerControl.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/misc/registerDefinition/AdcSamplerStatus.h (82%) rename include/model/hardware/core/{ => lowLevelApi}/register/misc/registerDefinition/FpgaVersion.h (78%) rename include/model/hardware/core/{ => lowLevelApi}/register/misc/registerDefinition/FrameLostCount.h (77%) rename include/model/hardware/core/{ => lowLevelApi}/register/misc/registerDefinition/GtSendMode.h (78%) rename include/model/hardware/core/{ => lowLevelApi}/register/misc/registerDefinition/StatusVector.h (96%) rename include/model/hardware/core/{ => lowLevelApi}/register/misc/registerDefinition/SyncMode.h (77%) rename include/model/hardware/core/{ => lowLevelApi}/register/scenPlayer/ScenPlayer.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/scenPlayer/registerDefinition/ScenPlayerCtrl.h (75%) rename include/model/hardware/core/{ => lowLevelApi}/register/scenPlayer/registerDefinition/ScenPlayerEndIndex.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/scenPlayer/registerDefinition/ScenPlayerErrorCount.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/scenPlayer/registerDefinition/ScenPlayerStartIndex.h (73%) rename include/model/hardware/core/{ => lowLevelApi}/register/sram/Sram.h (100%) rename include/model/hardware/core/{ => lowLevelApi}/register/sram/registerDefinition/Index.h (93%) rename include/model/hardware/core/{ => lowLevelApi}/register/sram/registerDefinition/RxParams.h (90%) rename include/model/hardware/core/{ => lowLevelApi}/register/sram/registerDefinition/RxParamsDegree.h (90%) rename include/model/hardware/core/{ => lowLevelApi}/register/sram/registerDefinition/RxParamsDelay.h (90%) rename include/model/hardware/core/{ => lowLevelApi}/register/sram/registerDefinition/RxParamsPos.h (92%) rename include/model/hardware/core/{ => lowLevelApi}/register/sram/registerDefinition/SoftwareMetaData.h (85%) rename include/model/hardware/core/{ => lowLevelApi}/register/sram/registerDefinition/SramStructures.h (91%) rename include/model/hardware/core/{ => lowLevelApi}/register/sram/registerDefinition/TxParams.h (90%) rename include/model/hardware/core/{ => lowLevelApi}/register/sram/registerDefinition/TxParamsFocus.h (90%) delete mode 100644 include/model/hardware/core/register/bpiFlash/BpiFlash.h rename src/model/hardware/core/{ => lowLevelApi}/TrxBoard.cpp (97%) rename src/model/hardware/core/{ => lowLevelApi}/register/Field.cpp (98%) rename src/model/hardware/core/{ => lowLevelApi}/register/Register.cpp (98%) rename src/model/hardware/core/{ => lowLevelApi}/register/afe/Afe.cpp (97%) rename src/model/hardware/core/{ => lowLevelApi}/register/beamFormer/BeamFormer.cpp (94%) rename src/model/hardware/core/{ => lowLevelApi}/register/boardsCtrlMngt/BoardsCtrlMngt.cpp (94%) create mode 100644 src/model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.cpp rename src/model/hardware/core/{ => lowLevelApi}/register/builtInTest/BuiltInTest.cpp (93%) rename src/model/hardware/core/{ => lowLevelApi}/register/clockDistributer/ClockDistributer.cpp (92%) rename src/model/hardware/core/{ => lowLevelApi}/register/debug/Debug.cpp (98%) rename src/model/hardware/core/{ => lowLevelApi}/register/dsp/Dsp.cpp (95%) rename src/model/hardware/core/{ => lowLevelApi}/register/emulator/Emulator.cpp (94%) rename src/model/hardware/core/{ => lowLevelApi}/register/fpgaProgram/FpgaProgram.cpp (97%) rename src/model/hardware/core/{ => lowLevelApi}/register/misc/Misc.cpp (98%) rename src/model/hardware/core/{ => lowLevelApi}/register/scenPlayer/ScenPlayer.cpp (91%) rename src/model/hardware/core/{ => lowLevelApi}/register/sram/Sram.cpp (95%) delete mode 100644 src/model/hardware/core/register/bpiFlash/BpiFlash.cpp diff --git a/developHw.pro.user b/developHw.pro.user index e35da08..c43fc1f 100644 --- a/developHw.pro.user +++ b/developHw.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/hdf5Scenario/hdf5Scenario.cpp b/hdf5Scenario/hdf5Scenario.cpp index 321e1d0..d491918 100644 --- a/hdf5Scenario/hdf5Scenario.cpp +++ b/hdf5Scenario/hdf5Scenario.cpp @@ -588,7 +588,7 @@ void Hdf5::scenarioRead(ScenGenHardwareOutput_t &scenParams) { receiverCfgObj.mla = receiverCfgMla.at(j); receiverCfgObj.stb = stb.at(j); - receiverCfgObj.ddcn = ddcEn.at(j); + receiverCfgObj.ddcEn = ddcEn.at(j); receiverCfgObj.absEn = absEn.at(j); receiverCfgObj.dpeEn = dpeEn.at(j); receiverCfgObj.stbEn = stbEn.at(j); @@ -612,7 +612,7 @@ void Hdf5::prbDependParamsRead(ScenPrbDepHardwareParam &prbDepParams) /**************** /registerParameters/apodizationLut ********************/ datasetBranch ("/registerParameters/apodizationLut", floatArray); prbDepParams.prbDepParams.apodizationLut.clear(); - QVector tempApodization; + QList tempApodization; for (quint32 i = 0; i < 4; i++) { @@ -627,7 +627,7 @@ void Hdf5::prbDependParamsRead(ScenPrbDepHardwareParam &prbDepParams) /**************** /registerParameters/aTgcLut ********************/ datasetBranch ("/registerParameters/aTgcLut", floatArray); prbDepParams.prbDepParams.atgcLut.clear(); - QVector tempAtgc; + QList tempAtgc; for (quint32 i = 0; i < 4; i++) { @@ -642,7 +642,7 @@ void Hdf5::prbDependParamsRead(ScenPrbDepHardwareParam &prbDepParams) /**************** /registerParameters/lpfLut ********************/ datasetBranch ("/registerParameters/lpfLut", floatArray); prbDepParams.prbDepParams.lpfLut.clear(); - QVector tempLpf; + QList tempLpf; for (quint32 i = 0; i < 4; i++) { diff --git a/hdf5Scenario/hdf5Scenario.h b/hdf5Scenario/hdf5Scenario.h index 3a458db..03083d3 100644 --- a/hdf5Scenario/hdf5Scenario.h +++ b/hdf5Scenario/hdf5Scenario.h @@ -4,7 +4,7 @@ #include "H5Cpp.h" #include "hdf5.h" #include "H5File.h" -#include "model/hardware/core/TrxBoard.h" +#include "model/hardware/core/lowLevelApi/TrxBoard.h" #define MAX_ARRAY_DEPTH 131072U diff --git a/include/model/hardware/core/HardwareCore.h b/include/model/hardware/core/HardwareCore.h index a41ab25..525c4f6 100644 --- a/include/model/hardware/core/HardwareCore.h +++ b/include/model/hardware/core/HardwareCore.h @@ -5,7 +5,7 @@ #include "model/hardware/core/IBoard.h" #include "model/ultrasoundModule/UsData.h" -#include "model/hardware/core/TrxBoard.h" +#include "model/hardware/core/lowLevelApi/TrxBoard.h" class HardwareCore : public QObject { diff --git a/include/model/hardware/core/TrxBoard.h b/include/model/hardware/core/lowLevelApi/TrxBoard.h similarity index 88% rename from include/model/hardware/core/TrxBoard.h rename to include/model/hardware/core/lowLevelApi/TrxBoard.h index 594feb9..dd900f2 100644 --- a/include/model/hardware/core/TrxBoard.h +++ b/include/model/hardware/core/lowLevelApi/TrxBoard.h @@ -10,19 +10,19 @@ #include #include -#include "model/hardware/core/register/clockDistributer/ClockDistributer.h" -#include "model/hardware/core/register/boardsCtrlMngt/BoardsCtrlMngt.h" -#include "model/hardware/core/register/fpgaProgram/FpgaProgram.h" -#include "model/hardware/core/register/builtInTest/BuiltInTest.h" -#include "model/hardware/core/register/beamFormer/BeamFormer.h" -#include "model/hardware/core/register/scenPlayer/ScenPlayer.h" -#include "model/hardware/core/register/bpiFlash/BpiFlash.h" -#include "model/hardware/core/register/emulator/Emulator.h" -#include "model/hardware/core/register/debug/Debug.h" -#include "model/hardware/core/register/misc/Misc.h" -#include "model/hardware/core/register/sram/Sram.h" -#include "model/hardware/core/register/dsp/Dsp.h" -#include "model/hardware/core/register/afe/Afe.h" +#include "model/hardware/core/lowLevelApi/register/clockDistributer/ClockDistributer.h" +#include "model/hardware/core/lowLevelApi/register/boardsCtrlMngt/BoardsCtrlMngt.h" +#include "model/hardware/core/lowLevelApi/register/fpgaProgram/FpgaProgram.h" +#include "model/hardware/core/lowLevelApi/register/builtInTest/BuiltInTest.h" +#include "model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.h" +#include "model/hardware/core/lowLevelApi/register/scenPlayer/ScenPlayer.h" +#include "model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.h" +#include "model/hardware/core/lowLevelApi/register/emulator/Emulator.h" +#include "model/hardware/core/lowLevelApi/register/debug/Debug.h" +#include "model/hardware/core/lowLevelApi/register/misc/Misc.h" +#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/device/SonoDevice.h" #include "TrxBoardUtils/TrxBoardStructures.h" #include "TrxBoardUtils/ScenParamsRanges.h" @@ -130,7 +130,7 @@ private: struct ScenGenHardwareParam { quint32 focusTypeNumber; quint32 totalTxShotNumber; - QVector rxBeamFormerNumber; + QVector rxBeamFormerNumber; quint32 scenarioStartIndex; quint32 scenarioEndIndex; @@ -145,6 +145,7 @@ private: * _scenParams; void fpgaProgram(const QString path) const; + void mcsRead(const QString path) const; void setScenario(ScenGenHardwareParam* _scenParams); void sramClear (eSramClear clearMode); diff --git a/include/model/hardware/core/TrxBoardUtils/PreProcessorDef.h b/include/model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h similarity index 100% rename from include/model/hardware/core/TrxBoardUtils/PreProcessorDef.h rename to include/model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h diff --git a/include/model/hardware/core/TrxBoardUtils/ScenParamsRanges.h b/include/model/hardware/core/lowLevelApi/TrxBoardUtils/ScenParamsRanges.h similarity index 100% rename from include/model/hardware/core/TrxBoardUtils/ScenParamsRanges.h rename to include/model/hardware/core/lowLevelApi/TrxBoardUtils/ScenParamsRanges.h diff --git a/include/model/hardware/core/TrxBoardUtils/TrxBoardEnums.h b/include/model/hardware/core/lowLevelApi/TrxBoardUtils/TrxBoardEnums.h similarity index 100% rename from include/model/hardware/core/TrxBoardUtils/TrxBoardEnums.h rename to include/model/hardware/core/lowLevelApi/TrxBoardUtils/TrxBoardEnums.h diff --git a/include/model/hardware/core/TrxBoardUtils/TrxBoardStructures.h b/include/model/hardware/core/lowLevelApi/TrxBoardUtils/TrxBoardStructures.h similarity index 86% rename from include/model/hardware/core/TrxBoardUtils/TrxBoardStructures.h rename to include/model/hardware/core/lowLevelApi/TrxBoardUtils/TrxBoardStructures.h index 769c129..226cc6d 100644 --- a/include/model/hardware/core/TrxBoardUtils/TrxBoardStructures.h +++ b/include/model/hardware/core/lowLevelApi/TrxBoardUtils/TrxBoardStructures.h @@ -2,7 +2,7 @@ #define TRXBOARDSTRUCTURES_H #include "TrxBoardEnums.h" -#include "model/hardware/core/TrxBoard.h" +#include "model/hardware/core/lowLevelApi/TrxBoard.h" struct EmulatorProperties { @@ -56,9 +56,9 @@ struct ConnectedPrbInfo struct ScenPrbDepHwRegister { QList lpfScaleCoeff; - QList> lpfLut; - QList> atgcLut; - QList> apodizationLut; + QList> lpfLut; + QList> atgcLut; + QList> apodizationLut; }; struct ScenPrbDepHardwareParam diff --git a/include/model/hardware/core/register/Field.h b/include/model/hardware/core/lowLevelApi/register/Field.h similarity index 100% rename from include/model/hardware/core/register/Field.h rename to include/model/hardware/core/lowLevelApi/register/Field.h diff --git a/include/model/hardware/core/register/RegUtils.h b/include/model/hardware/core/lowLevelApi/register/RegUtils.h similarity index 100% rename from include/model/hardware/core/register/RegUtils.h rename to include/model/hardware/core/lowLevelApi/register/RegUtils.h diff --git a/include/model/hardware/core/register/Register.h b/include/model/hardware/core/lowLevelApi/register/Register.h similarity index 92% rename from include/model/hardware/core/register/Register.h rename to include/model/hardware/core/lowLevelApi/register/Register.h index 00da3b3..ef784e0 100644 --- a/include/model/hardware/core/register/Register.h +++ b/include/model/hardware/core/lowLevelApi/register/Register.h @@ -1,7 +1,7 @@ #ifndef REGISTER_H #define REGISTER_H -#include "model/hardware/core/register/Field.h" +#include "model/hardware/core/lowLevelApi/register/Field.h" #include "model/hardware/device/SonoDevice.h" class Register @@ -30,13 +30,13 @@ protected: QList _fields; - SonoDevice* _device; - public: //Constructor for general Registers: single and array Register(quint8 bar, quint32 offset, SonoDevice* device, quint32 arrayLength = 0); virtual ~Register(); + SonoDevice* _device; + quint32 getValue(); void setValue(quint32 value); diff --git a/include/model/hardware/core/register/afe/Afe.h b/include/model/hardware/core/lowLevelApi/register/afe/Afe.h similarity index 100% rename from include/model/hardware/core/register/afe/Afe.h rename to include/model/hardware/core/lowLevelApi/register/afe/Afe.h diff --git a/include/model/hardware/core/register/afe/registerDefinition/ActiveTerm.h b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/ActiveTerm.h similarity index 92% rename from include/model/hardware/core/register/afe/registerDefinition/ActiveTerm.h rename to include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/ActiveTerm.h index ef7eed4..f88ce59 100644 --- a/include/model/hardware/core/register/afe/registerDefinition/ActiveTerm.h +++ b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/ActiveTerm.h @@ -1,8 +1,8 @@ #ifndef ACTIVETERM_H #define ACTIVETERM_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/afe/registerDefinition/AdcLatency.h b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/AdcLatency.h similarity index 88% rename from include/model/hardware/core/register/afe/registerDefinition/AdcLatency.h rename to include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/AdcLatency.h index 9c40cc0..84bc641 100644 --- a/include/model/hardware/core/register/afe/registerDefinition/AdcLatency.h +++ b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/AdcLatency.h @@ -1,8 +1,8 @@ #ifndef ADCLATENCY_H #define ADCLATENCY_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/afe/registerDefinition/AdcSyncStatus.h b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/AdcSyncStatus.h similarity index 88% rename from include/model/hardware/core/register/afe/registerDefinition/AdcSyncStatus.h rename to include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/AdcSyncStatus.h index aac45a9..35a2383 100644 --- a/include/model/hardware/core/register/afe/registerDefinition/AdcSyncStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/AdcSyncStatus.h @@ -1,8 +1,8 @@ #ifndef ADCSYNCSTATUS_H #define ADCSYNCSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/afe/registerDefinition/Global.h b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/Global.h similarity index 77% rename from include/model/hardware/core/register/afe/registerDefinition/Global.h rename to include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/Global.h index 0aad6a5..cec51cf 100644 --- a/include/model/hardware/core/register/afe/registerDefinition/Global.h +++ b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/Global.h @@ -1,8 +1,8 @@ #ifndef GLOBAL_H #define GLOBAL_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/afe/registerDefinition/LnaHpf.h b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/LnaHpf.h similarity index 77% rename from include/model/hardware/core/register/afe/registerDefinition/LnaHpf.h rename to include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/LnaHpf.h index 81c2376..70d9ab0 100644 --- a/include/model/hardware/core/register/afe/registerDefinition/LnaHpf.h +++ b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/LnaHpf.h @@ -1,8 +1,8 @@ #ifndef LNAHPF_H #define LNAHPF_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/afe/registerDefinition/LowNf.h b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/LowNf.h similarity index 83% rename from include/model/hardware/core/register/afe/registerDefinition/LowNf.h rename to include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/LowNf.h index 039fb6b..bd2a36a 100644 --- a/include/model/hardware/core/register/afe/registerDefinition/LowNf.h +++ b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/LowNf.h @@ -1,8 +1,8 @@ #ifndef LOWNF_H #define LOWNF_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/afe/registerDefinition/Pga.h b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/Pga.h similarity index 88% rename from include/model/hardware/core/register/afe/registerDefinition/Pga.h rename to include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/Pga.h index 6d35a30..f231851 100644 --- a/include/model/hardware/core/register/afe/registerDefinition/Pga.h +++ b/include/model/hardware/core/lowLevelApi/register/afe/registerDefinition/Pga.h @@ -1,8 +1,8 @@ #ifndef PGA_H #define PGA_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/beamFormer/BeamFormer.h b/include/model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.h similarity index 100% rename from include/model/hardware/core/register/beamFormer/BeamFormer.h rename to include/model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.h diff --git a/include/model/hardware/core/register/beamFormer/registerDefinition/AfeLut.h b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/AfeLut.h similarity index 93% rename from include/model/hardware/core/register/beamFormer/registerDefinition/AfeLut.h rename to include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/AfeLut.h index 8eb0221..ae90eec 100644 --- a/include/model/hardware/core/register/beamFormer/registerDefinition/AfeLut.h +++ b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/AfeLut.h @@ -1,8 +1,8 @@ #ifndef AFELUT_H #define AFELUT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/beamFormer/registerDefinition/ApodizationLut.h b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/ApodizationLut.h similarity index 82% rename from include/model/hardware/core/register/beamFormer/registerDefinition/ApodizationLut.h rename to include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/ApodizationLut.h index 8c2ef1a..040491e 100644 --- a/include/model/hardware/core/register/beamFormer/registerDefinition/ApodizationLut.h +++ b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/ApodizationLut.h @@ -1,8 +1,8 @@ #ifndef APODIZATIONLUT_H #define APODIZATIONLUT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/beamFormer/registerDefinition/ElementPositionLut.h b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/ElementPositionLut.h similarity index 83% rename from include/model/hardware/core/register/beamFormer/registerDefinition/ElementPositionLut.h rename to include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/ElementPositionLut.h index 2ab9ba1..7180680 100644 --- a/include/model/hardware/core/register/beamFormer/registerDefinition/ElementPositionLut.h +++ b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/ElementPositionLut.h @@ -1,8 +1,8 @@ #ifndef ELEMENTPOSITIONLUT_H #define ELEMENTPOSITIONLUT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/beamFormer/registerDefinition/PulseLut.h b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/PulseLut.h similarity index 91% rename from include/model/hardware/core/register/beamFormer/registerDefinition/PulseLut.h rename to include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/PulseLut.h index 56284a4..8e90452 100644 --- a/include/model/hardware/core/register/beamFormer/registerDefinition/PulseLut.h +++ b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/PulseLut.h @@ -2,8 +2,8 @@ #define PULSELUT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/beamFormer/registerDefinition/RegValid.h b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/RegValid.h similarity index 73% rename from include/model/hardware/core/register/beamFormer/registerDefinition/RegValid.h rename to include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/RegValid.h index d5ccae9..209bee4 100644 --- a/include/model/hardware/core/register/beamFormer/registerDefinition/RegValid.h +++ b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/RegValid.h @@ -1,8 +1,8 @@ #ifndef REGVALID_H #define REGVALID_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/beamFormer/registerDefinition/RxBeamformerLut.h b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/RxBeamformerLut.h similarity index 88% rename from include/model/hardware/core/register/beamFormer/registerDefinition/RxBeamformerLut.h rename to include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/RxBeamformerLut.h index 349b96c..8a97a3d 100644 --- a/include/model/hardware/core/register/beamFormer/registerDefinition/RxBeamformerLut.h +++ b/include/model/hardware/core/lowLevelApi/register/beamFormer/registerDefinition/RxBeamformerLut.h @@ -1,8 +1,8 @@ #ifndef RXBEAMFORMERLUT_H #define RXBEAMFORMERLUT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/BoardsCtrlMngt.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/BoardsCtrlMngt.h similarity index 94% rename from include/model/hardware/core/register/boardsCtrlMngt/BoardsCtrlMngt.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/BoardsCtrlMngt.h index e53aa64..5e8248c 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/BoardsCtrlMngt.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/BoardsCtrlMngt.h @@ -24,7 +24,8 @@ #define HVB_Offset 1.525f #define HVB_GAIN 2.635f -#define HVA_MAX_VALUE 66U +#define HVA_MAX_VALUE 30.0f +#define HVB_MAX_VALUE 66.0f // must be check enum ePg : bool { diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/BoardsSpecs.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/BoardsSpecs.h similarity index 100% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/BoardsSpecs.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/BoardsSpecs.h diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/FanStatus.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/FanStatus.h similarity index 76% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/FanStatus.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/FanStatus.h index 30dca80..bf2b2d3 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/FanStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/FanStatus.h @@ -1,8 +1,8 @@ #ifndef FANSTATUS_H #define FANSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/FanTacho1.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/FanTacho1.h similarity index 77% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/FanTacho1.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/FanTacho1.h index eaf953c..424c8b0 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/FanTacho1.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/FanTacho1.h @@ -1,8 +1,8 @@ #ifndef FANTACHO1_H #define FANTACHO1_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/FanTacho2.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/FanTacho2.h similarity index 77% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/FanTacho2.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/FanTacho2.h index e56e1ff..ec3066c 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/FanTacho2.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/FanTacho2.h @@ -1,8 +1,8 @@ #ifndef FANTACHO2_H #define FANTACHO2_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwReq.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwReq.h similarity index 90% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwReq.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwReq.h index a008029..acd2b2b 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwReq.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwReq.h @@ -1,8 +1,8 @@ #ifndef MPSEEPROMRWREQ_H #define MPSEEPROMRWREQ_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwStatus.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwStatus.h similarity index 88% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwStatus.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwStatus.h index 2cb090c..768e66d 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsEepromRwStatus.h @@ -1,8 +1,8 @@ #ifndef MPSEEPROMRWSTATUS_H #define MPSEEPROMRWSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsHvRegulatorClk.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsHvRegulatorClk.h similarity index 82% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsHvRegulatorClk.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsHvRegulatorClk.h index 929c71e..c98eb27 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsHvRegulatorClk.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsHvRegulatorClk.h @@ -1,8 +1,8 @@ #ifndef MPSHVREGULATORCLK_H #define MPSHVREGULATORCLK_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsHvStopState.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsHvStopState.h similarity index 83% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsHvStopState.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsHvStopState.h index 068dd1e..133cc15 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsHvStopState.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsHvStopState.h @@ -1,8 +1,8 @@ #ifndef MPSHVSTOPSTATE_H #define MPSHVSTOPSTATE_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsPm5RegulatorClk.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsPm5RegulatorClk.h similarity index 82% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsPm5RegulatorClk.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsPm5RegulatorClk.h index 3be731f..5fc54ea 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/MpsPm5RegulatorClk.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/MpsPm5RegulatorClk.h @@ -1,8 +1,8 @@ #ifndef MPSPM5REGULATORCLK_H #define MPSPM5REGULATORCLK_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorDacValue.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorDacValue.h similarity index 83% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorDacValue.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorDacValue.h index f37f585..327c70e 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorDacValue.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorDacValue.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORDACVALUE_H #define SUPERVISORDACVALUE_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorFaultStatus.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorFaultStatus.h similarity index 94% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorFaultStatus.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorFaultStatus.h index af1e087..0621a16 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorFaultStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorFaultStatus.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORFAULTSTATUS_H #define SUPERVISORFAULTSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorI2cStatus.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorI2cStatus.h similarity index 80% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorI2cStatus.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorI2cStatus.h index f280cb7..62484e4 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorI2cStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorI2cStatus.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORI2CSTATUS_H #define SUPERVISORI2CSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCmd.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCmd.h similarity index 82% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCmd.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCmd.h index 1c85adb..ba8488a 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCmd.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCmd.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBCMD_H #define SUPERVISORRBCMD_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCurr24V.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCurr24V.h similarity index 75% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCurr24V.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCurr24V.h index 230bee6..e24040c 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCurr24V.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCurr24V.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBCURR24V_H #define SUPERVISORRBCURR24V_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCwdp.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCwdp.h similarity index 73% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCwdp.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCwdp.h index bb7c503..8754e01 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCwdp.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbCwdp.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBCWDP_H #define SUPERVISORRBCWDP_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvStop.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvStop.h similarity index 74% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvStop.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvStop.h index f06d821..2b6be7d 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvStop.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvStop.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBHVSTOP_H #define SUPERVISORRBHVSTOP_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvap.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvap.h similarity index 73% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvap.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvap.h index 66faf78..e2d7190 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvap.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvap.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBHVAP_H #define SUPERVISORRBHVAP_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvbp.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvbp.h similarity index 73% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvbp.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvbp.h index 3e80d8e..5fe2309 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvbp.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbHvbp.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBHVBP_H #define SUPERVISORRBHVBP_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbM5V.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbM5V.h similarity index 73% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbM5V.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbM5V.h index 2c998f8..1dc2897 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbM5V.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbM5V.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBM5V_H #define SUPERVISORRBM5V_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP12V.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP12V.h similarity index 73% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP12V.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP12V.h index b009393..124162f 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP12V.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP12V.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBP12V_H #define SUPERVISORRBP12V_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP24V.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP24V.h similarity index 73% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP24V.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP24V.h index 7e5f6e8..f41485a 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP24V.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP24V.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBP24V_H #define SUPERVISORRBP24V_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP4d.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP4d.h similarity index 73% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP4d.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP4d.h index 5c87959..b619af6 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP4d.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP4d.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBP4D_H #define SUPERVISORRBP4D_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP5V.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP5V.h similarity index 73% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP5V.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP5V.h index c733700..757c222 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP5V.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRbP5V.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRBP5V_H #define SUPERVISORRBP5V_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRdData.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRdData.h similarity index 72% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRdData.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRdData.h index 25ccab9..3c9b277 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRdData.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRdData.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRDDATA_H #define SUPERVISORRDDATA_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRwReq.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRwReq.h similarity index 81% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRwReq.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRwReq.h index afbfcaa..ffa14f2 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRwReq.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorRwReq.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORRWREQ_H #define SUPERVISORRWREQ_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorSetupCmd.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorSetupCmd.h similarity index 86% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorSetupCmd.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorSetupCmd.h index 1ba3728..aff4e22 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/mps/SupervisorSetupCmd.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/mps/SupervisorSetupCmd.h @@ -1,8 +1,8 @@ #ifndef SUPERVISORSETUPCMD_H #define SUPERVISORSETUPCMD_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlCmd.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlCmd.h similarity index 89% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlCmd.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlCmd.h index 7df5cdd..7f5f451 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlCmd.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlCmd.h @@ -1,8 +1,8 @@ #ifndef PRBCTRLCMD_H #define PRBCTRLCMD_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwReq.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwReq.h similarity index 90% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwReq.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwReq.h index b55f12d..378d15b 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwReq.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwReq.h @@ -1,8 +1,8 @@ #ifndef PRBCTRLEEPROMRWREQ_H #define PRBCTRLEEPROMRWREQ_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwStatus.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwStatus.h similarity index 88% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwStatus.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwStatus.h index d19b174..3769558 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlEepromRwStatus.h @@ -1,8 +1,8 @@ #ifndef PRBCTRLEEPROMRWSTATUS_H #define PRBCTRLEEPROMRWSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlStatus.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlStatus.h similarity index 86% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlStatus.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlStatus.h index 5bd4422..a762c13 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbCtrlStatus.h @@ -1,8 +1,8 @@ #ifndef PRBCTRLSTATUS_H #define PRBCTRLSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwReq.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwReq.h similarity index 89% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwReq.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwReq.h index e474925..8acd7b5 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwReq.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwReq.h @@ -1,8 +1,8 @@ #ifndef PRBEEPROMRWREQ_H #define PRBEEPROMRWREQ_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwStatus.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwStatus.h similarity index 88% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwStatus.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwStatus.h index 02ea4ba..de24b4e 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/probe/PrbEepromRwStatus.h @@ -1,8 +1,8 @@ #ifndef PRBEEPROMRWSTATUS_H #define PRBEEPROMRWSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/Adc12Vin.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/Adc12Vin.h similarity index 71% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/Adc12Vin.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/Adc12Vin.h index 73d7d37..9ccab05 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/Adc12Vin.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/Adc12Vin.h @@ -1,8 +1,8 @@ #ifndef ADC12VIN_H #define ADC12VIN_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/Adc3P3V.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/Adc3P3V.h similarity index 71% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/Adc3P3V.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/Adc3P3V.h index 0e9b75f..698d0ff 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/Adc3P3V.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/Adc3P3V.h @@ -1,8 +1,8 @@ #ifndef ADC3P3V_H #define ADC3P3V_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/Adc5Vin.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/Adc5Vin.h similarity index 71% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/Adc5Vin.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/Adc5Vin.h index ed1b99e..14e4ad9 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/Adc5Vin.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/Adc5Vin.h @@ -1,8 +1,8 @@ #ifndef ADC5VIN_H #define ADC5VIN_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeA1P8V.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeA1P8V.h similarity index 72% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeA1P8V.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeA1P8V.h index 85172df..61b8304 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeA1P8V.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeA1P8V.h @@ -1,8 +1,8 @@ #ifndef ADCAFEA1P8V_H #define ADCAFEA1P8V_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeD1P8V.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeD1P8V.h similarity index 72% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeD1P8V.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeD1P8V.h index 60796bf..214a7c0 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeD1P8V.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeD1P8V.h @@ -1,8 +1,8 @@ #ifndef ADCAFED1P8V_H #define ADCAFED1P8V_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeVcntlp.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeVcntlp.h similarity index 72% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeVcntlp.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeVcntlp.h index 826f268..ce73bb3 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeVcntlp.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcAfeVcntlp.h @@ -1,8 +1,8 @@ #ifndef ADCAFEVCNTLP_H #define ADCAFEVCNTLP_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbCtrl3P3V.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbCtrl3P3V.h similarity index 72% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbCtrl3P3V.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbCtrl3P3V.h index ff3713d..5823684 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbCtrl3P3V.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbCtrl3P3V.h @@ -1,8 +1,8 @@ #ifndef ADCPRBCTRL3P3V_H #define ADCPRBCTRL3P3V_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbZeroEncoder.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbZeroEncoder.h similarity index 73% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbZeroEncoder.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbZeroEncoder.h index f3d2dd3..6e4b895 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbZeroEncoder.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/AdcPrbZeroEncoder.h @@ -1,8 +1,8 @@ #ifndef ADCPRBZEROENCODER_H #define ADCPRBZEROENCODER_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc1.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc1.h similarity index 82% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc1.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc1.h index 426e3fb..98c780d 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc1.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc1.h @@ -1,8 +1,8 @@ #ifndef FPGAXADC1_H #define FPGAXADC1_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc2.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc2.h similarity index 82% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc2.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc2.h index fd27758..1637174 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc2.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/FpgaXadc2.h @@ -1,8 +1,8 @@ #ifndef FPGAXADC2_H #define FPGAXADC2_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/OnBoardTempSensor.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/OnBoardTempSensor.h similarity index 73% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/OnBoardTempSensor.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/OnBoardTempSensor.h index f659fcb..2d9092c 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/OnBoardTempSensor.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/OnBoardTempSensor.h @@ -1,8 +1,8 @@ #ifndef ONBOARDTEMPSENSOR_H #define ONBOARDTEMPSENSOR_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/PcieId.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/PcieId.h similarity index 76% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/PcieId.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/PcieId.h index 2a03fff..6e95107 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/PcieId.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/PcieId.h @@ -1,8 +1,8 @@ #ifndef PCIEID_H #define PCIEID_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwReq.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwReq.h similarity index 90% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwReq.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwReq.h index 199bf26..a398150 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwReq.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwReq.h @@ -1,8 +1,8 @@ #ifndef TRXEEPROMRWREQ_H #define TRXEEPROMRWREQ_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwStatus.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwStatus.h similarity index 88% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwStatus.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwStatus.h index 59e0639..687dbc5 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/TrxEepromRwStatus.h @@ -1,8 +1,8 @@ #ifndef TRXEEPROMRWSTATUS_H #define TRXEEPROMRWSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/TrxRegulatorPg.h b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/TrxRegulatorPg.h similarity index 75% rename from include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/TrxRegulatorPg.h rename to include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/TrxRegulatorPg.h index 8eccb15..38a7819 100644 --- a/include/model/hardware/core/register/boardsCtrlMngt/registerDefinition/trx/TrxRegulatorPg.h +++ b/include/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/registerDefinition/trx/TrxRegulatorPg.h @@ -1,8 +1,8 @@ #ifndef TRXREGULATORPG_H #define TRXREGULATORPG_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.h b/include/model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.h new file mode 100644 index 0000000..27bc6bd --- /dev/null +++ b/include/model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.h @@ -0,0 +1,29 @@ +#ifndef BPIFLASH_H +#define BPIFLASH_H + +#include "registerDefinition/McsRdWr.h" +#include "model/hardware/core/lowLevelApi/register/fpgaProgram/FpgaProgram.h" + +class BpiFlash +{ +private: + McsRdWr* _mcsRdWr; + + void bpiInitialize(void) const; + void bpiReset(void) const; + void bpiErase(void) const; + void bpiRead(void) const; + void bpiWrite(void) const; + +public: + explicit BpiFlash(SonoDevice* device); + ~BpiFlash(); + + void writeMcs (QByteArray& mcs) const; + QList readMcs (void) const; + + void readCommand(void) const; + void writeCommand(void) const; +}; + +#endif // BPIFLASH_H diff --git a/include/model/hardware/core/register/bpiFlash/registerDefinition/McsRdWr.h b/include/model/hardware/core/lowLevelApi/register/bpiFlash/registerDefinition/McsRdWr.h similarity index 76% rename from include/model/hardware/core/register/bpiFlash/registerDefinition/McsRdWr.h rename to include/model/hardware/core/lowLevelApi/register/bpiFlash/registerDefinition/McsRdWr.h index bb87e89..ff68489 100644 --- a/include/model/hardware/core/register/bpiFlash/registerDefinition/McsRdWr.h +++ b/include/model/hardware/core/lowLevelApi/register/bpiFlash/registerDefinition/McsRdWr.h @@ -1,16 +1,16 @@ #ifndef MCSRDWR_H #define MCSRDWR_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.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 0X8000000 -#define MCS_FILE_SIZE 27*1024*1024 // now and must be modified +#define OFFSET 0X4000000 +#define MCS_FILE_SIZE 32*1024*1024 class McsRdWr : public Register { diff --git a/include/model/hardware/core/register/builtInTest/BuiltInTest.h b/include/model/hardware/core/lowLevelApi/register/builtInTest/BuiltInTest.h similarity index 100% rename from include/model/hardware/core/register/builtInTest/BuiltInTest.h rename to include/model/hardware/core/lowLevelApi/register/builtInTest/BuiltInTest.h diff --git a/include/model/hardware/core/register/builtInTest/registerDefinition/BiteDacMemory.h b/include/model/hardware/core/lowLevelApi/register/builtInTest/registerDefinition/BiteDacMemory.h similarity index 85% rename from include/model/hardware/core/register/builtInTest/registerDefinition/BiteDacMemory.h rename to include/model/hardware/core/lowLevelApi/register/builtInTest/registerDefinition/BiteDacMemory.h index 75796a5..9ab0e1d 100644 --- a/include/model/hardware/core/register/builtInTest/registerDefinition/BiteDacMemory.h +++ b/include/model/hardware/core/lowLevelApi/register/builtInTest/registerDefinition/BiteDacMemory.h @@ -1,8 +1,8 @@ #ifndef BITEDACMEMORY_H #define BITEDACMEMORY_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/builtInTest/registerDefinition/BiteDacMemoryCmd.h b/include/model/hardware/core/lowLevelApi/register/builtInTest/registerDefinition/BiteDacMemoryCmd.h similarity index 78% rename from include/model/hardware/core/register/builtInTest/registerDefinition/BiteDacMemoryCmd.h rename to include/model/hardware/core/lowLevelApi/register/builtInTest/registerDefinition/BiteDacMemoryCmd.h index 450ec1d..bcd44e7 100644 --- a/include/model/hardware/core/register/builtInTest/registerDefinition/BiteDacMemoryCmd.h +++ b/include/model/hardware/core/lowLevelApi/register/builtInTest/registerDefinition/BiteDacMemoryCmd.h @@ -1,8 +1,8 @@ #ifndef BITEDACMEMORYCMD_H #define BITEDACMEMORYCMD_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/builtInTest/registerDefinition/BiteDacOutputSelect.h b/include/model/hardware/core/lowLevelApi/register/builtInTest/registerDefinition/BiteDacOutputSelect.h similarity index 82% rename from include/model/hardware/core/register/builtInTest/registerDefinition/BiteDacOutputSelect.h rename to include/model/hardware/core/lowLevelApi/register/builtInTest/registerDefinition/BiteDacOutputSelect.h index 01e1303..5fc5026 100644 --- a/include/model/hardware/core/register/builtInTest/registerDefinition/BiteDacOutputSelect.h +++ b/include/model/hardware/core/lowLevelApi/register/builtInTest/registerDefinition/BiteDacOutputSelect.h @@ -1,8 +1,8 @@ #ifndef BITEDACOUTPUTSELECT_H #define BITEDACOUTPUTSELECT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/clockDistributer/ClockDistributer.h b/include/model/hardware/core/lowLevelApi/register/clockDistributer/ClockDistributer.h similarity index 100% rename from include/model/hardware/core/register/clockDistributer/ClockDistributer.h rename to include/model/hardware/core/lowLevelApi/register/clockDistributer/ClockDistributer.h diff --git a/include/model/hardware/core/register/clockDistributer/registerDefinition/ClkDistributionId.h b/include/model/hardware/core/lowLevelApi/register/clockDistributer/registerDefinition/ClkDistributionId.h similarity index 73% rename from include/model/hardware/core/register/clockDistributer/registerDefinition/ClkDistributionId.h rename to include/model/hardware/core/lowLevelApi/register/clockDistributer/registerDefinition/ClkDistributionId.h index 344546d..93236f2 100644 --- a/include/model/hardware/core/register/clockDistributer/registerDefinition/ClkDistributionId.h +++ b/include/model/hardware/core/lowLevelApi/register/clockDistributer/registerDefinition/ClkDistributionId.h @@ -1,8 +1,8 @@ #ifndef CLKDISTRIBUTIONID_H #define CLKDISTRIBUTIONID_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/clockDistributer/registerDefinition/CwModeEnable.h b/include/model/hardware/core/lowLevelApi/register/clockDistributer/registerDefinition/CwModeEnable.h similarity index 82% rename from include/model/hardware/core/register/clockDistributer/registerDefinition/CwModeEnable.h rename to include/model/hardware/core/lowLevelApi/register/clockDistributer/registerDefinition/CwModeEnable.h index c5ec3c9..50e71c4 100644 --- a/include/model/hardware/core/register/clockDistributer/registerDefinition/CwModeEnable.h +++ b/include/model/hardware/core/lowLevelApi/register/clockDistributer/registerDefinition/CwModeEnable.h @@ -1,8 +1,8 @@ #ifndef CWMODEENABLE_H #define CWMODEENABLE_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/clockDistributer/registerDefinition/CwModeStatus.h b/include/model/hardware/core/lowLevelApi/register/clockDistributer/registerDefinition/CwModeStatus.h similarity index 83% rename from include/model/hardware/core/register/clockDistributer/registerDefinition/CwModeStatus.h rename to include/model/hardware/core/lowLevelApi/register/clockDistributer/registerDefinition/CwModeStatus.h index 59303c6..ae96324 100644 --- a/include/model/hardware/core/register/clockDistributer/registerDefinition/CwModeStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/clockDistributer/registerDefinition/CwModeStatus.h @@ -1,8 +1,8 @@ #ifndef CWMODESTATUS_H #define CWMODESTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/debug/Debug.h b/include/model/hardware/core/lowLevelApi/register/debug/Debug.h similarity index 100% rename from include/model/hardware/core/register/debug/Debug.h rename to include/model/hardware/core/lowLevelApi/register/debug/Debug.h diff --git a/include/model/hardware/core/register/debug/registerDefinition/AdcLoggerCapCmd.h b/include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/AdcLoggerCapCmd.h similarity index 90% rename from include/model/hardware/core/register/debug/registerDefinition/AdcLoggerCapCmd.h rename to include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/AdcLoggerCapCmd.h index 2172dd0..724feed 100644 --- a/include/model/hardware/core/register/debug/registerDefinition/AdcLoggerCapCmd.h +++ b/include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/AdcLoggerCapCmd.h @@ -1,8 +1,8 @@ #ifndef ADCLOGGERCAPCMD_H #define ADCLOGGERCAPCMD_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/debug/registerDefinition/AdcLoggerDataTransfer.h b/include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/AdcLoggerDataTransfer.h similarity index 87% rename from include/model/hardware/core/register/debug/registerDefinition/AdcLoggerDataTransfer.h rename to include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/AdcLoggerDataTransfer.h index 55e5920..38b4015 100644 --- a/include/model/hardware/core/register/debug/registerDefinition/AdcLoggerDataTransfer.h +++ b/include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/AdcLoggerDataTransfer.h @@ -1,8 +1,8 @@ #ifndef ADCLOGGERDATATRANSFER_H #define ADCLOGGERDATATRANSFER_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/debug/registerDefinition/AdcLoggerStatus.h b/include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/AdcLoggerStatus.h similarity index 88% rename from include/model/hardware/core/register/debug/registerDefinition/AdcLoggerStatus.h rename to include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/AdcLoggerStatus.h index 6044951..5d73083 100644 --- a/include/model/hardware/core/register/debug/registerDefinition/AdcLoggerStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/AdcLoggerStatus.h @@ -1,8 +1,8 @@ #ifndef ADCLOGGERSTATUS_H #define ADCLOGGERSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/debug/registerDefinition/DebuggerMode.h b/include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/DebuggerMode.h similarity index 89% rename from include/model/hardware/core/register/debug/registerDefinition/DebuggerMode.h rename to include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/DebuggerMode.h index 2bcc166..0e1b0c6 100644 --- a/include/model/hardware/core/register/debug/registerDefinition/DebuggerMode.h +++ b/include/model/hardware/core/lowLevelApi/register/debug/registerDefinition/DebuggerMode.h @@ -1,8 +1,8 @@ #ifndef DEBUGGERMODE_H #define DEBUGGERMODE_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/dsp/Dsp.h b/include/model/hardware/core/lowLevelApi/register/dsp/Dsp.h similarity index 100% rename from include/model/hardware/core/register/dsp/Dsp.h rename to include/model/hardware/core/lowLevelApi/register/dsp/Dsp.h diff --git a/include/model/hardware/core/register/dsp/registerDefinition/AtgcLut.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/AtgcLut.h similarity index 80% rename from include/model/hardware/core/register/dsp/registerDefinition/AtgcLut.h rename to include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/AtgcLut.h index 3dfb9b3..02cb821 100644 --- a/include/model/hardware/core/register/dsp/registerDefinition/AtgcLut.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/AtgcLut.h @@ -1,8 +1,8 @@ #ifndef ATGCLUT_H #define ATGCLUT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/dsp/registerDefinition/BfScale.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/BfScale.h similarity index 86% rename from include/model/hardware/core/register/dsp/registerDefinition/BfScale.h rename to include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/BfScale.h index bd8e565..50828c9 100644 --- a/include/model/hardware/core/register/dsp/registerDefinition/BfScale.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/BfScale.h @@ -1,8 +1,8 @@ #ifndef BFSCALE_H #define BFSCALE_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/dsp/registerDefinition/BlendWeight.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/BlendWeight.h similarity index 81% rename from include/model/hardware/core/register/dsp/registerDefinition/BlendWeight.h rename to include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/BlendWeight.h index af1038b..ca45f9a 100644 --- a/include/model/hardware/core/register/dsp/registerDefinition/BlendWeight.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/BlendWeight.h @@ -1,8 +1,8 @@ #ifndef BLENDWEIGHT_H #define BLENDWEIGHT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/dsp/registerDefinition/DtgcLut.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/DtgcLut.h similarity index 79% rename from include/model/hardware/core/register/dsp/registerDefinition/DtgcLut.h rename to include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/DtgcLut.h index 619a5cf..5c9fd98 100644 --- a/include/model/hardware/core/register/dsp/registerDefinition/DtgcLut.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/DtgcLut.h @@ -1,8 +1,8 @@ #ifndef DTGCLUT_H #define DTGCLUT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/dsp/registerDefinition/FrequencyLut.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/FrequencyLut.h similarity index 80% rename from include/model/hardware/core/register/dsp/registerDefinition/FrequencyLut.h rename to include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/FrequencyLut.h index f3761d7..ce36973 100644 --- a/include/model/hardware/core/register/dsp/registerDefinition/FrequencyLut.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/FrequencyLut.h @@ -1,8 +1,8 @@ #ifndef FREQUENCYLUT_H #define FREQUENCYLUT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/dsp/registerDefinition/LineFilterCoefficient.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/LineFilterCoefficient.h similarity index 86% rename from include/model/hardware/core/register/dsp/registerDefinition/LineFilterCoefficient.h rename to include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/LineFilterCoefficient.h index b74d1ec..0ab88b1 100644 --- a/include/model/hardware/core/register/dsp/registerDefinition/LineFilterCoefficient.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/LineFilterCoefficient.h @@ -1,8 +1,8 @@ #ifndef LINEFILTERCOEFFICIENT_H #define LINEFILTERCOEFFICIENT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/dsp/registerDefinition/LpfLut.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/LpfLut.h similarity index 79% rename from include/model/hardware/core/register/dsp/registerDefinition/LpfLut.h rename to include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/LpfLut.h index b38a6e6..e0e1b25 100644 --- a/include/model/hardware/core/register/dsp/registerDefinition/LpfLut.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/LpfLut.h @@ -1,8 +1,8 @@ #ifndef LPFLUT_H #define LPFLUT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/dsp/registerDefinition/ManualAtgc.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ManualAtgc.h similarity index 82% rename from include/model/hardware/core/register/dsp/registerDefinition/ManualAtgc.h rename to include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ManualAtgc.h index ff05d78..6f50dd6 100644 --- a/include/model/hardware/core/register/dsp/registerDefinition/ManualAtgc.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ManualAtgc.h @@ -1,8 +1,8 @@ #ifndef MANUALATGC_H #define MANUALATGC_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/dsp/registerDefinition/ReceiverConfigurationLut.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ReceiverConfigurationLut.h similarity index 95% rename from include/model/hardware/core/register/dsp/registerDefinition/ReceiverConfigurationLut.h rename to include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ReceiverConfigurationLut.h index f050aa6..18c84a6 100644 --- a/include/model/hardware/core/register/dsp/registerDefinition/ReceiverConfigurationLut.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/ReceiverConfigurationLut.h @@ -1,8 +1,8 @@ #ifndef RECEIVERCONFIGURATIONLUT_H #define RECEIVERCONFIGURATIONLUT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/dsp/registerDefinition/StbCoefficient.h b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/StbCoefficient.h similarity index 84% rename from include/model/hardware/core/register/dsp/registerDefinition/StbCoefficient.h rename to include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/StbCoefficient.h index ace6c11..76c94ce 100644 --- a/include/model/hardware/core/register/dsp/registerDefinition/StbCoefficient.h +++ b/include/model/hardware/core/lowLevelApi/register/dsp/registerDefinition/StbCoefficient.h @@ -1,8 +1,8 @@ #ifndef STBCOEFFICIENT_H #define STBCOEFFICIENT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/emulator/Emulator.h b/include/model/hardware/core/lowLevelApi/register/emulator/Emulator.h similarity index 100% rename from include/model/hardware/core/register/emulator/Emulator.h rename to include/model/hardware/core/lowLevelApi/register/emulator/Emulator.h diff --git a/include/model/hardware/core/register/emulator/registerDefinition/EmulatorActivation.h b/include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/EmulatorActivation.h similarity index 79% rename from include/model/hardware/core/register/emulator/registerDefinition/EmulatorActivation.h rename to include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/EmulatorActivation.h index 5ddd60d..4eb6eff 100644 --- a/include/model/hardware/core/register/emulator/registerDefinition/EmulatorActivation.h +++ b/include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/EmulatorActivation.h @@ -1,8 +1,8 @@ #ifndef EMULATORACTIVATION_H #define EMULATORACTIVATION_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/emulator/registerDefinition/RamAddress.h b/include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/RamAddress.h similarity index 77% rename from include/model/hardware/core/register/emulator/registerDefinition/RamAddress.h rename to include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/RamAddress.h index 9d6c6ea..c0f94c7 100644 --- a/include/model/hardware/core/register/emulator/registerDefinition/RamAddress.h +++ b/include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/RamAddress.h @@ -1,8 +1,8 @@ #ifndef RAMADDRESS_H #define RAMADDRESS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/emulator/registerDefinition/TransferMode.h b/include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/TransferMode.h similarity index 85% rename from include/model/hardware/core/register/emulator/registerDefinition/TransferMode.h rename to include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/TransferMode.h index bc4a4b0..fe2b805 100644 --- a/include/model/hardware/core/register/emulator/registerDefinition/TransferMode.h +++ b/include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/TransferMode.h @@ -1,8 +1,8 @@ #ifndef TRANSFERMODE_H #define TRANSFERMODE_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/emulator/registerDefinition/TransferRate.h b/include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/TransferRate.h similarity index 77% rename from include/model/hardware/core/register/emulator/registerDefinition/TransferRate.h rename to include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/TransferRate.h index d839e2c..5f9cd3b 100644 --- a/include/model/hardware/core/register/emulator/registerDefinition/TransferRate.h +++ b/include/model/hardware/core/lowLevelApi/register/emulator/registerDefinition/TransferRate.h @@ -1,8 +1,8 @@ #ifndef TRANSFERRATE_H #define TRANSFERRATE_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/fpgaProgram/FpgaProgram.h b/include/model/hardware/core/lowLevelApi/register/fpgaProgram/FpgaProgram.h similarity index 93% rename from include/model/hardware/core/register/fpgaProgram/FpgaProgram.h rename to include/model/hardware/core/lowLevelApi/register/fpgaProgram/FpgaProgram.h index fb71047..c211c30 100644 --- a/include/model/hardware/core/register/fpgaProgram/FpgaProgram.h +++ b/include/model/hardware/core/lowLevelApi/register/fpgaProgram/FpgaProgram.h @@ -6,7 +6,7 @@ #include #include -#include "model/hardware/core/TrxBoardUtils/PreProcessorDef.h" +#include "model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h" #include "registerDefinition/SlaveFpgaNumber.h" #include "registerDefinition/SerialProgramData.h" #include "registerDefinition/SerialProgramStatus.h" diff --git a/include/model/hardware/core/register/fpgaProgram/registerDefinition/SerialProgramData.h b/include/model/hardware/core/lowLevelApi/register/fpgaProgram/registerDefinition/SerialProgramData.h similarity index 74% rename from include/model/hardware/core/register/fpgaProgram/registerDefinition/SerialProgramData.h rename to include/model/hardware/core/lowLevelApi/register/fpgaProgram/registerDefinition/SerialProgramData.h index 1c09709..4ca23ba 100644 --- a/include/model/hardware/core/register/fpgaProgram/registerDefinition/SerialProgramData.h +++ b/include/model/hardware/core/lowLevelApi/register/fpgaProgram/registerDefinition/SerialProgramData.h @@ -1,8 +1,8 @@ #ifndef SERIALPROGRAMDATA_H #define SERIALPROGRAMDATA_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/fpgaProgram/registerDefinition/SerialProgramStatus.h b/include/model/hardware/core/lowLevelApi/register/fpgaProgram/registerDefinition/SerialProgramStatus.h similarity index 87% rename from include/model/hardware/core/register/fpgaProgram/registerDefinition/SerialProgramStatus.h rename to include/model/hardware/core/lowLevelApi/register/fpgaProgram/registerDefinition/SerialProgramStatus.h index 596f53d..5cc0b71 100644 --- a/include/model/hardware/core/register/fpgaProgram/registerDefinition/SerialProgramStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/fpgaProgram/registerDefinition/SerialProgramStatus.h @@ -1,8 +1,8 @@ #ifndef SERIALPROGRAMSTATUS_H #define SERIALPROGRAMSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/fpgaProgram/registerDefinition/SlaveFpgaNumber.h b/include/model/hardware/core/lowLevelApi/register/fpgaProgram/registerDefinition/SlaveFpgaNumber.h similarity index 73% rename from include/model/hardware/core/register/fpgaProgram/registerDefinition/SlaveFpgaNumber.h rename to include/model/hardware/core/lowLevelApi/register/fpgaProgram/registerDefinition/SlaveFpgaNumber.h index b8b7792..b751c69 100644 --- a/include/model/hardware/core/register/fpgaProgram/registerDefinition/SlaveFpgaNumber.h +++ b/include/model/hardware/core/lowLevelApi/register/fpgaProgram/registerDefinition/SlaveFpgaNumber.h @@ -1,8 +1,8 @@ #ifndef SLAVEFPGANUMBER_H #define SLAVEFPGANUMBER_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/misc/Misc.h b/include/model/hardware/core/lowLevelApi/register/misc/Misc.h similarity index 100% rename from include/model/hardware/core/register/misc/Misc.h rename to include/model/hardware/core/lowLevelApi/register/misc/Misc.h diff --git a/include/model/hardware/core/register/misc/registerDefinition/AdcDataBram.h b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/AdcDataBram.h similarity index 82% rename from include/model/hardware/core/register/misc/registerDefinition/AdcDataBram.h rename to include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/AdcDataBram.h index ec8bda2..d6c55f7 100644 --- a/include/model/hardware/core/register/misc/registerDefinition/AdcDataBram.h +++ b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/AdcDataBram.h @@ -1,8 +1,8 @@ #ifndef ADCDATABRAM_H #define ADCDATABRAM_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/misc/registerDefinition/AdcSamplerControl.h b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/AdcSamplerControl.h similarity index 82% rename from include/model/hardware/core/register/misc/registerDefinition/AdcSamplerControl.h rename to include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/AdcSamplerControl.h index 85e7b75..6992745 100644 --- a/include/model/hardware/core/register/misc/registerDefinition/AdcSamplerControl.h +++ b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/AdcSamplerControl.h @@ -1,8 +1,8 @@ #ifndef ADCSAMPLERCONTROL_H #define ADCSAMPLERCONTROL_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/misc/registerDefinition/AdcSamplerStatus.h b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/AdcSamplerStatus.h similarity index 82% rename from include/model/hardware/core/register/misc/registerDefinition/AdcSamplerStatus.h rename to include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/AdcSamplerStatus.h index 21116df..996198d 100644 --- a/include/model/hardware/core/register/misc/registerDefinition/AdcSamplerStatus.h +++ b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/AdcSamplerStatus.h @@ -1,8 +1,8 @@ #ifndef ADCSAMPLERSTATUS_H #define ADCSAMPLERSTATUS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/misc/registerDefinition/FpgaVersion.h b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/FpgaVersion.h similarity index 78% rename from include/model/hardware/core/register/misc/registerDefinition/FpgaVersion.h rename to include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/FpgaVersion.h index 4b8b1f8..b4e2881 100644 --- a/include/model/hardware/core/register/misc/registerDefinition/FpgaVersion.h +++ b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/FpgaVersion.h @@ -1,8 +1,8 @@ #ifndef FPGAVERSION_H #define FPGAVERSION_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/misc/registerDefinition/FrameLostCount.h b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/FrameLostCount.h similarity index 77% rename from include/model/hardware/core/register/misc/registerDefinition/FrameLostCount.h rename to include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/FrameLostCount.h index db0a606..450e221 100644 --- a/include/model/hardware/core/register/misc/registerDefinition/FrameLostCount.h +++ b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/FrameLostCount.h @@ -1,8 +1,8 @@ #ifndef FRAMELOSTCOUNT_H #define FRAMELOSTCOUNT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/misc/registerDefinition/GtSendMode.h b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/GtSendMode.h similarity index 78% rename from include/model/hardware/core/register/misc/registerDefinition/GtSendMode.h rename to include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/GtSendMode.h index 548b15d..355d875 100644 --- a/include/model/hardware/core/register/misc/registerDefinition/GtSendMode.h +++ b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/GtSendMode.h @@ -1,8 +1,8 @@ #ifndef GTSENDMODE_H #define GTSENDMODE_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/misc/registerDefinition/StatusVector.h b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/StatusVector.h similarity index 96% rename from include/model/hardware/core/register/misc/registerDefinition/StatusVector.h rename to include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/StatusVector.h index 86564e1..3e7d6cd 100644 --- a/include/model/hardware/core/register/misc/registerDefinition/StatusVector.h +++ b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/StatusVector.h @@ -1,8 +1,8 @@ #ifndef STATUSVECTOR_H #define STATUSVECTOR_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/misc/registerDefinition/SyncMode.h b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/SyncMode.h similarity index 77% rename from include/model/hardware/core/register/misc/registerDefinition/SyncMode.h rename to include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/SyncMode.h index 03818f6..5d7258b 100644 --- a/include/model/hardware/core/register/misc/registerDefinition/SyncMode.h +++ b/include/model/hardware/core/lowLevelApi/register/misc/registerDefinition/SyncMode.h @@ -1,8 +1,8 @@ #ifndef SYNCMODE_H #define SYNCMODE_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/scenPlayer/ScenPlayer.h b/include/model/hardware/core/lowLevelApi/register/scenPlayer/ScenPlayer.h similarity index 100% rename from include/model/hardware/core/register/scenPlayer/ScenPlayer.h rename to include/model/hardware/core/lowLevelApi/register/scenPlayer/ScenPlayer.h diff --git a/include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerCtrl.h b/include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerCtrl.h similarity index 75% rename from include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerCtrl.h rename to include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerCtrl.h index 160b8a2..5e3bdcc 100644 --- a/include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerCtrl.h +++ b/include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerCtrl.h @@ -1,8 +1,8 @@ #ifndef SCENPLAYERCTRL_H #define SCENPLAYERCTRL_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerEndIndex.h b/include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerEndIndex.h similarity index 73% rename from include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerEndIndex.h rename to include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerEndIndex.h index d92c513..0db0f03 100644 --- a/include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerEndIndex.h +++ b/include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerEndIndex.h @@ -1,8 +1,8 @@ #ifndef SCENPLAYERENDINDEX_H #define SCENPLAYERENDINDEX_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerErrorCount.h b/include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerErrorCount.h similarity index 73% rename from include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerErrorCount.h rename to include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerErrorCount.h index 1ef275f..32bc53d 100644 --- a/include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerErrorCount.h +++ b/include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerErrorCount.h @@ -1,8 +1,8 @@ #ifndef SCENPLAYERERRORCOUNT_H #define SCENPLAYERERRORCOUNT_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerStartIndex.h b/include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerStartIndex.h similarity index 73% rename from include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerStartIndex.h rename to include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerStartIndex.h index 5844d7d..25039a9 100644 --- a/include/model/hardware/core/register/scenPlayer/registerDefinition/ScenPlayerStartIndex.h +++ b/include/model/hardware/core/lowLevelApi/register/scenPlayer/registerDefinition/ScenPlayerStartIndex.h @@ -1,8 +1,8 @@ #ifndef SCENPLAYERSTARTINDEX_H #define SCENPLAYERSTARTINDEX_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/sram/Sram.h b/include/model/hardware/core/lowLevelApi/register/sram/Sram.h similarity index 100% rename from include/model/hardware/core/register/sram/Sram.h rename to include/model/hardware/core/lowLevelApi/register/sram/Sram.h diff --git a/include/model/hardware/core/register/sram/registerDefinition/Index.h b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/Index.h similarity index 93% rename from include/model/hardware/core/register/sram/registerDefinition/Index.h rename to include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/Index.h index e25dc17..d6f9d93 100644 --- a/include/model/hardware/core/register/sram/registerDefinition/Index.h +++ b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/Index.h @@ -1,8 +1,8 @@ #ifndef INDEX_H #define INDEX_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #include "SramStructures.h" #undef BAR diff --git a/include/model/hardware/core/register/sram/registerDefinition/RxParams.h b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParams.h similarity index 90% rename from include/model/hardware/core/register/sram/registerDefinition/RxParams.h rename to include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParams.h index eb0d252..be752a9 100644 --- a/include/model/hardware/core/register/sram/registerDefinition/RxParams.h +++ b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParams.h @@ -2,8 +2,8 @@ #define RXPARAMS_H #include "model/scenarioGenerator/core/general/Calculation.h" -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #include "SramStructures.h" #undef BAR diff --git a/include/model/hardware/core/register/sram/registerDefinition/RxParamsDegree.h b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParamsDegree.h similarity index 90% rename from include/model/hardware/core/register/sram/registerDefinition/RxParamsDegree.h rename to include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParamsDegree.h index a518239..541776f 100644 --- a/include/model/hardware/core/register/sram/registerDefinition/RxParamsDegree.h +++ b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParamsDegree.h @@ -2,8 +2,8 @@ #define RXPARAMSDEGREE_H #include "model/scenarioGenerator/core/general/Calculation.h" -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #include "SramStructures.h" #undef BAR diff --git a/include/model/hardware/core/register/sram/registerDefinition/RxParamsDelay.h b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParamsDelay.h similarity index 90% rename from include/model/hardware/core/register/sram/registerDefinition/RxParamsDelay.h rename to include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParamsDelay.h index b3e188b..c8db6fc 100644 --- a/include/model/hardware/core/register/sram/registerDefinition/RxParamsDelay.h +++ b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParamsDelay.h @@ -1,8 +1,8 @@ #ifndef RXPARAMSDELAY_H #define RXPARAMSDELAY_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #include "SramStructures.h" #undef BAR diff --git a/include/model/hardware/core/register/sram/registerDefinition/RxParamsPos.h b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParamsPos.h similarity index 92% rename from include/model/hardware/core/register/sram/registerDefinition/RxParamsPos.h rename to include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParamsPos.h index 587d7aa..c3f5f12 100644 --- a/include/model/hardware/core/register/sram/registerDefinition/RxParamsPos.h +++ b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/RxParamsPos.h @@ -2,8 +2,8 @@ #define RXPARAMSPOS_H #include "model/scenarioGenerator/core/general/Calculation.h" -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #include "SramStructures.h" #undef BAR diff --git a/include/model/hardware/core/register/sram/registerDefinition/SoftwareMetaData.h b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/SoftwareMetaData.h similarity index 85% rename from include/model/hardware/core/register/sram/registerDefinition/SoftwareMetaData.h rename to include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/SoftwareMetaData.h index 0c879ac..895859e 100644 --- a/include/model/hardware/core/register/sram/registerDefinition/SoftwareMetaData.h +++ b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/SoftwareMetaData.h @@ -1,8 +1,8 @@ #ifndef SOFTWAREMETADATA_H #define SOFTWAREMETADATA_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #undef BAR diff --git a/include/model/hardware/core/register/sram/registerDefinition/SramStructures.h b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/SramStructures.h similarity index 91% rename from include/model/hardware/core/register/sram/registerDefinition/SramStructures.h rename to include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/SramStructures.h index b6b431e..2a3a3f7 100644 --- a/include/model/hardware/core/register/sram/registerDefinition/SramStructures.h +++ b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/SramStructures.h @@ -1,8 +1,8 @@ #ifndef SRAMSTRUCTURES_H #define SRAMSTRUCTURES_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" struct SramIndex { QVector shotPropertiesIndex; diff --git a/include/model/hardware/core/register/sram/registerDefinition/TxParams.h b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/TxParams.h similarity index 90% rename from include/model/hardware/core/register/sram/registerDefinition/TxParams.h rename to include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/TxParams.h index ffabd8d..cec5b7f 100644 --- a/include/model/hardware/core/register/sram/registerDefinition/TxParams.h +++ b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/TxParams.h @@ -1,8 +1,8 @@ #ifndef TXPARAMS_H #define TXPARAMS_H -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #include "SramStructures.h" #undef BAR diff --git a/include/model/hardware/core/register/sram/registerDefinition/TxParamsFocus.h b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/TxParamsFocus.h similarity index 90% rename from include/model/hardware/core/register/sram/registerDefinition/TxParamsFocus.h rename to include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/TxParamsFocus.h index 928fb26..e36f02f 100644 --- a/include/model/hardware/core/register/sram/registerDefinition/TxParamsFocus.h +++ b/include/model/hardware/core/lowLevelApi/register/sram/registerDefinition/TxParamsFocus.h @@ -2,8 +2,8 @@ #define TXPARAMSFOCUS_H #include "model/scenarioGenerator/core/general/Calculation.h" -#include "model/hardware/core/register/Register.h" -#include "model/hardware/core/register/RegUtils.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/RegUtils.h" #include "SramStructures.h" #undef BAR diff --git a/include/model/hardware/core/register/bpiFlash/BpiFlash.h b/include/model/hardware/core/register/bpiFlash/BpiFlash.h deleted file mode 100644 index c59f544..0000000 --- a/include/model/hardware/core/register/bpiFlash/BpiFlash.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef BPIFLASH_H -#define BPIFLASH_H - -#include "registerDefinition/McsRdWr.h" -#include "model/hardware/core/register/fpgaProgram/FpgaProgram.h" - -class BpiFlash -{ -private: - McsRdWr* _mcsRdWr; - -public: - explicit BpiFlash(SonoDevice* device); - ~BpiFlash(); - - void writeMcs (QByteArray& mcs) const; - QList readMcs (void) const; -}; - -#endif // BPIFLASH_H diff --git a/include/model/hardware/service/HardwarePacketEngine.h b/include/model/hardware/service/HardwarePacketEngine.h index fd4c5a1..c03d1b8 100644 --- a/include/model/hardware/service/HardwarePacketEngine.h +++ b/include/model/hardware/service/HardwarePacketEngine.h @@ -21,6 +21,7 @@ public: HardwarePacketEngine(); void newData(QByteArray buffer, bool flush = false); + void init(void); signals: void newPacketReady(const UsPacket& packet); diff --git a/include/model/scenarioGenerator/core/scenario/type/misc/ReceiverConfig.h b/include/model/scenarioGenerator/core/scenario/type/misc/ReceiverConfig.h index d345a6f..b6c6ac4 100644 --- a/include/model/scenarioGenerator/core/scenario/type/misc/ReceiverConfig.h +++ b/include/model/scenarioGenerator/core/scenario/type/misc/ReceiverConfig.h @@ -16,7 +16,7 @@ struct ReceiverConfig_t { quint32 absEn; quint32 focusNo; quint32 lineFilterEn; - quint32 ddcn; + quint32 ddcEn; quint32 wmfEn; quint32 dpeEn; }; diff --git a/include/model/scenarioGenerator/dto/hardware/HardwareOutput.h b/include/model/scenarioGenerator/dto/hardware/HardwareOutput.h index 9fe05d8..c48211b 100644 --- a/include/model/scenarioGenerator/dto/hardware/HardwareOutput.h +++ b/include/model/scenarioGenerator/dto/hardware/HardwareOutput.h @@ -7,12 +7,12 @@ #include "model/scenarioGenerator/dto/hardware/SramIndex.h" #include "model/scenarioGenerator/dto/hardware/SramRx.h" #include "model/scenarioGenerator/dto/hardware/SramTx.h" -#include "model/hardware/core/register/afe/Afe.h" +#include "model/hardware/core/lowLevelApi/register/afe/Afe.h" struct ScenGenHardwareOutput_t { quint32 focusTypeNumber; quint32 totalTxShotNumber; - QList rxBeamFormerNumber; + QVector rxBeamFormerNumber; QVector pulseInterval; quint8 frameType; diff --git a/mainwindow.cpp b/mainwindow.cpp index 4c80ebe..041df1c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -40,10 +40,10 @@ MainWindow::MainWindow(QWidget* parent) ui->plot_2->xAxis->setLabel("Line"); ui->plot_2->yAxis->setLabel("Point"); - ui->tb_fpgaBit->setReadOnly(true); ui->rbtn_reg->setChecked(_settings->value(REG_ACCESS_SEL).value()); ui->rbtn_offset->setChecked(!_settings->value(REG_ACCESS_SEL).value()); ui->tb_fpgaBit->setText(_settings->value(FPGA_FILE_PATH).value()); + ui->tb_mcsFilePath->setText(_settings->value(MCS_FILE_PATH).value()); ui->tb_scenFilesPath->setText(_settings->value(SCENARIO_FILE_PATH).value()); ui->tb_frameLogPath->setText(_settings->value(FRAME_LOG_PATH).value()); ui->tb_biteScenPath->setText(_settings->value(BITE_SCEN_FILE_PATH).value()); @@ -73,13 +73,17 @@ MainWindow::MainWindow(QWidget* parent) &MainWindow::biteLogThreadFinished); connect(&dmaLogWatcher, &QFutureWatcher::finished, this, &MainWindow::dmaLogThreadFinished); + connect(&programWatcher, &QFutureWatcher::finished, this, &MainWindow::programThreadFinish); - connect(this, &MainWindow::programmingGif, this, &MainWindow::getProgrammingGif); + connect(&mcsProgWatcher, &QFutureWatcher::finished, this, + &MainWindow::mcsThreadFinish); + connect(&mcsReadWatcher, &QFutureWatcher::finished, this, + &MainWindow::mcsReadFinish); + connect(this, &MainWindow::programmingGif, this, &MainWindow::getProgrammingGif); //////////////////////// DMA Packet Connections ////////////////////////////// connect(&_trx, &TrxBoard::sendFramePacket, this, &MainWindow::getFramePacket); - connect(this, &MainWindow::sendLogCount, this, &MainWindow::catchLogCount); connect(this, &MainWindow::twoDReady, this, &MainWindow::show2d, Qt::BlockingQueuedConnection); connect(this, &MainWindow::threeDReady, this, &MainWindow::show3d, @@ -99,6 +103,12 @@ MainWindow::MainWindow(QWidget* parent) ui->chk_pulserTstModeEn->setChecked(false); ui->tb_afeRegAddr->setText("C5"); + QList mcsButton = {ui->btn_mcsRead, + ui->btn_mcsBrowse, + ui->btn_mcsProgram}; + foreach(auto& btn, mcsButton) + btn->setEnabled(false); + QFont fontTitle; fontTitle.setBold(true); fontTitle.setItalic(true); @@ -118,6 +128,10 @@ MainWindow::MainWindow(QWidget* parent) _programFlag = true; _frameCount = 0; + lcdStyle(ui->lcd_dmaCounter); + lcdStyle(ui->lcd_biteCounter); + lcdStyle(ui->lcd_adcCounter); + try { _trx.init(); @@ -645,6 +659,22 @@ void MainWindow::getProbeColor(const QBrush brush, const int item) ui->table_probe->item(0, item)->setBackground(brush); } +/*************************************************************************************************/ +void MainWindow::lcdStyle(QLCDNumber* lcdNum) +{ + QFont font; + font.setBold(true); + font.setItalic(true); + QPalette lcdPalette; + lcdPalette.setColor(QPalette::Background, QColor(0, 180, 255)); + lcdPalette.setColor(QPalette::Foreground, QColor(0, 0, 0)); + lcdNum->setMode(QLCDNumber::Dec); + lcdNum->setSegmentStyle(QLCDNumber::Flat); + lcdNum->setPalette(lcdPalette); + lcdNum->setAutoFillBackground(true); + lcdNum->setFont(font); +} + /*************************************************************************************************/ void MainWindow::changeLabelTextColor(QLabel* label, QColor color) { @@ -756,15 +786,29 @@ void MainWindow::on_btn_writeReg_clicked() } } +/*************************************************************************************************/ +/************************************* Slave Programming *****************************************/ /*************************************************************************************************/ void MainWindow::on_btn_fpgaBrowse_clicked() { - QString fpgaProgramPath = QFileDialog::getOpenFileName(this, - tr("FPGA Programming File"), - _fpgaProgramFolder, - "*.bit"); - ui->tb_fpgaBit->setText(fpgaProgramPath); - _settings->setValue(FPGA_FILE_PATH, fpgaProgramPath); + try + { + QString fpgaProgramPath = QFileDialog::getOpenFileName(this, + tr("FPGA Programming File"), + _fpgaProgramFolder, + "*.bit"); + if(fpgaProgramPath.isEmpty()) + { + throw SonoException("No file is selected."); + } + + ui->tb_fpgaBit->setText(fpgaProgramPath); + _settings->setValue(FPGA_FILE_PATH, fpgaProgramPath); + } + catch(SonoException& e) + { + qDebug() << e.what(); + } } /*************************************************************************************************/ @@ -772,10 +816,15 @@ void MainWindow::fpgaProgram(QString& path) { try { + if(path.isEmpty()) + { + throw SonoException("No file is selected."); + } _trx.slaveFpgaProgram(path); } catch(SonoException& e) { + slaveProgButtonsEnable(true); qDebug() << e.what(); } } @@ -796,49 +845,258 @@ void MainWindow::programThreadFinish() movie->stop(); ui->l_programming->hide(); _programFlag = true; - ui->btn_getFpgaVersion->setEnabled(true); + + slaveProgButtonsEnable(true); } catch(SonoException& e) { + slaveProgButtonsEnable(true); qDebug() << e.what(); } } /*************************************************************************************************/ -void MainWindow::getProgrammingGif() +void MainWindow::on_btn_fpgaProgram_clicked() { - movie->setSpeed(100); - ui->l_programming->setMovie(movie); - ui->l_programming->show(); - movie->start(); - //ui->l_programming->update(); - //qApp->processEvents(); + try + { + _programFlag = false; + + slaveProgButtonsEnable(false); + + auto path = ui->tb_fpgaBit->text(); + if(path.isEmpty()) + { + throw SonoException("No file is selected."); + } + + QFuture programFuture = QtConcurrent::run(this, &MainWindow::fpgaProgram, path); + programWatcher.setFuture(programFuture); + + QString str = "doing"; + QColor color = Qt::red; + emit labelState(ui->l_programDone, str, color); + + emit programmingGif(ui->l_programming); + } + catch(SonoException& e) + { + slaveProgButtonsEnable(true); + qDebug() << e.what(); + } } /*************************************************************************************************/ -void MainWindow::getLabelState(QLabel* label, QString str, QColor color) +/************************************* MCS Programming *******************************************/ +/*************************************************************************************************/ +void MainWindow::mcsProgram(QString &path) { - label->setText(str); - changeLabelTextColor(label, color); - label->repaint(); - qApp->processEvents(); + try + { + if(path.isEmpty()) + { + throw SonoException("No file is selected."); + } + _trx.mcsProgram(path); + } + catch(SonoException& e) + { + mcsButtonsEnable(true); + qDebug() << e.what(); + } } /*************************************************************************************************/ -void MainWindow::on_btn_fpgaProgram_clicked() +void MainWindow::mcsThreadFinish() +{ + try + { + QString str = "done"; + QColor color = Qt::green; + emit labelState(ui->l_mcsProgramDone, str, color); + + movie->stop(); + ui->l_mcsProgramming->hide(); + + mcsButtonsEnable(true); + } + catch(SonoException& e) + { + mcsButtonsEnable(true); + qDebug() << e.what(); + } +} + +/*************************************************************************************************/ +void MainWindow::mcsRead(QString &path) +{ + try + { + if(path.isEmpty()) + { + throw SonoException("No file is selected."); + } + _trx.mcsVerify(path); + } + catch(SonoException& e) + { + mcsButtonsEnable(true); + qDebug() << e.what(); + } +} + +/*************************************************************************************************/ +void MainWindow::mcsReadFinish() +{ + try + { + QString str = "done"; + QColor color = Qt::green; + emit labelState(ui->l_mcsReadDone, str, color); + + mcsButtonsEnable(true); + } + catch(SonoException& e) + { + mcsButtonsEnable(true); + qDebug() << e.what(); + } +} + +/*************************************************************************************************/ + +void MainWindow::on_btn_mcsBrowse_clicked() +{ + try + { + QString mcsProgramPath = QFileDialog::getOpenFileName(this, + tr("MCS File"), + _mcsProgramFolder, + "*.mcs"); + if(mcsProgramPath.isEmpty() || mcsProgramPath.isNull()) + { + throw SonoException("No file is selected."); + } + + ui->tb_mcsFilePath->setText(mcsProgramPath); + _settings->setValue(MCS_FILE_PATH, mcsProgramPath); + } + catch(SonoException& e) + { + qDebug() << e.what(); + } +} + +/*************************************************************************************************/ +void MainWindow::on_btn_mcsProgram_clicked() +{ + try + { + mcsButtonsEnable(false); + + auto path = ui->tb_mcsFilePath->text(); + if(path.isEmpty()) + { + throw SonoException("No file is selected."); + } + + QString str = "doing"; + QColor color = Qt::red; + emit labelState(ui->l_mcsProgramDone, str, color); + + QFuture mcsProgFuture = QtConcurrent::run(this, &MainWindow::mcsProgram, path); + mcsProgWatcher.setFuture(mcsProgFuture); + + emit programmingGif(ui->l_mcsProgramming); + } + catch(SonoException& e) + { + mcsButtonsEnable(true); + qDebug() << e.what(); + } +} + +/*************************************************************************************************/ +void MainWindow::on_btn_mcsRead_clicked() { - _programFlag = false; - ui->btn_getFpgaVersion->setEnabled(false); - auto path = ui->tb_fpgaBit->text(); + try + { + mcsButtonsEnable(false); + QString mcsSavePath = QFileDialog::getExistingDirectory(this, + tr("MCS File Reading"), + _mcsVerifyFolder, + QFileDialog::ShowDirsOnly); + if(mcsSavePath.isEmpty()) + { + throw SonoException("No file is selected"); + } - QFuture programFuture = QtConcurrent::run(this, &MainWindow::fpgaProgram, path); - programWatcher.setFuture(programFuture); + QString str = "doing"; + QColor color = Qt::red; + emit labelState(ui->l_mcsReadDone, str, color); - QString str = "doing"; - QColor color = Qt::red; - emit labelState(ui->l_programDone, str, color); + QFuture mcsReadFuture = QtConcurrent::run(this, &MainWindow::mcsRead, mcsSavePath); + mcsReadWatcher.setFuture(mcsReadFuture); + } + catch(SonoException& e) + { + mcsButtonsEnable(true); + qDebug() << e.what(); + } +} - emit programmingGif(); +/*************************************************************************************************/ +/*************************************************************************************************/ +void MainWindow::mcsButtonsEnable(bool Enable) +{ + QList button={ui->btn_mcsProgram, + ui->btn_mcsRead}; + foreach (auto& btn, button) + { + btn->setEnabled(Enable); + } +} + +/*************************************************************************************************/ +void MainWindow::slaveProgButtonsEnable(bool Enable) +{ + QList button={ui->btn_getFpgaVersion, + ui->btn_fpgaProgram, + ui->btn_gtReg}; + foreach (auto& btn, button) + { + btn->setEnabled(Enable); + } +} + +/*************************************************************************************************/ +void MainWindow::logButtonsEnable(bool Enable) +{ + QList button={ui->btn_setBiteLog, + ui->btn_setAdcLog, + ui->btn_dmaLogLast}; + foreach (auto& btn, button) + { + btn->setEnabled(Enable); + } +} + +/*************************************************************************************************/ +void MainWindow::getProgrammingGif(QLabel* label) +{ + movie->setSpeed(100); + label->setMovie(movie); + label->show(); + movie->start(); +} + +/*************************************************************************************************/ +void MainWindow::getLabelState(QLabel* label, QString str, QColor color) +{ + label->setText(str); + changeLabelTextColor(label, color); + label->repaint(); + qApp->processEvents(); } /*************************************************************************************************/ @@ -993,19 +1251,27 @@ void MainWindow::on_btn_scenStart_clicked() _frame.clear(); _lastBuffer.clear(); _bufferedFrame.clear(); + QString dmaLogPath = ui->tb_frameLogPath->text(); + if(dmaLogPath.isEmpty()) + { + throw SonoException("No file is selected"); + } ui->btn_scenStart->setText("Scenario Stop"); ui->btn_emulator->setText("Emulator Start"); - dmaLogLayoutVisible(true); - ui->chk_continuousShowing->show(); - ui->btn_dmaShow->show(); _trx.scenPlayerStart(true); _dmaRun = true; //flag _dmaBuffer.clear(); + dmaLogLayoutVisible(true); + ui->chk_continuousShowing->show(); + ui->btn_dmaShow->show(); if(ui->chk_firstFrameLogEn->isChecked()) { _dmaLog = true; - QtConcurrent::run(this, &MainWindow::logPcie, dmaLogPath, LOG_COUNT_FROM_FIRST); + QtConcurrent::run(this, &MainWindow::logPcie, + dmaLogPath, + LOG_COUNT_FROM_FIRST, + ui->lcd_dmaCounter); } } else @@ -1050,7 +1316,13 @@ void MainWindow::on_btn_emulator_clicked() _frame.clear(); _lastBuffer.clear(); _bufferedFrame.clear(); + QString dmaLogPath = ui->tb_frameLogPath->text(); + if(dmaLogPath.isEmpty()) + { + throw SonoException("No file is selected"); + } + QString emulPath = QFileDialog::getOpenFileName(this, tr("emulator"), _emulFolder, @@ -1080,7 +1352,10 @@ void MainWindow::on_btn_emulator_clicked() if(ui->chk_firstFrameLogEn->isChecked()) { _dmaLog = true; - QtConcurrent::run(this, &MainWindow::logPcie, dmaLogPath, LOG_COUNT_FROM_FIRST); + QtConcurrent::run(this, &MainWindow::logPcie, + dmaLogPath, + LOG_COUNT_FROM_FIRST, + ui->lcd_dmaCounter); } } else @@ -1114,17 +1389,19 @@ void MainWindow::on_btn_emulator_clicked() } /*************************************************************************************************/ -void MainWindow::logPcie(QString logPath, quint32 logCount) +void MainWindow::logPcie(QString logPath, quint32 logCount, QLCDNumber* lcdCounter) { try { + if(logPath.isEmpty()) + { + throw SonoException("No file is selected"); + } + _dmaLogCount = 0; quint32 i(0); - QProgressDialog* progress = new QProgressDialog(this); - progress->show(); - while(_dmaLog) { if(_dmaBuffer.size() == 0) @@ -1156,21 +1433,19 @@ void MainWindow::logPcie(QString logPath, quint32 logCount) if(!file.open(QIODevice::WriteOnly)) { - progress->hide(); - progress->setEnabled(false); throw SonoException("Couldn't save DMA log file for frame logging"); } file.write(temp); file.close(); - emit sendLogCount(_dmaLogCount, logCount, progress); + lcdCounter->display(qint32(_dmaLogCount)); + qApp->processEvents(); } - - delete progress; } catch(SonoException& e) { qDebug() << e.what(); + _dmaLog = false; } } @@ -1183,11 +1458,11 @@ void MainWindow::on_btn_frameLogBrowse_clicked() tr("Frame Log"), _frameLogFolder, QFileDialog::ShowDirsOnly); - QFile frameLogFile(frameLogPath); - if(frameLogFile.fileName().isEmpty()) + if(frameLogPath.isEmpty()) { throw SonoException("No file is selected"); } + ui->tb_frameLogPath->setText(frameLogPath); _settings->setValue(FRAME_LOG_PATH, frameLogPath); } @@ -1210,6 +1485,11 @@ void MainWindow::on_btn_dmaLogLast_clicked() return; } QString dmaLogPath = ui->tb_frameLogPath->text(); + if(dmaLogPath.isEmpty()) + { + throw SonoException("No file is selected"); + } + QString str = "doing"; QColor color = Qt::red; emit labelState(ui->l_dmaLogDone, str, color); @@ -1219,11 +1499,14 @@ void MainWindow::on_btn_dmaLogLast_clicked() QFuture dmaLogFuture = QtConcurrent::run(this, &MainWindow::logPcie, dmaLogPath, - dmaLogCnt); + dmaLogCnt, + ui->lcd_dmaCounter); dmaLogWatcher.setFuture(dmaLogFuture); + logButtonsEnable(false); } catch(SonoException& e) { + logButtonsEnable(true); qDebug() << e.what(); } } @@ -1234,6 +1517,7 @@ void MainWindow::dmaLogThreadFinished() QString str = "done"; QColor color = Qt::green; emit labelState(ui->l_dmaLogDone, str, color); + logButtonsEnable(true); } /*************************************************************************************************/ @@ -1241,8 +1525,8 @@ void MainWindow::dmaLogLayoutVisible(bool show) { QList widgets {ui->btn_dmaLogLast, ui->tb_dmaLogCount, + ui->lcd_dmaCounter, ui->l_dmaLogDone, - ui->l_logCount, ui->l_logging}; if(show) { @@ -1480,27 +1764,15 @@ void MainWindow::show2d() } /*************************************************************************************************/ -void MainWindow::catchLogCount(quint32 counter, quint32 logRange, QProgressDialog* _progress) -{ - _progress->setMinimumSize(300, 100); - _progress->setLabelText("Please wait..."); - _progress->setWindowTitle("Logging"); - _progress->setRange(0, static_cast(logRange)); - _progress->setModal(true); - - try - { - _progress->setValue(static_cast(counter)); - if(_progress->wasCanceled()) - { - throw SonoException("The logging process is canceled"); - } - } - catch(SonoException& e) - { - qDebug() << e.what(); - } -} +//void MainWindow::catchLogCount(quint32 counter, quint32 logRange, QProgressDialog* _progress) +//{ +// _progress->setMinimumSize(300, 100); +// _progress->setLabelText("Please wait..."); +// _progress->setWindowTitle("Logging"); +// _progress->setRange(0, static_cast(logRange)); +// _progress->setModal(true); +// _progress->setValue(static_cast(counter)); +//} /*************************************************************************************************/ void MainWindow::on_chk_headerLogEn_clicked(bool checked) @@ -1529,7 +1801,7 @@ void MainWindow::on_chk_headerLogEn_clicked(bool checked) else { _headerLogEn = false; - if(_headerLogFile->open(QIODevice::WriteOnly)) + if(_headerLogFile->isOpen()) { _headerLogFile->flush(); _headerLogFile->close(); @@ -1694,7 +1966,7 @@ void MainWindow::on_btn_supJump_clicked() { try { - _trx.mpsReset(); //jump + _trx.mpsReset(); //off _ jump ui->chk_mpsInit->setChecked(false); } catch(SonoException& e) @@ -1958,13 +2230,21 @@ QString MainWindow::releaseCodeVersion(quint32& value) strList.push_back(ch); } str.clear(); - str = strList[0] + strList[1] + "/" + - strList[2] + strList[3] + "/" + - strList[4] + strList[5] + " " + - strList[6] + strList[7] + ":" + - strList[8] + strList[9]; - return str; + if (strList.size() < 10) + { + return "0"; + } + else + { + str = strList[0] + strList[1] + "/" + + strList[2] + strList[3] + "/" + + strList[4] + strList[5] + " " + + strList[6] + strList[7] + ":" + + strList[8] + strList[9]; + + return str; + } } /*************************************************************************************************/ @@ -1992,6 +2272,11 @@ void MainWindow::setScenario(const string& h5Path) { try { + if (ui->tb_scenFilesPath->text().isEmpty()) + { + throw SonoException("No file is selected."); + } + AfeConfig _afeConfig; _afeConfig.lowNf = lowNfDisable; _afeConfig.lnaHpf = lnaHpfEnable; @@ -2047,18 +2332,29 @@ void MainWindow::setScenario(const string& h5Path) /*************************************************************************************************/ void MainWindow::on_btn_setScenario_clicked() { - QString str = "doing"; - QColor color = Qt::red; - emit labelState(ui->l_scenFillingDone, str, color); + try + { + QString str = "doing"; + QColor color = Qt::red; + emit labelState(ui->l_scenFillingDone, str, color); - QString sramScenario = "/scenGenOutput/scenario.h5"; - QString h5Path = ui->tb_scenFilesPath->text() + sramScenario; + QString sramScenario = "/scenGenOutput/scenario.h5"; + QString h5Path = ui->tb_scenFilesPath->text() + sramScenario; + if (ui->tb_scenFilesPath->text().isEmpty()) + { + throw SonoException("No file is selected."); + } - emit scenarioReady(h5Path.toStdString()); + emit scenarioReady(h5Path.toStdString()); - str = "done"; - color = Qt::green; - emit labelState(ui->l_scenFillingDone, str, color); + str = "done"; + color = Qt::green; + emit labelState(ui->l_scenFillingDone, str, color); + } + catch(SonoException& e) + { + qDebug() << e.what(); + } } /*************************************************************************************************/ @@ -2089,6 +2385,10 @@ void MainWindow::setScenarioCompare(const QString& scenPath) { try { + if (scenPath.isEmpty()) + { + throw SonoException("No file is selected."); + } _trx.setScenarioCompare(scenPath); } catch(SonoException& e) @@ -2139,7 +2439,9 @@ void MainWindow::on_btn_scenBrowse_clicked() _scenarioFolder, QFileDialog::ShowDirsOnly); if (scenPath.isEmpty()) + { throw SonoException("No file is selected."); + } ui->tb_scenFilesPath->setText(scenPath); _settings->setValue(SCENARIO_FILE_PATH, scenPath); @@ -2316,15 +2618,17 @@ void MainWindow::on_btn_trxRomInfoWrite_clicked() { QByteArray sendingArray = infoStr.toLatin1(); trxEepromWrite(sendingArray, EEPROM_INFO_BEGIN, _bCtrl); -//QByteArray sendingArray; -//unsigned char crcArray[] = {0x4, 0x0, 0x13, 0x0, 0x27, 0x0, 0x28, 0x0, 0xEB, 0x1, -//0xAC, 0x5, 0xAC, 0x6, 0x4C, 0x6, 0xB0, 0x6, 0xB2, -//0, 0, 0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -//0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; -//for(auto var : crcArray) -//sendingArray.push_back(static_cast(var)); - //trxEepromWrite(sendingArray, EEPROM_CRC_BEGIN, _bCtrl); +// QByteArray sendingArray; +// unsigned char crcArray[] = {0x4, 0x0, 0x13, 0x0, 0x27, 0x0, 0x28, 0x0, 0xEB, 0x1, +// 0xAC, 0x5, 0xAC, 0x6, 0x4C, 0x6, 0xB0, 0x6, 0xB2, +// 0, 0, 0, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +// 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; +// for(auto var : crcArray) +// sendingArray.push_back(static_cast(var)); +// trxEepromWrite(sendingArray, EEPROM_CRC_BEGIN, _bCtrl); // TRX + + } catch(SonoException& e) { @@ -2730,40 +3034,76 @@ void MainWindow::setAfeConfig() /*************************************************************************************************/ void MainWindow::on_btn_biteScenBrowse_clicked() { - QString biteScenPath = QFileDialog::getExistingDirectory(this, - tr("Built-in test Scenario File"), - _BITeScenFolder, - QFileDialog::ShowDirsOnly); - ui->tb_biteScenPath->setText(biteScenPath); - _settings->setValue(BITE_SCEN_FILE_PATH, biteScenPath); + try + { + QString biteScenPath = QFileDialog::getExistingDirectory(this, + tr("Built-in test Scenario File"), + _BITeScenFolder, + QFileDialog::ShowDirsOnly); + if(biteScenPath.isEmpty()) + { + throw SonoException("No file is selected."); + } + + ui->tb_biteScenPath->setText(biteScenPath); + _settings->setValue(BITE_SCEN_FILE_PATH, biteScenPath); + } + catch(SonoException& e) + { + qDebug() << e.what(); + } } /*************************************************************************************************/ void MainWindow::on_btn_biteSetScenario_clicked() { - QString str = "doing"; - QColor color = Qt::red; - emit labelState(ui->l_biteScenFillingDone, str, color); + try + { + QString sramScenario = "/scenGenOutput/scenario.h5"; + QString h5Path = ui->tb_biteScenPath->text() + sramScenario; - QString sramScenario = "/scenGenOutput/scenario.h5"; - QString h5Path = ui->tb_biteScenPath->text() + sramScenario; + if (ui->tb_biteScenPath->text().isEmpty()) + { + throw SonoException("No file is selected."); + } + + QString str = "doing"; + QColor color = Qt::red; + emit labelState(ui->l_biteScenFillingDone, str, color); - emit scenarioReady(h5Path.toStdString()); + emit scenarioReady(h5Path.toStdString()); - str = "done"; - color = Qt::green; - emit labelState(ui->l_biteScenFillingDone, str, color); + str = "done"; + color = Qt::green; + emit labelState(ui->l_biteScenFillingDone, str, color); + } + catch(SonoException& e) + { + qDebug() << e.what(); + } } /*************************************************************************************************/ void MainWindow::on_btn_biteBrowse_clicked() { - QString biteIqPath = QFileDialog::getOpenFileName(this, - tr("TxDAC File"), - _BITeIqFolder, - "*.csv"); - ui->tb_biteFilesPath->setText(biteIqPath); - _settings->setValue(BITE_FILE_PATH, biteIqPath); + try + { + QString biteIqPath = QFileDialog::getOpenFileName(this, + tr("TxDAC File"), + _BITeIqFolder, + "*.csv"); + if(biteIqPath.isEmpty()) + { + throw SonoException("No file is selected."); + } + + ui->tb_biteFilesPath->setText(biteIqPath); + _settings->setValue(BITE_FILE_PATH, biteIqPath); + } + catch(SonoException& e) + { + qDebug() << e.what(); + } } /*************************************************************************************************/ @@ -2771,10 +3111,6 @@ void MainWindow::on_btn_biteIQ_clicked() { try { - QString str = "doing"; - QColor color = Qt::red; - emit labelState(ui->l_biteIQFillingDone, str, color); - //BITe file reading to determine the I & Q of txDAC QString bitePath = ui->tb_biteFilesPath->text(); QFile biteFile(bitePath); @@ -2789,6 +3125,10 @@ void MainWindow::on_btn_biteIQ_clicked() throw SonoException("Couldn't open built-in test file for frame logging"); } + QString str = "doing"; + QColor color = Qt::red; + emit labelState(ui->l_biteIQFillingDone, str, color); + QStringList txDac; QByteArray I; QByteArray Q; @@ -2839,8 +3179,7 @@ void MainWindow::on_btn_setBiteLog_clicked() tr("BITe Log"), _biteLogFolder, QFileDialog::ShowDirsOnly); - QFile biteLogFile(biteLogPath); - if(biteLogFile.fileName().isEmpty()) + if(biteLogPath.isEmpty()) { throw SonoException("No file is selected"); } @@ -2855,12 +3194,15 @@ void MainWindow::on_btn_setBiteLog_clicked() QFuture biteLogFuture = QtConcurrent::run(this, &MainWindow::logPcie, biteLogPath, - biteLogCnt); + biteLogCnt, + ui->lcd_biteCounter); biteLogWatcher.setFuture(biteLogFuture); + logButtonsEnable(false); } catch(SonoException& e) { qDebug() << e.what(); + logButtonsEnable(true); } } @@ -2871,6 +3213,7 @@ void MainWindow::biteLogThreadFinished() QString str = "done"; QColor color = Qt::green; emit labelState(ui->l_biteLogDone, str, color); + logButtonsEnable(true); } /*************************************************************************************************/ @@ -2977,6 +3320,11 @@ void MainWindow::on_btn_setAdcLog_clicked() QString adcLoggerPath = ui->tb_adcLogPath->text(); + if(adcLoggerPath.isEmpty()) + { + throw SonoException("No file is selected"); + } + //ADC log count registering quint32 adcLogCnt(0); if(ui->tb_adcLogCount->isEnabled()) @@ -3015,6 +3363,8 @@ void MainWindow::on_btn_setAdcLog_clicked() } } + logButtonsEnable(false); + //ADC sync mode eSyncMode syncMode = autoSync; if(ui->cb_syncMode->isEnabled()) @@ -3043,7 +3393,7 @@ void MainWindow::on_btn_setAdcLog_clicked() capConfig.syncCount = syncCnt; capConfig.sampleCount = sampleCnt; - delay(1000); ////////////////////////// check + delay(1000); _trx.setAfePwr(afePwrdnDisable); _trx.adcCaptureConfig(capConfig); @@ -3071,40 +3421,32 @@ void MainWindow::on_btn_setAdcLog_clicked() str = "done"; color = Qt::green; emit labelState(ui->l_adcLogDone, str, color); + + ui->lcd_adcCounter->display(1); + qApp->processEvents(); } //ADC log state regardless of sample/sync count if(ui->chk_logCountEn->isChecked()) { - QProgressDialog* progress = new QProgressDialog(this); - - if(adcLogCnt > 2) - { - progress->show(); - } - else - { - progress->hide(); - } + str = "doing"; + color = Qt::red; + emit labelState(ui->l_adcLogDone, str, color); for(quint16 var = 0; var < adcLogCnt; var++) { - str = "doing"; - color = Qt::red; - emit labelState(ui->l_adcLogDone, str, color); - _trx.adcCaptureStart(); _trx.setCaptureManualSync(); _trx.adcCaptureDone(); _trx.adcLoggerStart(adcLoggerPath, "logCnt(" + QString::number(var) + ")"); - str = "done"; - color = Qt::green; - emit labelState(ui->l_adcLogDone, str, color); - - emit sendLogCount(var, adcLogCnt, progress); + ui->lcd_adcCounter->display(var+1); + qApp->processEvents(); } - delete progress; + + str = "done"; + color = Qt::green; + emit labelState(ui->l_adcLogDone, str, color); } //Scen frame ADC log state based-on scenario end index number @@ -3113,22 +3455,12 @@ void MainWindow::on_btn_setAdcLog_clicked() quint16 startIdx = static_cast(_usd->readWord(0x804, 0)); quint16 endIdx = static_cast(_usd->readWord(0x808, 0)); - QProgressDialog* progress1 = new QProgressDialog(this); - if((endIdx - startIdx) >= 1) - { - progress1->show(); - } - else - { - progress1->hide(); - } + str = "doing"; + color = Qt::red; + emit labelState(ui->l_adcLogDone, str, color); for(quint16 var = startIdx; var <= endIdx; var++) { - str = "doing"; - color = Qt::red; - emit labelState(ui->l_adcLogDone, str, color); - capConfig.syncCount = var; _trx.adcCaptureConfig(capConfig); _trx.adcCaptureStart(); @@ -3137,19 +3469,21 @@ void MainWindow::on_btn_setAdcLog_clicked() _trx.scenPlayerStop(true); _trx.adcLoggerStart(adcLoggerPath, "scenIndx(" + QString::number(var) + ")"); - str = "done"; - color = Qt::green; - emit labelState(ui->l_adcLogDone, str, color); - - emit sendLogCount(var, endIdx, progress1); + ui->lcd_adcCounter->display((var - startIdx) + 1); + qApp->processEvents(); } - delete progress1; + + str = "done"; + color = Qt::green; + emit labelState(ui->l_adcLogDone, str, color); } _trx.setAfePwr(afePwrdnEnable); _trx.setTxDacEnable(BITE_INTERVAL, false); _trx.setAdgCfg(adgGnd); + logButtonsEnable(true); + } catch(SonoException& e) { @@ -3158,6 +3492,7 @@ void MainWindow::on_btn_setAdcLog_clicked() _trx.setDebuggerMode(pulserHz, false); _trx.setTxDacEnable(BITE_INTERVAL, false); _trx.setAdgCfg(adgGnd); + logButtonsEnable(true); qDebug() << e.what(); } } @@ -3317,3 +3652,49 @@ void MainWindow::exitApp() this->QWidget::close(); } + +/*************************************************************************************************/ +void MainWindow::on_btn_tempTest_clicked() +{ + for(auto i=0; i < 5; i++) + { + _programFlag = false; + delay(1000); + qApp->processEvents(); + + QList button={ui->btn_getFpgaVersion, + ui->btn_fpgaProgram, + ui->btn_gtReg}; + foreach (auto& btn, button) + { + btn->setEnabled(false); + } + + QString str = "doing"; + QColor color = Qt::red; + emit labelState(ui->l_programDone, str, color); + + auto path = ui->tb_fpgaBit->text(); + + _trx.slaveFpgaProgram(path); +#ifdef DEVELOP_UI + _trx.afeAdcsSync(); +#endif + + str = "done"; + color = Qt::green; + emit labelState(ui->l_programDone, str, color); + + _programFlag = true; + qApp->processEvents(); + + foreach (auto& btn, button) + { + btn->setEnabled(true); + qApp->processEvents(); + } + + delay(100); + on_btn_gtReg_clicked(); + } +} diff --git a/mainwindow.h b/mainwindow.h index 62b73e6..1d4052a 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -20,10 +20,11 @@ #include #include #include +#include #include #include "qcustomplot.h" -#include "include/model/hardware/core/TrxBoard.h" +#include "include/model/hardware/core/lowLevelApi/TrxBoard.h" #include "hdf5Scenario/hdf5Scenario.h" #include "api.h" @@ -36,6 +37,7 @@ #define ADC_LOG_PATH "adcLogPath" #define BITE_FILE_PATH "biteFilePath" #define FPGA_FILE_PATH "fpgaFilePath" +#define MCS_FILE_PATH "mcsFilePath" #define REG_ACCESS_SEL "regAccessType" @@ -101,6 +103,10 @@ private: QFutureWatcher programWatcher; + QFutureWatcher mcsProgWatcher; + + QFutureWatcher mcsReadWatcher; + static QThread* _uiThread; QFile* _headerLogFile; @@ -139,7 +145,7 @@ private: void setAfeConfig (void); - void logPcie(QString logPath, quint32 logCount); + void logPcie(QString logPath, quint32 logCount, QLCDNumber* lcdCounter); void continuousFrameRepresent(void); @@ -153,6 +159,8 @@ private: void getProbeColor (const QBrush brush, const int item); + void lcdStyle(QLCDNumber* lcdNum); + void biteLogThreadFinished(); void dmaLogThreadFinished(); @@ -161,9 +169,25 @@ private: void fpgaProgram(QString &path); + void mcsProgram(QString &path); + + void mcsRead(QString &path); + void programThreadFinish(); + void mcsThreadFinish(); + + void mcsReadFinish(); + + void mcsButtonsEnable(bool Enable); + + void slaveProgButtonsEnable(bool Enable); + + void logButtonsEnable (bool Enable); + QString _fpgaProgramFolder = "/home/hasis/Desktop/hardware/hwCode"; + QString _mcsProgramFolder = "/home/hasis/Desktop/hardware/hwCode"; + QString _mcsVerifyFolder = "/home/hasis/Desktop/hardware/hwCode"; QString _scenarioFolder = "/home/hasis/Desktop/hardware/Scenarios"; QString _emulFolder = "/home/hasis/Desktop/hardware/emulator"; QString _BITeScenFolder = "/home/hasis/Desktop/hardware/BITe_IQ"; @@ -211,7 +235,7 @@ private slots: void getLabelState(QLabel* label, QString str, QColor color); - void getProgrammingGif(void); + void getProgrammingGif(QLabel* label); void on_rbtn_reg_toggled(bool checked); @@ -255,8 +279,6 @@ private slots: void show2d(); - void catchLogCount(quint32 counter, quint32 logRange, QProgressDialog* _progress); - void on_chk_mpsInit_clicked(); void on_btn_scenBrowse_clicked(); @@ -331,16 +353,23 @@ private slots: void on_chk_headerLogEn_clicked(bool checked); + void on_btn_mcsProgram_clicked(); + + void on_btn_mcsBrowse_clicked(); + + void on_btn_mcsRead_clicked(); + + void on_btn_tempTest_clicked(); + signals: void showMessage(QString message); void threeDReady(); void twoDReady(); - void sendLogCount(quint32 counter, quint32 logRange, QProgressDialog* _progress); void connectedPrbChange(); void frameLostCall(); void labelState(QLabel* label, QString str, QColor color); void scenarioReady(const string& h5Path); - void programmingGif(); + void programmingGif(QLabel* label); }; #endif // MAINWINDOW_H diff --git a/mainwindow.ui b/mainwindow.ui index faa2c2e..7b34e81 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -53,8 +53,8 @@ 10 10 - 741 - 135 + 801 + 141 @@ -66,13 +66,13 @@ 0 - 135 + 130 16777215 - 135 + 150 @@ -159,7 +159,7 @@ 550 70 187 - 27 + 31 @@ -456,9 +456,9 @@ 10 - 160 - 741 - 111 + 260 + 631 + 91 @@ -490,14 +490,14 @@ - Slave Programming: + Slave Programming 10 30 - 721 + 611 27 @@ -556,9 +556,9 @@ 10 - 70 + 60 148 - 19 + 21 @@ -601,9 +601,9 @@ - 650 - 70 - 80 + 510 + 60 + 111 23 @@ -614,16 +614,16 @@ - Program + Program Bit - 290 - 70 + 260 + 61 221 - 31 + 21 @@ -631,19 +631,280 @@ - + 10 + 160 + 801 + 91 + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 150 + + + + + 75 + true + true + false + false + false + + + + BPI Flash Command + + + + + 10 + 30 + 611 + 27 + + + + + + + + 50 + true + false + false + false + false + + + + MCS file: + + + + + + + + 50 + true + false + false + false + false + + + + + + + + + 50 + true + false + false + false + false + + + + Browse... + + + + + + + + + 10 + 60 + 148 + 21 + + + + + + + + 50 + true + false + false + false + false + + + + Programming: + + + + + + + + 50 + true + false + false + false + false + + + + doing + + + + + + + + + 510 + 60 + 111 + 23 + + + + + 75 + true + + + + Program MCS + + + + + + 260 + 60 + 221 + 21 + + + + + + + + + + 660 + 30 + 121 + 51 + + + + + + + MCS Read + + + + + + + + + + 50 + true + false + false + false + false + + + + Reading: + + + + + + + + 50 + true + false + false + false + false + + + + doing + + + + + + + + + + + + 670 280 - 104 + 121 23 + + + 75 + true + + GT reset/read + + + + 670 + 320 + 121 + 23 + + + + + 50 + false + + + + Temp Test + + @@ -954,7 +1215,7 @@ - Scenario Parameters + Scenario Command @@ -1535,26 +1796,62 @@ + + 6 + + + QLayout::SetMaximumSize + - + + + + 0 + 0 + + + + + 58 + 23 + + 50 false - - Log Count: + + <html><head/><body><p><span style=" font-size:8pt; font-weight:600;">Log Count</span></p></body></html> - - - - 50 - false - + + + + 0 + 0 + + + + + 59 + 0 + + + + + 59 + 23 + + + + <html><head/><body><p><span style=" font-size:8pt;">Current Count</span></p></body></html> + + + 6 @@ -2279,41 +2576,6 @@ - - - - 10 - 110 - 171 - 31 - - - - - - - - 50 - false - - - - BITe Log Count: - - - - - - - - 50 - false - - - - - - @@ -2469,6 +2731,97 @@ + + + + 10 + 110 + 181 + 61 + + + + + + + + + + 50 + false + + + + BITe Log Count: + + + + + + + + 50 + false + + + + + + + + + + + + + 50 + false + + + + Current Count: + + + + + + + + 50 + false + + + + + + + + + + + + 0 + 0 + + + + + 59 + 0 + + + + <html><head/><body><p><br/></p></body></html> + + + 6 + + + + + + + @@ -2487,11 +2840,47 @@ 660 30 - 136 - 52 + 133 + 81 + + + + + + + 50 + false + + + + Log Count: + + + + + + + + 0 + 0 + + + + + 55 + 22 + + + + 6 + + + + + @@ -2635,7 +3024,7 @@ 190 30 - 218 + 221 60 @@ -2924,7 +3313,7 @@ 310 30 136 - 19 + 21 @@ -2950,7 +3339,7 @@ 310 50 128 - 19 + 21 @@ -2976,7 +3365,7 @@ 310 70 131 - 19 + 21 @@ -3002,7 +3391,7 @@ 310 90 163 - 19 + 21 @@ -3028,7 +3417,7 @@ 310 110 164 - 19 + 21 @@ -3080,7 +3469,7 @@ 310 130 154 - 19 + 21 @@ -3105,8 +3494,8 @@ 470 30 - 63 - 134 + 58 + 122 @@ -3487,7 +3876,7 @@ 710 50 101 - 119 + 111 diff --git a/src/model/hardware/core/TrxBoard.cpp b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp similarity index 97% rename from src/model/hardware/core/TrxBoard.cpp rename to src/model/hardware/core/lowLevelApi/TrxBoard.cpp index c9939fd..a2b1c9c 100644 --- a/src/model/hardware/core/TrxBoard.cpp +++ b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/TrxBoard.h" +#include "model/hardware/core/lowLevelApi/TrxBoard.h" template QByteArray TrxBoard::uintLittleEndian2ByteArray(T& data) const @@ -364,6 +364,7 @@ void TrxBoard::init() { this->_device.init(); this->_bCtrlMngt->prbCtrlInit(); + mpsReset(); sramClear(all); } @@ -394,6 +395,36 @@ void TrxBoard::fpgaProgram(const QString path) const this->_fpgaProgram->program(bitFileData, MOUNTED_SLAVE_FPGA); } +void TrxBoard::mcsRead(const QString path) const +{ + QList mcsList; + qint32 num(0); + + QFile mcsFile(path + "readback.mcs"); + + if(mcsFile.fileName().isEmpty()) + { + throw SonoException("No file is selected"); + } + + if(!mcsFile.open(QIODevice::WriteOnly)) + { + throw SonoException("Couldn't open mcs file programming"); + } + + QTextStream save(&mcsFile); + + mcsList = this->_bpiFlash->readMcs(); + + while (num < MCS_FILE_SIZE / 4) + { + save << (mcsList).at(num); + num += sizeof (quint32); + } + mcsFile.flush(); + mcsFile.close(); +} + void TrxBoard::setProbeDependParams(ScenPrbDepHardwareParam& prbDepParams) { /////////////////////////// DSP setting /////////////////////////// @@ -401,37 +432,24 @@ void TrxBoard::setProbeDependParams(ScenPrbDepHardwareParam& prbDepParams) { throw SonoException("Apodization lut is out of range"); } - QList > apodizationQ; - foreach(auto vec, prbDepParams.prbDepParams.apodizationLut) - { - apodizationQ.push_back(vec.toList()); - } - this->_beamFormerSlave0->apodizationLut(apodizationQ); - this->_beamFormerSlave1->apodizationLut(apodizationQ); - this->_beamFormerSlave2->apodizationLut(apodizationQ); + this->_beamFormerSlave0->apodizationLut(prbDepParams.prbDepParams.apodizationLut); + this->_beamFormerSlave1->apodizationLut(prbDepParams.prbDepParams.apodizationLut); + this->_beamFormerSlave2->apodizationLut(prbDepParams.prbDepParams.apodizationLut); scenParamsFilling(set); if(prbDepParams.prbDepParams.atgcLut.size() != ATGC_LUT_MAX) { throw SonoException("Atgc lut is out of range"); } - QList > atgcLutQ; - foreach(auto vec, prbDepParams.prbDepParams.atgcLut) - { - atgcLutQ.push_back(vec.toList()); - } - this->_dsp->atgcLut(atgcLutQ); + + this->_dsp->atgcLut(prbDepParams.prbDepParams.atgcLut); if(prbDepParams.prbDepParams.lpfLut.size() != LPF_LUT_MAX) { throw SonoException("Lpf lut is out of range"); } - QList > lpfLutQ; - foreach(auto vec, prbDepParams.prbDepParams.lpfLut) - { - lpfLutQ.push_back(vec.toList()); - } - this->_dsp->lpfLut(lpfLutQ); + + this->_dsp->lpfLut(prbDepParams.prbDepParams.lpfLut); if(prbDepParams.prbDepParams.lpfScaleCoeff.size() != LPF_SCALE_MAX) { @@ -465,7 +483,7 @@ void TrxBoard::setScenario(ScenGenHardwareOutput_t& scenGenHw) throw SonoException("Total tx shot number is out of range"); } - _scenParams->rxBeamFormerNumber = scenGenHw.rxBeamFormerNumber.toVector(); + _scenParams->rxBeamFormerNumber = scenGenHw.rxBeamFormerNumber; if(_scenParams->rxBeamFormerNumber.size() > RX_BEAMFORMER_NUMBER_MAX) { throw SonoException("Rx beam former number is out of range"); @@ -570,7 +588,7 @@ void TrxBoard::setScenario(ScenGenHardwareOutput_t& scenGenHw) _scenParams->hwRegister->configLut->mla.append(k.mla); _scenParams->hwRegister->configLut->stb.append(k.stb); _scenParams->hwRegister->configLut->absEn.append(k.absEn); - _scenParams->hwRegister->configLut->ddcEn.append(k.ddcn); + _scenParams->hwRegister->configLut->ddcEn.append(k.ddcEn); _scenParams->hwRegister->configLut->dpeEn.append(k.dpeEn); _scenParams->hwRegister->configLut->stbEn.append(k.stbEn); _scenParams->hwRegister->configLut->wmfEn.append(k.wmfEn); @@ -1099,6 +1117,10 @@ void TrxBoard::scenPlayerStart(bool afeHvPwrOn) this->_scenPlayer->control.setCommand(true); +#ifndef DEVELOP_UI + packetEngine.init(); +#endif + _run = true; QtConcurrent::run(this, &TrxBoard::readData); @@ -1116,6 +1138,10 @@ void TrxBoard::scenPlayerStop(bool afeHvPwrOff) this->_device.stopDma(); + //uncrustify off + while(_device.isDmaBusy()); + //uncrustify on + this->_scenPlayer->control.setCommand(false); if(afeHvPwrOff) @@ -1592,6 +1618,8 @@ void TrxBoard::getHealthStatus(HealthStatus* healStat) const void TrxBoard::mcsProgram(QString path) { + scenParamsFilling(clear); + QFile mcsFile(path); if(mcsFile.fileName().isEmpty()) @@ -1605,39 +1633,15 @@ void TrxBoard::mcsProgram(QString path) } QByteArray mcsFileData = mcsFile.readAll(); - this->_bpiFlash->writeMcs(mcsFileData); - - mcsFileData.clear(); - mcsFile.close(); + mcsFile.close(); - scenParamsFilling(clear); + this->_bpiFlash->writeMcs(mcsFileData); } void TrxBoard::mcsVerify(QString path) const { - QList mcsList; - QFile mcsFile(path + ".bin"); - - if(mcsFile.fileName().isEmpty()) - { - throw SonoException("No file is selected"); - } - - if(!mcsFile.open(QIODevice::WriteOnly)) - { - throw SonoException("Couldn't open mcs file programming"); - } - - QTextStream save(&mcsFile); - - mcsList = this->_bpiFlash->readMcs(); - - for(auto i = 0; i < MCS_FILE_SIZE; i++) - { - save << (mcsList).at(i); - } - mcsFile.flush(); - mcsFile.close(); + this->_bpiFlash->readCommand(); + mcsRead(path); } void TrxBoard::getTrxStatus(StatusVec* status) const diff --git a/src/model/hardware/core/register/Field.cpp b/src/model/hardware/core/lowLevelApi/register/Field.cpp similarity index 98% rename from src/model/hardware/core/register/Field.cpp rename to src/model/hardware/core/lowLevelApi/register/Field.cpp index 2fb13d3..9a9796b 100644 --- a/src/model/hardware/core/register/Field.cpp +++ b/src/model/hardware/core/lowLevelApi/register/Field.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/Field.h" +#include "model/hardware/core/lowLevelApi/register/Field.h" Field::Field(quint32 mask, bool isSigned) { diff --git a/src/model/hardware/core/register/Register.cpp b/src/model/hardware/core/lowLevelApi/register/Register.cpp similarity index 98% rename from src/model/hardware/core/register/Register.cpp rename to src/model/hardware/core/lowLevelApi/register/Register.cpp index f215def..8395d83 100644 --- a/src/model/hardware/core/register/Register.cpp +++ b/src/model/hardware/core/lowLevelApi/register/Register.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/Register.h" +#include "model/hardware/core/lowLevelApi/register/Register.h" Register::Register(quint8 bar, quint32 offset, SonoDevice* device, quint32 arrayLength) { diff --git a/src/model/hardware/core/register/afe/Afe.cpp b/src/model/hardware/core/lowLevelApi/register/afe/Afe.cpp similarity index 97% rename from src/model/hardware/core/register/afe/Afe.cpp rename to src/model/hardware/core/lowLevelApi/register/afe/Afe.cpp index 67ef468..a44ed23 100644 --- a/src/model/hardware/core/register/afe/Afe.cpp +++ b/src/model/hardware/core/lowLevelApi/register/afe/Afe.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/afe/Afe.h" +#include "model/hardware/core/lowLevelApi/register/afe/Afe.h" void Afe::setActTerm(const AfeConfig afe) const { diff --git a/src/model/hardware/core/register/beamFormer/BeamFormer.cpp b/src/model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.cpp similarity index 94% rename from src/model/hardware/core/register/beamFormer/BeamFormer.cpp rename to src/model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.cpp index 71ccfd1..cb563ef 100644 --- a/src/model/hardware/core/register/beamFormer/BeamFormer.cpp +++ b/src/model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/beamFormer/BeamFormer.h" +#include "model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.h" BeamFormer::BeamFormer(SonoDevice *device, quint32 offset) { diff --git a/src/model/hardware/core/register/boardsCtrlMngt/BoardsCtrlMngt.cpp b/src/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/BoardsCtrlMngt.cpp similarity index 94% rename from src/model/hardware/core/register/boardsCtrlMngt/BoardsCtrlMngt.cpp rename to src/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/BoardsCtrlMngt.cpp index d9a528c..2d157ef 100644 --- a/src/model/hardware/core/register/boardsCtrlMngt/BoardsCtrlMngt.cpp +++ b/src/model/hardware/core/lowLevelApi/register/boardsCtrlMngt/BoardsCtrlMngt.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/boardsCtrlMngt/BoardsCtrlMngt.h" +#include "model/hardware/core/lowLevelApi/register/boardsCtrlMngt/BoardsCtrlMngt.h" BoardsCtrlMngt::AttenuationFactor::AttenuationFactor() { @@ -655,7 +655,7 @@ void BoardsCtrlMngt::getSupervisorValue(SupervisorRbValue* sValue) const setReadbackCmd(false, false, false); getSupervisorI2cDone(); - timerShot(72); + timerShot(75); // uncrustify off while(!checkTimeout()); // uncrustify on @@ -771,28 +771,43 @@ void BoardsCtrlMngt::mpsDacsOn() const void BoardsCtrlMngt::mpsHvSet(float& hva, float& hvb) const { - if(hva > hvb && hva <= HVA_MAX_VALUE) + if(hva > hvb) { - if(hva > 3.3f) + if(hva > HVA_MAX_VALUE) { - _mpsDacs->cwdValue = 0.0f; - _mpsDacs->hvaValue = 3.3f; - _mpsDacs->hvbValue = 1.53f; + _mpsDacs->hvaValue = HVA_MAX_VALUE; + } + else if (hva < HVA_Offset) + { + _mpsDacs->hvaValue = HVA_Offset; } else { - _mpsDacs->cwdValue = 0.0f; _mpsDacs->hvaValue = hva; - _mpsDacs->hvbValue = hvb; } +// if(hvb > HVB_MAX_VALUE) +// { +// _mpsDacs->hvbValue = HVB_MAX_VALUE; +// } +// else if (hvb < HVB_Offset) +// { +// _mpsDacs->hvbValue = HVB_Offset; +// } +// else +// { +// _mpsDacs->hvbValue = hvb; +// } + _mpsDacs->hvbValue = HVB_Offset; + _mpsDacs->cwdValue = CWD_Offset; + getSupervisorI2cTimeout(); setMpsDacsValue(_mpsDacs); getSupervisorI2cDone(); } else { - throw SonoException("A and B voltage are out of range"); + throw SonoException("The hva must be greater than the hvb."); } } diff --git a/src/model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.cpp b/src/model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.cpp new file mode 100644 index 0000000..d529659 --- /dev/null +++ b/src/model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.cpp @@ -0,0 +1,102 @@ +#include "model/hardware/core/lowLevelApi/register/bpiFlash/BpiFlash.h" + +void BpiFlash::bpiInitialize() const +{ + quint32 baseAddr(0X4000000); + QList address; + QList data; + + address << 0x0 << 0xAA << 0xAA << 0x8 << 0x0 << 0x0 << 0x0 << 0x0 << 0x7FE0000 << 0x7FE0000 + << 0x7FE0000 << 0x7FE0000 << 0x0 << 0x0 << 0x0 << 0x0 << 0x7FE0000 << 0x7FE0000 + << 0x7FE0000 << 0x7FE0000; + data << 0xFF << 0x98 << 0xFF << 0x9090 << 0x5050 << 0x7070 << 0xF0F0 << 0xFFFF << 0x5050 + << 0x7070 << 0xF0F0 << 0xFFFF << 0x5050 << 0x7070 << 0xF0F0 << 0xFFFF << 0x5050 + << 0x7070 << 0xF0F0 << 0xFFFF; + + for (auto var = 0; var < address.size(); var++) + { + _mcsRdWr->_device->device.writeWord(1, baseAddr + address.at(var), data.at(var)); + } +} + +void BpiFlash::bpiReset() const +{ + quint32 baseAddr(0X4000000); + QList address; + QList data; + + address << 0x0 << 0x0 << 0x0 << 0x0 << 0x7FE0000 << 0x7FE0000 << 0x7FE0000 << 0x7FE0000; + data << 0x5050 << 0x7070 << 0xF0F0 << 0xFFFF << 0x5050 << 0x7070 << 0xF0F0 << 0xFFFF; + + for (auto var = 0; var < address.size(); var++) + { + _mcsRdWr->_device->device.writeWord(1, baseAddr + address.at(var), data.at(var)); + } +} + +void BpiFlash::bpiRead() const +{ + quint32 baseAddr(0X4000000); + QList address; + QList data; + + address << 0x0 << 0x0 << 0x0 << 0x0; + data << 0x5050 << 0x7070 << 0xF0F0 << 0xFFFF; + + for (auto var = 0; var < address.size(); var++) + { + _mcsRdWr->_device->device.writeWord(1, baseAddr + address.at(var), data.at(var)); + } +} + +BpiFlash::BpiFlash(SonoDevice* device) +{ + _mcsRdWr = new McsRdWr(device); +} + +BpiFlash::~BpiFlash() +{ + delete _mcsRdWr; +} + +void BpiFlash::writeMcs(QByteArray& mcs) const +{ + QList mcsList; + qint32 progByte(0); + quint32 progData(0); + QByteArray mcsArray; + + mcsList.clear(); + mcsArray.clear(); + + while(progByte < mcs.size()) + { + for(quint8 i(0); i < sizeof(quint32); i++) + { + mcsArray.append(mcs.at(i + progByte)); + } + + progData = byteArray2UintBigEndian(mcsArray); + mcsList.append(progData); + + mcsArray.clear(); + progByte += sizeof(quint32); + } + + this->_mcsRdWr->mcsWrite(mcsList); + this->_mcsRdWr->updateArray(); +} + +QList BpiFlash::readMcs(void) const +{ + this->_mcsRdWr->mcsListRd.clear(); + this->_mcsRdWr->syncArray(); + return (this->_mcsRdWr->mcsListRd); +} + +void BpiFlash::readCommand() const +{ + bpiInitialize(); + bpiReset(); + bpiRead(); +} diff --git a/src/model/hardware/core/register/builtInTest/BuiltInTest.cpp b/src/model/hardware/core/lowLevelApi/register/builtInTest/BuiltInTest.cpp similarity index 93% rename from src/model/hardware/core/register/builtInTest/BuiltInTest.cpp rename to src/model/hardware/core/lowLevelApi/register/builtInTest/BuiltInTest.cpp index 54b3ef6..7f11e6c 100644 --- a/src/model/hardware/core/register/builtInTest/BuiltInTest.cpp +++ b/src/model/hardware/core/lowLevelApi/register/builtInTest/BuiltInTest.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/builtInTest/BuiltInTest.h" +#include "model/hardware/core/lowLevelApi/register/builtInTest/BuiltInTest.h" void BuiltInTest::setDacOutputSelect(BiteOutputSelect* _outputSelect) const { diff --git a/src/model/hardware/core/register/clockDistributer/ClockDistributer.cpp b/src/model/hardware/core/lowLevelApi/register/clockDistributer/ClockDistributer.cpp similarity index 92% rename from src/model/hardware/core/register/clockDistributer/ClockDistributer.cpp rename to src/model/hardware/core/lowLevelApi/register/clockDistributer/ClockDistributer.cpp index 385062f..f3a7745 100644 --- a/src/model/hardware/core/register/clockDistributer/ClockDistributer.cpp +++ b/src/model/hardware/core/lowLevelApi/register/clockDistributer/ClockDistributer.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/clockDistributer/ClockDistributer.h" +#include "model/hardware/core/lowLevelApi/register/clockDistributer/ClockDistributer.h" void ClockDistributer::setCwModeEnable(ClockDistributer::ModeEnable &_enable) { diff --git a/src/model/hardware/core/register/debug/Debug.cpp b/src/model/hardware/core/lowLevelApi/register/debug/Debug.cpp similarity index 98% rename from src/model/hardware/core/register/debug/Debug.cpp rename to src/model/hardware/core/lowLevelApi/register/debug/Debug.cpp index 4054e9f..3e8af50 100644 --- a/src/model/hardware/core/register/debug/Debug.cpp +++ b/src/model/hardware/core/lowLevelApi/register/debug/Debug.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/debug/Debug.h" +#include "model/hardware/core/lowLevelApi/register/debug/Debug.h" Debug::Debug(SonoDevice *device, quint32 offset) { diff --git a/src/model/hardware/core/register/dsp/Dsp.cpp b/src/model/hardware/core/lowLevelApi/register/dsp/Dsp.cpp similarity index 95% rename from src/model/hardware/core/register/dsp/Dsp.cpp rename to src/model/hardware/core/lowLevelApi/register/dsp/Dsp.cpp index c40beb4..e30f7e2 100644 --- a/src/model/hardware/core/register/dsp/Dsp.cpp +++ b/src/model/hardware/core/lowLevelApi/register/dsp/Dsp.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/dsp/Dsp.h" +#include "model/hardware/core/lowLevelApi/register/dsp/Dsp.h" Dsp::Dsp(SonoDevice *device) { diff --git a/src/model/hardware/core/register/emulator/Emulator.cpp b/src/model/hardware/core/lowLevelApi/register/emulator/Emulator.cpp similarity index 94% rename from src/model/hardware/core/register/emulator/Emulator.cpp rename to src/model/hardware/core/lowLevelApi/register/emulator/Emulator.cpp index 3b4478d..c64bc22 100644 --- a/src/model/hardware/core/register/emulator/Emulator.cpp +++ b/src/model/hardware/core/lowLevelApi/register/emulator/Emulator.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/emulator/Emulator.h" +#include "model/hardware/core/lowLevelApi/register/emulator/Emulator.h" Emulator::Emulator(SonoDevice *device) { diff --git a/src/model/hardware/core/register/fpgaProgram/FpgaProgram.cpp b/src/model/hardware/core/lowLevelApi/register/fpgaProgram/FpgaProgram.cpp similarity index 97% rename from src/model/hardware/core/register/fpgaProgram/FpgaProgram.cpp rename to src/model/hardware/core/lowLevelApi/register/fpgaProgram/FpgaProgram.cpp index a706e4a..bccf3f8 100644 --- a/src/model/hardware/core/register/fpgaProgram/FpgaProgram.cpp +++ b/src/model/hardware/core/lowLevelApi/register/fpgaProgram/FpgaProgram.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/fpgaProgram/FpgaProgram.h" +#include "model/hardware/core/lowLevelApi/register/fpgaProgram/FpgaProgram.h" void FpgaProgram::setSlaveFpgaNumber(quint8& number) const { diff --git a/src/model/hardware/core/register/misc/Misc.cpp b/src/model/hardware/core/lowLevelApi/register/misc/Misc.cpp similarity index 98% rename from src/model/hardware/core/register/misc/Misc.cpp rename to src/model/hardware/core/lowLevelApi/register/misc/Misc.cpp index 4b3c754..e97f861 100644 --- a/src/model/hardware/core/register/misc/Misc.cpp +++ b/src/model/hardware/core/lowLevelApi/register/misc/Misc.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/misc/Misc.h" +#include "model/hardware/core/lowLevelApi/register/misc/Misc.h" Misc::Misc(SonoDevice *device) : _offsetMaster(0), _offsetSlave0(0x50002C), _offsetSlave1(0x90002C), _offsetSlave2(0xD0002C) { diff --git a/src/model/hardware/core/register/scenPlayer/ScenPlayer.cpp b/src/model/hardware/core/lowLevelApi/register/scenPlayer/ScenPlayer.cpp similarity index 91% rename from src/model/hardware/core/register/scenPlayer/ScenPlayer.cpp rename to src/model/hardware/core/lowLevelApi/register/scenPlayer/ScenPlayer.cpp index 7291d7e..8e38abb 100644 --- a/src/model/hardware/core/register/scenPlayer/ScenPlayer.cpp +++ b/src/model/hardware/core/lowLevelApi/register/scenPlayer/ScenPlayer.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/scenPlayer/ScenPlayer.h" +#include "model/hardware/core/lowLevelApi/register/scenPlayer/ScenPlayer.h" ScenPalyer::ScenPalyer(SonoDevice *device) { diff --git a/src/model/hardware/core/register/sram/Sram.cpp b/src/model/hardware/core/lowLevelApi/register/sram/Sram.cpp similarity index 95% rename from src/model/hardware/core/register/sram/Sram.cpp rename to src/model/hardware/core/lowLevelApi/register/sram/Sram.cpp index b0f36b2..075c977 100644 --- a/src/model/hardware/core/register/sram/Sram.cpp +++ b/src/model/hardware/core/lowLevelApi/register/sram/Sram.cpp @@ -1,4 +1,4 @@ -#include "model/hardware/core/register/sram/Sram.h" +#include "model/hardware/core/lowLevelApi/register/sram/Sram.h" Sram::Sram(SonoDevice *device) { diff --git a/src/model/hardware/core/register/bpiFlash/BpiFlash.cpp b/src/model/hardware/core/register/bpiFlash/BpiFlash.cpp deleted file mode 100644 index b6c45da..0000000 --- a/src/model/hardware/core/register/bpiFlash/BpiFlash.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include "model/hardware/core/register/bpiFlash/BpiFlash.h" - -BpiFlash::BpiFlash(SonoDevice* device) -{ - _mcsRdWr = new McsRdWr(device); -} - -BpiFlash::~BpiFlash() -{ - delete _mcsRdWr; -} - -void BpiFlash::writeMcs(QByteArray& mcs) const -{ - QList mcsList; - qint32 progByte(0); - quint32 progData(0); - QByteArray mcsArray; - - mcsList.clear(); - mcsArray.clear(); - - while(progByte < mcs.size()) - { - for(quint8 i(0); i < sizeof(quint32); i++) - { - mcsArray.append(mcs.at(i + progByte)); - } - - progData = byteArray2UintBigEndian(mcsArray); - mcsList.append(progData); - - mcsArray.clear(); - progByte += sizeof(quint32); - } - - this->_mcsRdWr->mcsWrite(mcsList); - this->_mcsRdWr->updateArray(); -} - -QList BpiFlash::readMcs(void) const -{ - this->_mcsRdWr->mcsListRd.clear(); - this->_mcsRdWr->syncArray(); - return (this->_mcsRdWr->mcsListRd); -} diff --git a/src/model/hardware/service/HardwarePacketEngine.cpp b/src/model/hardware/service/HardwarePacketEngine.cpp index 3da55c6..3a84943 100644 --- a/src/model/hardware/service/HardwarePacketEngine.cpp +++ b/src/model/hardware/service/HardwarePacketEngine.cpp @@ -53,5 +53,10 @@ void HardwarePacketEngine::newData(QByteArray buffer, bool flush) { _lastBatch = batch; } - } + } +} + +void HardwarePacketEngine::init() +{ + }