From 57c2d88b3e2c4a678645eb2dbcbee70726c5ef44 Mon Sep 17 00:00:00 2001 From: Jon Szymaniak Date: Fri, 30 May 2014 00:09:55 -0400 Subject: [PATCH] bladeRF-cli: Added RX DC cal option that skips LMS calibration --- host/utilities/bladeRF-cli/src/cmd/calibrate.c | 3 +++ host/utilities/bladeRF-cli/src/cmd/calibrate.h | 1 + host/utilities/bladeRF-cli/src/cmd/calibrate_dc.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/host/utilities/bladeRF-cli/src/cmd/calibrate.c b/host/utilities/bladeRF-cli/src/cmd/calibrate.c index c50b5759..96b6ecd6 100644 --- a/host/utilities/bladeRF-cli/src/cmd/calibrate.c +++ b/host/utilities/bladeRF-cli/src/cmd/calibrate.c @@ -67,6 +67,9 @@ int cmd_calibrate(struct cli_state *state, int argc, char **argv) ops = CAL_DC_LMS_ALL; } else if (strcasecmp(argv[1], "dc_rx") == 0) { ops = CAL_DC_AUTO_RX; + } else if (strcasecmp(argv[1], "dc_rx_skip_lms") == 0) { + /* This is generally only useful for development and debugging */ + ops = CAL_DC_AUTO_ | CAL_DC_RX_; } else if (strcasecmp(argv[1], "dc_tx") == 0) { ops = CAL_DC_AUTO_TX; } else if (strcasecmp(argv[1], "dc") == 0) { diff --git a/host/utilities/bladeRF-cli/src/cmd/calibrate.h b/host/utilities/bladeRF-cli/src/cmd/calibrate.h index 14a208db..6d606a6c 100644 --- a/host/utilities/bladeRF-cli/src/cmd/calibrate.h +++ b/host/utilities/bladeRF-cli/src/cmd/calibrate.h @@ -39,6 +39,7 @@ CAL_DC_LMS_RXVGA2) #define CAL_DC_LMS_ALL (CAL_DC_LMS_TX_ALL | CAL_DC_LMS_RX_ALL) +#define CAL_DC_AUTO_RX_SKIP_LMS (CAL_DC_AUTO_ | CAL_DC_AUTO_) #define CAL_DC_AUTO_RX (CAL_DC_AUTO_ | CAL_DC_LMS_RX_ALL) #define CAL_DC_AUTO_TX (CAL_DC_AUTO_RX | CAL_DC_LMS_TX_ALL) #define CAL_DC_AUTO (CAL_DC_AUTO_RX | CAL_DC_AUTO_TX) diff --git a/host/utilities/bladeRF-cli/src/cmd/calibrate_dc.c b/host/utilities/bladeRF-cli/src/cmd/calibrate_dc.c index b8722762..f9b15feb 100644 --- a/host/utilities/bladeRF-cli/src/cmd/calibrate_dc.c +++ b/host/utilities/bladeRF-cli/src/cmd/calibrate_dc.c @@ -729,7 +729,7 @@ int calibrate_dc(struct bladerf *dev, unsigned int ops) } - if (IS_CAL(CAL_DC_AUTO_RX, ops)) { + if (IS_CAL(CAL_DC_AUTO_RX, ops) || IS_CAL(CAL_DC_AUTO_RX_SKIP_LMS, ops)) { int16_t avg_i, avg_q; status = calibrate_dc_rx(dev, &dc_i, &dc_q, &avg_i, &avg_q); if (status != 0) {