GFIR coefficient GUI & cleanup

CMakeLists.txt

@@ -176,7 +176,7 @@ if(ENABLE_TESTING)
     FetchContent_Declare(
       googletest
       GIT_REPOSITORY https://github.com/google/googletest.git
-      GIT_TAG        b10fad38c4026a29ea6561ab15fc4818170d1c10 # latest main at the time of writing this
+      GIT_TAG        dddb219c3eb96d7f9200f09b0a381f016e6b4562 # latest main at the time of writing this
     )
 
     set(INSTALL_GMOCK OFF) # Don't install the GMock headers

SoapyLMS7/Settings.cpp

@@ -388,7 +388,6 @@ void SoapyLMS7::setFrequency(
     TRXDir dir = direction == SOAPY_SDR_TX ? TRXDir::Tx : TRXDir::Rx;
     if (name == "RF")
     {
-        const auto clkId = dir == TRXDir::Tx ? 2 : 1;
         try
         {
             sdrDevice->SetFrequency(0, dir, channel, frequency);

src/CMakeLists.txt

@@ -50,6 +50,7 @@ set(LIME_SUITE_SOURCES
     threadHelper/threadHelper.cpp
     CDCM6208/CDCM6208_Dev.cpp
     gnuPlotPipe.h
+    parsers/CoefficientFileParser.cpp
 
     EnumToString.cpp
 
@@ -196,7 +197,6 @@ set(LMS7SUITE_GUI_SOURCES
     lms7002_wxgui/lms7002_pnlLDO_view.cpp
     lms7002_wxgui/lms7002_pnlAFE_view.cpp
     lms7002_wxgui/lms7002_pnlGains_view.cpp
-    lms7002_wxgui/CoefficientFileParser.cpp
     lms7002_wxgui/lms7002_pnlRxTSP_view.cpp
     lms7002_wxgui/lms7002_mainPanel.cpp
     # lms7002_wxgui/dlgViewSFR.cpp

src/boards/LMS7002M_SDRDevice.cpp

@@ -942,21 +942,19 @@ std::vector<double> LMS7002M_SDRDevice::GetGFIRCoefficients(uint8_t moduleIndex,
     lime::LMS7002M* lms = mLMSChips.at(moduleIndex);
 
     const uint8_t count = gfirID == 2 ? 120 : 40;
-    std::vector<int16_t> coefficientBuffer(count);
+    std::vector<double> coefficientBuffer(count);
 
     lms->GetGFIRCoefficients(trx, gfirID, coefficientBuffer.data(), count);
 
-    return std::vector<double>(coefficientBuffer.begin(), coefficientBuffer.end());
+    return coefficientBuffer;
 }
 
 void LMS7002M_SDRDevice::SetGFIRCoefficients(
     uint8_t moduleIndex, TRXDir trx, uint8_t channel, uint8_t gfirID, std::vector<double> coefficients)
 {
     lime::LMS7002M* lms = mLMSChips.at(moduleIndex);
 
-    std::vector<int16_t> convertedCoefficients(coefficients.begin(), coefficients.end());
-
-    lms->SetGFIRCoefficients(trx, gfirID, convertedCoefficients.data(), convertedCoefficients.size());
+    lms->SetGFIRCoefficients(trx, gfirID, coefficients.data(), coefficients.size());
 }
 
 void LMS7002M_SDRDevice::SetGFIR(uint8_t moduleIndex, TRXDir trx, uint8_t channel, uint8_t gfirID, bool enabled)

src/boards_wxgui/pnlGPIO.cpp

@@ -30,9 +30,9 @@ void pnlGPIO::Initialize(lime::SDRDevice* pControl)
         auto info = device->GetDescriptor();
 
         const std::unordered_map<std::string, int> specialGpioCounts{
-            { string(GetDeviceName(LMS_DEV_LIMESDRMINI)), 10 },
-            { string(GetDeviceName(LMS_DEV_LIMESDRMINI_V2)), 10 },
-            { string(GetDeviceName(LMS_DEV_LIMESDR_PCIE)), 16 },
+            { GetDeviceName(LMS_DEV_LIMESDRMINI), 10 },
+            { GetDeviceName(LMS_DEV_LIMESDRMINI_V2), 10 },
+            { GetDeviceName(LMS_DEV_LIMESDR_PCIE), 16 },
         };
 
         if (specialGpioCounts.find(info.name) != specialGpioCounts.end())

src/comms/USB/LMS64C_LMS7002M_Over_USB.cpp

@@ -21,4 +21,4 @@ int LMS64C_LMS7002M_Over_USB::SPI(uint32_t spiBusAddress, const uint32_t* MOSI,
 int LMS64C_LMS7002M_Over_USB::ResetDevice(int chipSelect)
 {
     return LMS64CProtocol::DeviceReset(*pipe, chipSelect);
-};
+}

src/fftviewer_wxgui/fftviewer_frFFTviewer.cpp

@@ -55,13 +55,13 @@ bool fftviewer_frFFTviewer::Initialize(SDRDevice* pDataPort)
     else
     {
         constexpr uint8_t modeChoicesItemCount = 2;
-        const std::array<wxString, modeChoicesItemCount> modeChoices{ "SISO", "MIMO" };
+        const std::array<const wxString, modeChoicesItemCount> modeChoices{ "SISO", "MIMO" };
         cmbMode->Set(modeChoicesItemCount, modeChoices.data());
         cmbMode->SetSelection(0);
         cmbMode->GetContainingSizer()->Layout(); // update the width of the box
 
         constexpr uint8_t channelVisibilityChoicesItemCount = 3;
-        const std::array<wxString, channelVisibilityChoicesItemCount> channelVisibilityChoices{ "A", "B", "A&B" };
+        const std::array<const wxString, channelVisibilityChoicesItemCount> channelVisibilityChoices{ "A", "B", "A&B" };
         cmbChannelVisibility->Set(channelVisibilityChoicesItemCount, channelVisibilityChoices.data());
         cmbChannelVisibility->SetSelection(0);
         cmbChannelVisibility->GetContainingSizer()->Layout(); // update the width of the box

src/include/limesuite/LMS7002M.h

@@ -280,11 +280,10 @@ class LIME_API LMS7002M
     int SetNCOPhaseOffsetForMode0(TRXDir dir, float_type angle_Deg);
     int SetNCOPhaseOffset(TRXDir dir, uint8_t index, float_type angle_Deg);
     float_type GetNCOPhaseOffset_Deg(TRXDir dir, uint8_t index);
-    int SetGFIRCoefficients(TRXDir dir, uint8_t GFIR_index, const int16_t* coef, uint8_t coefCount);
-    int GetGFIRCoefficients(TRXDir dir, uint8_t GFIR_index, int16_t* coef, uint8_t coefCount);
     float_type GetReferenceClk_TSP(TRXDir dir);
 
-    int WriteGFIRCoefficients(TRXDir dir, uint8_t gfirIndex, const float_type* coef, uint8_t coefCount);
+    int GetGFIRCoefficients(TRXDir dir, uint8_t gfirIndex, float_type* coef, uint8_t coefCount);
+    int SetGFIRCoefficients(TRXDir dir, uint8_t gfirIndex, const float_type* coef, uint8_t coefCount);
     int SetGFIRFilter(TRXDir dir, unsigned ch, bool enabled, double bandwidth);
 
     int SetNCOFrequencies(TRXDir dir, const float_type* freq_Hz, uint8_t count, float_type phaseOffset);

src/include/limesuite/commonTypes.h

@@ -5,7 +5,7 @@ namespace lime {
 enum class TRXDir : bool { Rx, Tx };
 
 struct Range {
-    Range(double min = 0.0, double max = 0.0, double step = 0.0)
+    constexpr Range(double min = 0.0, double max = 0.0, double step = 0.0)
         : min(min)
         , max(max)
         , step(step){};
@@ -21,14 +21,14 @@ struct Range {
 template<class T> class DeltaVariable
 {
   public:
-    DeltaVariable(T init)
+    constexpr DeltaVariable(T init)
         : mValue(init)
         , mLastValue(0){};
-    void set(T val) { mValue = val; }
-    void add(T val) { mValue += val; }
-    T delta() { return mValue - mLastValue; } // value change since last reset
-    T value() const { return mValue; }
-    void checkpoint() { mLastValue = mValue; }
+    constexpr void set(T val) { mValue = val; }
+    constexpr void add(T val) { mValue += val; }
+    constexpr T delta() const { return mValue - mLastValue; } // value change since last reset
+    constexpr T value() const { return mValue; }
+    constexpr void checkpoint() { mLastValue = mValue; }
 
   private:
     T mValue;