Skip to content

Commit

Permalink
Merge pull request #406 from Matom-ai/litepcie-update-c-cleanup
Browse files Browse the repository at this point in the history
Minor code cleanup
  • Loading branch information
rjonaitis authored Feb 28, 2024
2 parents 38ab764 + f0d3333 commit 1f8b2c6
Show file tree
Hide file tree
Showing 22 changed files with 82 additions and 98 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ jobs:
- name: Configure CMake (windows)
if: matrix.os == 'windows-latest'
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_EVB7COM=ON -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DwxWidgets_ROOT_DIR=${{github.workspace}}/deps/wxWidgets -DFX3_SDK_PATH=${{github.workspace}}/deps/FX3SDK
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DwxWidgets_ROOT_DIR=${{github.workspace}}/deps/wxWidgets -DFX3_SDK_PATH=${{github.workspace}}/deps/FX3SDK

- name: Configure CMake (linux)
if: matrix.os != 'windows-latest'
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_EVB7COM=ON -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}}
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}}

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
4 changes: 2 additions & 2 deletions .github/workflows/gtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ jobs:
- name: Configure CMake (windows)
if: matrix.os == 'windows-latest'
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_EVB7COM=ON -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DFX3_SDK_PATH=${{github.workspace}}/deps/FX3SDK -DBUILD_SHARED_LIBS=OFF
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DFX3_SDK_PATH=${{github.workspace}}/deps/FX3SDK -DBUILD_SHARED_LIBS=OFF

- name: Configure CMake (linux)
if: matrix.os != 'windows-latest'
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_EVB7COM=ON -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DBUILD_SHARED_LIBS=OFF -DBINARY_OUTPUT_DIR=${{github.workspace}}/build/bin/
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DBUILD_SHARED_LIBS=OFF -DBINARY_OUTPUT_DIR=${{github.workspace}}/build/bin/

- name: Build tests
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target LimeSuite2Test
Expand Down
4 changes: 2 additions & 2 deletions amarisoft-plugin/trx_limesuite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ int __attribute__((visibility("default"))) trx_driver_init(TRXState* hostState)
{
if (val < 0 || val > 1)
{
val = std::min(std::max(0.0, val), 1.0);
val = std::clamp(val, 0.0, 1.0);
Log(LogLevel::WARNING, "%s out of range, clamping to %g", varname, val);
}
s->rxGainNorm[p] = val;
Expand All @@ -1056,7 +1056,7 @@ int __attribute__((visibility("default"))) trx_driver_init(TRXState* hostState)
{
if (val < 0 || val > 1)
{
val = std::min(std::max(0.0, val), 1.0);
val = std::clamp(val, 0.0, 1.0);
Log(LogLevel::WARNING, "%s out of range, clamping to %g", varname, val);
}
s->txGainNorm[p] = val;
Expand Down
24 changes: 13 additions & 11 deletions src/FPGA_common/FPGA_common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ OpStatus FPGA::WriteRegisters(const uint32_t* addrs, const uint32_t* data, unsig
std::vector<uint32_t> spiBuffer;
if (useCache)
{
static const int readonly_regs[] = { 0x000,
static constexpr std::array<int, 45> readonly_regs = {
0x000,
0x001,
0x002,
0x003,
Expand Down Expand Up @@ -179,12 +180,12 @@ OpStatus FPGA::WriteRegisters(const uint32_t* addrs, const uint32_t* data, unsig
0x10F,
0x110,
0x111,
0x114 };
0x114,
};

for (unsigned i = 0; i < cnt; i++)
{
auto endptr = readonly_regs + sizeof(readonly_regs) / sizeof(*readonly_regs);
if (std::find(readonly_regs, endptr, addrs[i]) != endptr)
if (std::find(readonly_regs.begin(), readonly_regs.end(), addrs[i]) != readonly_regs.end())
continue;

auto result = regsCache.find(addrs[i]);
Expand Down Expand Up @@ -224,7 +225,8 @@ OpStatus FPGA::ReadRegisters(const uint32_t* addrs, uint32_t* data, unsigned cnt
std::vector<uint32_t> spiBuffer;
if (useCache)
{
static const int volatile_regs[] = { 0x021,
static constexpr std::array<int, 42> volatile_regs = {
0x021,
0x022,
0x060,
0x065,
Expand Down Expand Up @@ -265,13 +267,13 @@ OpStatus FPGA::ReadRegisters(const uint32_t* addrs, uint32_t* data, unsigned cnt
0x10F,
0x110,
0x111,
0x114 };
0x114,
};

std::vector<uint32_t> reg_addr;
for (unsigned i = 0; i < cnt; i++)
{
auto endptr = volatile_regs + sizeof(volatile_regs) / sizeof(*volatile_regs);
if (std::find(volatile_regs, endptr, addrs[i]) == endptr)
if (std::find(volatile_regs.begin(), volatile_regs.end(), addrs[i]) == volatile_regs.end())
{
auto result = regsCache.find(addrs[i]);
if (result != regsCache.end())
Expand Down Expand Up @@ -1186,7 +1188,7 @@ double FPGA::DetectRefClk(double fx3Clk)
{
lime::debug("FPGA::DetectRefClk fx3Clk:%g", fx3Clk);
const double fx3Cnt = 16777210; //fixed fx3 counter in FPGA
const double clkTbl[] = { 10e6, 30.72e6, 38.4e6, 40e6, 52e6 };
const std::array<double, 5> clkTbl = { 10e6, 30.72e6, 38.4e6, 40e6, 52e6 };
const uint32_t addr[] = { 0x61, 0x63 };
const uint32_t vals[] = { 0x0, 0x0 };
if (WriteRegisters(addr, vals, 2) != OpStatus::SUCCESS)
Expand Down Expand Up @@ -1218,10 +1220,10 @@ double FPGA::DetectRefClk(double fx3Clk)
double count = (vals2[0] | (vals2[1] << 16)); //cock counter
count *= fx3Clk / fx3Cnt; //estimate ref clock based on FX3 Clock
lime::debug("Estimated reference clock %1.4f MHz", count / 1e6);
unsigned i = 0;
std::size_t i = 0;
double delta = 100e6;

while (i < sizeof(clkTbl) / sizeof(*clkTbl))
while (i < clkTbl.size())
if (delta < fabs(count - clkTbl[i]))
break;
else
Expand Down
23 changes: 7 additions & 16 deletions src/SystemResources.in.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "Logger.h"

#include <cstdlib> //getenv, system
#include <filesystem>
#include <vector>
#include <sstream>
#include <iostream>
Expand All @@ -30,9 +31,6 @@
#include <unistd.h>
#endif

#include <sys/types.h>
#include <sys/stat.h> //stat

std::string lime::getLimeSuiteRoot(void)
{
//first check the environment variable
Expand Down Expand Up @@ -175,27 +173,20 @@ int lime::downloadImageResource(const std::string& name)
const std::string destFile(destDir + "/" + name);
const std::string sourceUrl("https://downloads.myriadrf.org/project/limesuite/@VERSION_MAJOR@.@VERSION_MINOR@/" + name);

//check if the directory already exists
struct stat s;
if (stat(destDir.c_str(), &s) == 0)
if (std::filesystem::exists(destDir))
{
if ((s.st_mode & S_IFDIR) == 0)
if (!std::filesystem::is_directory(destDir))
{
return lime::ReportError("Not a directory: %s", destDir.c_str());
}
}

//create images directory
else
{
#ifdef __unix__
const std::string mkdirCmd("mkdir -p \"" + destDir + "\"");
#else
const std::string mkdirCmd("md.exe \"" + destDir + "\"");
#endif
int result = std::system(mkdirCmd.c_str());
if (result != 0)
bool result = std::filesystem::create_directories(destDir);
if (!result)
{
return lime::ReportError(result, "Failed to create directory: %s", destDir.c_str());
}
}

//check for write access
Expand Down
2 changes: 1 addition & 1 deletion src/boards/LimeSDR/LimeSDR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ OpStatus LimeSDR::UploadMemory(
return OpStatus::INVALID_VALUE;
}

return mfpgaPort->ProgramWrite(data, length, progMode, target, callback);
return mfpgaPort->ProgramWrite(data, length, progMode, static_cast<int>(target), callback);
}

OpStatus LimeSDR::MemoryWrite(std::shared_ptr<DataStorage> storage, Region region, const void* data)
Expand Down
2 changes: 1 addition & 1 deletion src/boards/LimeSDR_X3/LimeSDR_X3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,7 @@ OpStatus LimeSDR_X3::UploadMemory(
return OpStatus::INVALID_VALUE;
}

return mfpgaPort->ProgramWrite(data, length, progMode, target, callback);
return mfpgaPort->ProgramWrite(data, length, progMode, static_cast<int>(target), callback);
}

OpStatus LimeSDR_X3::MemoryWrite(std::shared_ptr<DataStorage> storage, Region region, const void* data)
Expand Down
2 changes: 1 addition & 1 deletion src/boards/LimeSDR_XTRX/LimeSDR_XTRX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ OpStatus LimeSDR_XTRX::UploadMemory(
return OpStatus::INVALID_VALUE;
}

return fpgaPort->ProgramWrite(data, length, progMode, target, callback);
return fpgaPort->ProgramWrite(data, length, progMode, static_cast<int>(target), callback);
}

OpStatus LimeSDR_XTRX::MemoryWrite(std::shared_ptr<DataStorage> storage, Region region, const void* data)
Expand Down
2 changes: 1 addition & 1 deletion src/boards/MMX8/MM_X8.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ OpStatus LimeSDR_MMX8::UploadMemory(
int progMode = 1;
LMS64CProtocol::ProgramWriteTarget target;
target = LMS64CProtocol::ProgramWriteTarget::FPGA;
return mMainFPGAcomms->ProgramWrite(data, length, progMode, target, callback);
return mMainFPGAcomms->ProgramWrite(data, length, progMode, static_cast<int>(target), callback);
}

SDRDevice* dev = mSubDevices.at(moduleIndex);
Expand Down
4 changes: 0 additions & 4 deletions src/boards_wxgui/pnlGPIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
class wxStaticText;
class wxCheckBox;

namespace lime {
class IConnection;
}

class pnlGPIO : public wxPanel
{
public:
Expand Down
4 changes: 0 additions & 4 deletions src/boards_wxgui/pnlLimeSDR.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
class wxFlexGridSizer;
class wxCheckBox;

namespace lime {
class IConnection;
}

class pnlGPIO;

class pnlLimeSDR : public wxPanel
Expand Down
2 changes: 1 addition & 1 deletion src/cli/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include(FeatureSummary)
include(CMakeDependentOption)
cmake_dependent_option(ENABLE_CLI "Enable command line programs" ON "ENABLE_LIBRARY" ON)
cmake_dependent_option(ENABLE_CLI "Enable command line programs" ON "ENABLE_LIBRARY" ON)
add_feature_info(CLI ENABLE_CLI "LimeSuite command line interface tools")
if (NOT ENABLE_CLI)
return()
Expand Down
16 changes: 8 additions & 8 deletions src/include/limesuite/LMS7002M_parameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ static const struct LMS7Parameter LMS7_MODE_INTERLEAVE_AFE = { 0x0082, 12, 12, 0
static const struct LMS7Parameter LMS7_MUX_AFE_1 = { 0x0082, 11, 10, 0, "MUX_AFE_1", "Controls the MUX at the input of the ADC channel 1" };
static const struct LMS7Parameter LMS7_MUX_AFE_2 = { 0x0082, 9, 8, 0, "MUX_AFE_2", "Controls the MUX at the input of the ADC channel 2" };
static const struct LMS7Parameter LMS7_PD_AFE = { 0x0082, 5, 5, 0, "PD_AFE", "Power down control for the AFE current mirror in BIAS_TOP" };
static const struct LMS7Parameter LMS7_PD_RX_AFE1 = { 0x0082, 4, 4, 0, "PD_RX_AFE1", "Power down control for the ADC of channel 1" };
static const struct LMS7Parameter LMS7_PD_RX_AFE1 = { 0x0082, 4, 4, 0, "PD_RX_AFE1", "Power down control for the ADC of channel 1" };
static const struct LMS7Parameter LMS7_PD_RX_AFE2 = { 0x0082, 3, 3, 1, "PD_RX_AFE2", "Power down control for the ADC of channel 2" };
static const struct LMS7Parameter LMS7_PD_TX_AFE1 = { 0x0082, 2, 2, 0, "PD_TX_AFE1", "Power down control for the DAC of channel 1" };
static const struct LMS7Parameter LMS7_PD_TX_AFE2 = { 0x0082, 1, 1, 1, "PD_TX_AFE2", "Power down control for the DAC of channel 2" };
Expand Down Expand Up @@ -389,7 +389,7 @@ static const struct LMS7Parameter LMS7_EN_G_TRF = { 0x0100, 0, 0, 1, "EN_G_TRF",
static const struct LMS7Parameter LMS7_F_TXPAD_TRF = { 0x0101, 15, 13, 3, "F_TXPAD_TRF", "Controls the switched capacitor at the TXPAD output. Is used for fine tuning of the TXPAD output" };
static const struct LMS7Parameter LMS7_L_LOOPB_TXPAD_TRF = { 0x0101, 12, 11, 3, "L_LOOPB_TXPAD_TRF", "Controls the loss of the of the loopback path at the TX side" };
static const struct LMS7Parameter LMS7_LOSS_LIN_TXPAD_TRF = { 0x0101, 10, 6, 0, "LOSS_LIN_TXPAD_TRF", "Controls the gain of the linearizing part of of the TXPAD" };
static const struct LMS7Parameter LMS7_LOSS_MAIN_TXPAD_TRF = { 0x0101, 5, 1, 0, "LOSS_MAIN_TXPAD_TRF", "Controls the gain output power of the TXPAD" };
static const struct LMS7Parameter LMS7_LOSS_MAIN_TXPAD_TRF = { 0x0101, 5, 1, 0, "LOSS_MAIN_TXPAD_TRF", "Controls the gain output power of the TXPAD" };
static const struct LMS7Parameter LMS7_EN_LOOPB_TXPAD_TRF = { 0x0101, 0, 0, 0, "EN_LOOPB_TXPAD_TRF", "Enables the TXPAD loopback path" };
static const struct LMS7Parameter LMS7_GCAS_GNDREF_TXPAD_TRF = { 0x0102, 15, 15, 0, "GCAS_GNDREF_TXPAD_TRF", "Controls if the TXPAD cascode transistor gate bias is referred to VDD or GND" };
static const struct LMS7Parameter LMS7_ICT_LIN_TXPAD_TRF = { 0x0102, 14, 10, 12, "ICT_LIN_TXPAD_TRF", "Control the bias current of the linearization section of the TXPAD" };
Expand Down Expand Up @@ -435,11 +435,11 @@ static const struct LMS7Parameter LMS7_PD_TIA_RFE = { 0x010C, 1, 1, 0, "PD_TIA_R
static const struct LMS7Parameter LMS7_EN_G_RFE = { 0x010C, 0, 0, 1, "EN_G_RFE", "Enable control for all the RFE_1 power downs" };
static const struct LMS7Parameter LMS7_SEL_PATH_RFE = { 0x010D, 8, 7, 1, "SEL_PATH_RFE", "Selects the active path of the RXFE" };
static const struct LMS7Parameter LMS7_EN_DCOFF_RXFE_RFE = { 0x010D, 6, 6, 0, "EN_DCOFF_RXFE_RFE", "Enables the DCOFFSET block for the RXFE" };
static const struct LMS7Parameter LMS7_EN_INSHSW_LB1_RFE = { 0x010D, 4, 4, 1, "EN_INSHSW_LB1_RFE", "Enables the input shorting switch at the input of the loopback 1 (in parallel with LNAL mixer)" };
static const struct LMS7Parameter LMS7_EN_INSHSW_LB2_RFE = { 0x010D, 3, 3, 1, "EN_INSHSW_LB2_RFE", "Enables the input shorting switch at the input of the loopback 2 (in parallel with LNAW mixer)" };
static const struct LMS7Parameter LMS7_EN_INSHSW_L_RFE = { 0x010D, 2, 2, 1, "EN_INSHSW_L_RFE", "Enables the input shorting switch at the input of the LNAL" };
static const struct LMS7Parameter LMS7_EN_INSHSW_W_RFE = { 0x010D, 1, 1, 1, "EN_INSHSW_W_RFE", "Enables the input shorting switch at the input of the LNAW" };
static const struct LMS7Parameter LMS7_EN_NEXTRX_RFE = { 0x010D, 0, 0, 0, "EN_NEXTRX_RFE", "Enables the daisy chain LO buffer going from RXFE1 to RXFE2" };
static const struct LMS7Parameter LMS7_EN_INSHSW_LB1_RFE = { 0x010D, 4, 4, 1, "EN_INSHSW_LB1_RFE", "Enables the input shorting switch at the input of the loopback 1 (in parallel with LNAL mixer)" };
static const struct LMS7Parameter LMS7_EN_INSHSW_LB2_RFE = { 0x010D, 3, 3, 1, "EN_INSHSW_LB2_RFE", "Enables the input shorting switch at the input of the loopback 2 (in parallel with LNAW mixer)" };
static const struct LMS7Parameter LMS7_EN_INSHSW_L_RFE = { 0x010D, 2, 2, 1, "EN_INSHSW_L_RFE", "Enables the input shorting switch at the input of the LNAL" };
static const struct LMS7Parameter LMS7_EN_INSHSW_W_RFE = { 0x010D, 1, 1, 1, "EN_INSHSW_W_RFE", "Enables the input shorting switch at the input of the LNAW" };
static const struct LMS7Parameter LMS7_EN_NEXTRX_RFE = { 0x010D, 0, 0, 0, "EN_NEXTRX_RFE", "Enables the daisy chain LO buffer going from RXFE1 to RXFE2" };
static const struct LMS7Parameter LMS7_DCOFFI_RFE = { 0x010E, 13, 7, 64, "DCOFFI_RFE", "Controls DC offset at the output of the TIA by injecting current to the input of the TIA (I side)" };
static const struct LMS7Parameter LMS7_DCOFFQ_RFE = { 0x010E, 6, 0, 64, "DCOFFQ_RFE", "Controls DC offset at the output of the TIA by injecting current to the input of the TIA (Q side)" };
static const struct LMS7Parameter LMS7_ICT_LOOPB_RFE = { 0x010F, 14, 10, 12, "ICT_LOOPB_RFE", "Controls the reference current of the RXFE loopback amplifier" };
Expand Down Expand Up @@ -635,7 +635,7 @@ static const struct LMS7Parameter LMS7_CMIX_GAIN_RXTSP_R3 = { 0x040C, 12, 12, 0,
static const struct LMS7Parameter LMS7_R5_LPF_BYP_TBB = { 0x010B, 0, 0, 0, "R5_LPF_BYP_TBB", "Bypasses LPFS5_TBB low pass real-pole filter capacitor banks" };
static const struct LMS7Parameter LMS7_CG_IAMP_TBB_R3 = { 0x0125, 15, 10, 37, "CG_IAMP_TBB_R3", "[Alternative control] This controls the reference bias current of the IAMP's cascode transistors gate voltages that set the IAMP's input voltage level. The IAMP's input is connected to the DAC output"};
static const struct LMS7Parameter LMS7_LOSS_LIN_TXPAD_R3 = { 0x0125, 9, 5, 0, "LOSS_LIN_TXPAD_R3", "[Alternative control] Controls the gain of the linearizing part of of the TXPAD"};
static const struct LMS7Parameter LMS7_LOSS_MAIN_TXPAD_R3 = { 0x0125, 4, 0, 0, "LOSS_MAIN_TXPAD_R3", "[Alternative control] Controls the gain output power of the TXPAD"};
static const struct LMS7Parameter LMS7_LOSS_MAIN_TXPAD_R3 = { 0x0125, 4, 0, 0, "LOSS_MAIN_TXPAD_R3", "[Alternative control] Controls the gain output power of the TXPAD"};
static const struct LMS7Parameter LMS7_C_CTL_PGA_RBB_R3 = { 0x0126, 12, 11, 2, "C_CTL_PGA_RBB_R3", "[Alternative control] Control the value of the feedback capacitor of the PGA that is used to help against the parasitic cap at the virtual node for stability"};
static const struct LMS7Parameter LMS7_G_PGA_RBB_R3 = { 0x0126, 10, 6, 11, "G_PGA_RBB_R3", "[Alternative control] Gain of the PGA"};
static const struct LMS7Parameter LMS7_G_LNA_RFE_R3 = { 0x0126, 5, 2, 15, "G_LNA_RFE_R3", "[Alternative control] Controls the gain of the LNA"};
Expand Down
5 changes: 2 additions & 3 deletions src/lms7002_wxgui/lms7002_mainPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,8 @@ void lms7002_mainPanel::OnUploadAll(wxCommandEvent& event)

void lms7002_mainPanel::OnReadTemperature(wxCommandEvent& event)
{
double t = 0.0;
int status = -1; // TODO: LMS_GetChipTemperature(sdrDevice, 0, &t);
if (status != 0)
double t = soc->GetTemperature();
if (t == 0)
wxMessageBox(_("Failed to read chip temperature"), _("Warning"));
txtTemperature->SetLabel(wxString::Format("Temperature: %.0f C", t));
}
Expand Down
2 changes: 1 addition & 1 deletion src/lms7002_wxgui/lms7002_pnlAFE_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ lms7002_pnlAFE_view::lms7002_pnlAFE_view(wxWindow* parent, wxWindowID id, const

chkPD_RX_AFE1 =
new wxCheckBox(sbSizerPowerDowns->GetStaticBox(), ID_PD_RX_AFE1, wxT("ADC ch. 1"), wxDefaultPosition, wxDefaultSize, 0);
chkPD_RX_AFE1->SetToolTip(wxT("Power down control for the ADC of channel 1"));
chkPD_RX_AFE1->SetToolTip(wxT("Power down control for the ADC of channel 1"));

fgSizer64->Add(chkPD_RX_AFE1, 0, wxALL | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 0);

Expand Down
2 changes: 1 addition & 1 deletion src/lms7002_wxgui/lms7002_pnlBIST_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ lms7002_pnlBIST_view::lms7002_pnlBIST_view(wxWindow* parent, wxWindowID id, cons
fgSizer194->Add(chkSDM_TSTO_SXR, 0, 0, 5);

chkBENT = new wxCheckBox(sbSizer123->GetStaticBox(), ID_BENT, wxT("Enable SXT BIST"), wxDefaultPosition, wxDefaultSize, 0);
chkBENT->SetToolTip(wxT("enables transmitter BIST"));
chkBENT->SetToolTip(wxT("enables transmitter BIST"));

fgSizer194->Add(chkBENT, 0, flags, 0);

Expand Down
4 changes: 2 additions & 2 deletions src/lms7002_wxgui/lms7002_pnlGains_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ lms7002_pnlGains_view::lms7002_pnlGains_view(wxWindow* parent, wxWindowID id, co

chkTRX_GAIN_SRC =
new wxCheckBox(this, ID_EN_NEXTRX_RFE, wxT("Alternative TRX gain source"), wxDefaultPosition, wxDefaultSize, 0);
chkTRX_GAIN_SRC->SetToolTip(wxT("Enables the daisy chain LO buffer going from RXFE1 to RXFE2"));
chkTRX_GAIN_SRC->SetToolTip(wxT("Enables the daisy chain LO buffer going from RXFE1 to RXFE2"));

fgSizer309->Add(chkTRX_GAIN_SRC, 0, wxALL, 5);

Expand Down Expand Up @@ -115,7 +115,7 @@ lms7002_pnlGains_view::lms7002_pnlGains_view(wxWindow* parent, wxWindowID id, co

cmbLOSS_MAIN_TXPAD_TRF = new wxComboBox(
sbSizer148->GetStaticBox(), ID_LOSS_MAIN_TXPAD_TRF, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0);
cmbLOSS_MAIN_TXPAD_TRF->SetToolTip(wxT("Controls the gain output power of the TXPAD"));
cmbLOSS_MAIN_TXPAD_TRF->SetToolTip(wxT("Controls the gain output power of the TXPAD"));

txSizer->Add(cmbLOSS_MAIN_TXPAD_TRF, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL | wxEXPAND, 0);

Expand Down
Loading

0 comments on commit 1f8b2c6

Please sign in to comment.