From 44af654b129c306c7ad24f9de2d052d3158f9d18 Mon Sep 17 00:00:00 2001 From: Jon Szymaniak Date: Tue, 24 Nov 2015 14:57:48 -0500 Subject: [PATCH] bladeRF-cli: Added print/set support for VCTCXO tamer --- .../bladeRF-cli/src/cmd/doc/cmd_help.h.in | 9 +- .../bladeRF-cli/src/cmd/doc/cmd_help.man.in | 19 +++- .../src/cmd/doc/interactive-help.md | 69 ++++++------ host/utilities/bladeRF-cli/src/cmd/printset.c | 105 +++++++++++++++--- 4 files changed, 152 insertions(+), 50 deletions(-) diff --git a/host/utilities/bladeRF-cli/src/cmd/doc/cmd_help.h.in b/host/utilities/bladeRF-cli/src/cmd/doc/cmd_help.h.in index 327377eb..666ff799 100644 --- a/host/utilities/bladeRF-cli/src/cmd/doc/cmd_help.h.in +++ b/host/utilities/bladeRF-cli/src/cmd/doc/cmd_help.h.in @@ -27,7 +27,7 @@ * Any manual modifications to this file will be overwritten! * To edit the content of help strings, please edit interactive-help.md * - * Last generated: Wed Dec 9 22:46:24 EST 2015 by jynik + * Last generated: Fri Dec 11 12:34:22 EST 2015 by jynik */ #ifndef BLADERF_CLI_DOC_CMD_HELP_H__ @@ -438,6 +438,7 @@ " sampling External or internal sampling mode\n" \ " samplerate Samplerate settings\n" \ " trimdac VCTCXO Trim DAC settings\n" \ + " vctcxo_tamer Current VCTCXO tamer mode.\n" \ " xb_gpio Expansion board GPIO values\n" \ " xb_gpio_dir Expansion board GPIO direction (1=output, 0=input)\n" \ "\n" \ @@ -683,6 +684,8 @@ "\n" \ " lnagain Gain setting of the RX LNA, in dB. Values: 0, 3, 6\n" \ "\n" \ + " rxvga1 Gain setting of RXVGA1, in dB. Range: [5, 30]\n" \ + "\n" \ " rx_mux FPGA RX FIFO input mux mode. Options are: BASEBAND_LMS,\n" \ " 12BIT_COUNTER, 32BIT_COUNTER, DIGITAL_LOOPBACK\n" \ "\n" \ @@ -698,7 +701,9 @@ "\n" \ " samplerate Sample rate settings\n" \ "\n" \ - " trimdac VCTCXO Trim DAC settings\n" \ + " trimdac VCTCXO trim DAC settings\n" \ + "\n" \ + " vctcxo_tamer VCTCXO tamer mode. Options: Disabled, 1PPS, 10MHz\n" \ "\n" \ " xb_gpio Expansion board GPIO values\n" \ "\n" \ diff --git a/host/utilities/bladeRF-cli/src/cmd/doc/cmd_help.man.in b/host/utilities/bladeRF-cli/src/cmd/doc/cmd_help.man.in index 977b5fd1..611e0d6d 100644 --- a/host/utilities/bladeRF-cli/src/cmd/doc/cmd_help.man.in +++ b/host/utilities/bladeRF-cli/src/cmd/doc/cmd_help.man.in @@ -621,6 +621,11 @@ T}@T{ VCTCXO Trim DAC settings T} T{ +\f[C]vctcxo_tamer\f[] +T}@T{ +Current VCTCXO tamer mode. +T} +T{ \f[C]xb_gpio\f[] T}@T{ Expansion board GPIO values @@ -1009,6 +1014,12 @@ Gain setting of the RX LNA, in dB. Values: 0, 3, 6 T} T{ +\f[C]rxvga1\f[] +T}@T{ +Gain setting of RXVGA1, in dB. +Range: [5, 30] +T} +T{ \f[C]rx_mux\f[] T}@T{ FPGA RX FIFO input mux mode. @@ -1052,7 +1063,13 @@ T} T{ \f[C]trimdac\f[] T}@T{ -VCTCXO Trim DAC settings +VCTCXO trim DAC settings +T} +T{ +\f[C]vctcxo_tamer\f[] +T}@T{ +VCTCXO tamer mode. +Options: Disabled, 1PPS, 10MHz T} T{ \f[C]xb_gpio\f[] diff --git a/host/utilities/bladeRF-cli/src/cmd/doc/interactive-help.md b/host/utilities/bladeRF-cli/src/cmd/doc/interactive-help.md index 4fdcdff9..be23b6f8 100644 --- a/host/utilities/bladeRF-cli/src/cmd/doc/interactive-help.md +++ b/host/utilities/bladeRF-cli/src/cmd/doc/interactive-help.md @@ -411,35 +411,37 @@ below. If no paremeter is specified, all parameters are printed. ---------------------------------------------------------------------- Parameter Description ------------- -------------------------------------------------------- -`bandwidth` Bandwidth settings +`bandwidth` Bandwidth settings -`frequency` Frequency settings +`frequency` Frequency settings -`gpio` FX3 <-> FPGA GPIO state +`gpio` FX3 <-> FPGA GPIO state -`loopback` Loopback settings +`loopback` Loopback settings -`lnagain` Gain setting of the RX LNA, in dB +`lnagain` Gain setting of the RX LNA, in dB -`rx_mux` FPGA RX FIFO input mux setting +`rx_mux` FPGA RX FIFO input mux setting -`rxvga1` Gain setting of RXVGA1, in dB +`rxvga1` Gain setting of RXVGA1, in dB -`rxvga2` Gain setting of RXVGA2, in dB +`rxvga2` Gain setting of RXVGA2, in dB -`txvga1` Gain setting of TXVGA1, in dB +`txvga1` Gain setting of TXVGA1, in dB -`txvga2` Gain setting of TXVGA2, in dB +`txvga2` Gain setting of TXVGA2, in dB -`sampling` External or internal sampling mode +`sampling` External or internal sampling mode -`samplerate` Samplerate settings +`samplerate` Samplerate settings -`trimdac` VCTCXO Trim DAC settings +`trimdac` VCTCXO Trim DAC settings -`xb_gpio` Expansion board GPIO values +`vctcxo_tamer` Current VCTCXO tamer mode. -`xb_gpio_dir` Expansion board GPIO direction (1=output, 0=input) +`xb_gpio` Expansion board GPIO values + +`xb_gpio_dir` Expansion board GPIO direction (1=output, 0=input) ---------------------------------------------------------------------- @@ -678,36 +680,41 @@ that particular parameter. The parameter is one of: ---------------------------------------------------------------------- Parameter Description ------------- -------------------------------------------------------- -`bandwidth` Bandwidth settings +`bandwidth` Bandwidth settings -`frequency` Frequency settings +`frequency` Frequency settings -`gpio` FX3 <-> FPGA GPIO state +`gpio` FX3 <-> FPGA GPIO state -`loopback` Loopback settings. Run 'set loopback' to list modes. +`loopback` Loopback settings. Run 'set loopback' to list modes. -`lnagain` Gain setting of the RX LNA, in dB. Values: 0, 3, 6 +`lnagain` Gain setting of the RX LNA, in dB. Values: 0, 3, 6 -`rx_mux` FPGA RX FIFO input mux mode. Options are: - BASEBAND_LMS, 12BIT_COUNTER, 32BIT_COUNTER, DIGITAL_LOOPBACK +`rxvga1` Gain setting of RXVGA1, in dB. Range: [5, 30] -`rxvga1` Gain setting of RXVGA1, in dB. Range: [5, 30] +`rx_mux` FPGA RX FIFO input mux mode. Options are: + BASEBAND_LMS, 12BIT_COUNTER, + 32BIT_COUNTER, DIGITAL_LOOPBACK -`rxvga2` Gain setting of RXVGA2, in dB. Range: [0, 30] +`rxvga1` Gain setting of RXVGA1, in dB. Range: [5, 30] -`txvga1` Gain setting of TXVGA1, in dB. Range: [-35, -4] +`rxvga2` Gain setting of RXVGA2, in dB. Range: [0, 30] -`txvga2` Gain setting of TXVGA2, in dB. Range: [0, 25] +`txvga1` Gain setting of TXVGA1, in dB. Range: [-35, -4] -`sampling` External or internal sampling mode +`txvga2` Gain setting of TXVGA2, in dB. Range: [0, 25] -`samplerate` Sample rate settings +`sampling` External or internal sampling mode -`trimdac` VCTCXO Trim DAC settings +`samplerate` Sample rate settings -`xb_gpio` Expansion board GPIO values +`trimdac` VCTCXO trim DAC settings -`xb_gpio_dir` Expansion board GPIO direction (1=output, 0=input) +`vctcxo_tamer` VCTCXO tamer mode. Options: Disabled, 1PPS, 10MHz + +`xb_gpio` Expansion board GPIO values + +`xb_gpio_dir` Expansion board GPIO direction (1=output, 0=input) ---------------------------------------------------------------------- diff --git a/host/utilities/bladeRF-cli/src/cmd/printset.c b/host/utilities/bladeRF-cli/src/cmd/printset.c index 014778f2..76be2f3c 100644 --- a/host/utilities/bladeRF-cli/src/cmd/printset.c +++ b/host/utilities/bladeRF-cli/src/cmd/printset.c @@ -77,28 +77,30 @@ PRINTSET_DECL(txvga2) PRINTSET_DECL(sampling) PRINTSET_DECL(samplerate) PRINTSET_DECL(trimdac) +PRINTSET_DECL(vctcxo_tamer) PRINTSET_DECL(xb_spi) PRINTSET_DECL(xb_gpio) PRINTSET_DECL(xb_gpio_dir) /* print/set parameter table */ struct printset_entry printset_table[] = { - PRINTSET_ENTRY(bandwidth, PRINTALL_OPTION_APPEND_NEWLINE), - PRINTSET_ENTRY(frequency, PRINTALL_OPTION_APPEND_NEWLINE), - PRINTSET_ENTRY(gpio, PRINTALL_OPTION_APPEND_NEWLINE), - PRINTSET_ENTRY(loopback, PRINTALL_OPTION_APPEND_NEWLINE), - PRINTSET_ENTRY(rx_mux, PRINTALL_OPTION_APPEND_NEWLINE), - PRINTSET_ENTRY(lnagain, PRINTALL_OPTION_NONE), - PRINTSET_ENTRY(rxvga1, PRINTALL_OPTION_NONE), - PRINTSET_ENTRY(rxvga2, PRINTALL_OPTION_NONE), - PRINTSET_ENTRY(txvga1, PRINTALL_OPTION_NONE), - PRINTSET_ENTRY(txvga2, PRINTALL_OPTION_APPEND_NEWLINE), - PRINTSET_ENTRY(sampling, PRINTALL_OPTION_APPEND_NEWLINE), - PRINTSET_ENTRY(samplerate, PRINTALL_OPTION_APPEND_NEWLINE), - PRINTSET_ENTRY(trimdac, PRINTALL_OPTION_APPEND_NEWLINE), - PRINTSET_ENTRY(xb_spi, PRINTALL_OPTION_SKIP), - PRINTSET_ENTRY(xb_gpio, PRINTALL_OPTION_NONE), - PRINTSET_ENTRY(xb_gpio_dir, PRINTALL_OPTION_NONE), + PRINTSET_ENTRY(bandwidth, PRINTALL_OPTION_APPEND_NEWLINE), + PRINTSET_ENTRY(frequency, PRINTALL_OPTION_APPEND_NEWLINE), + PRINTSET_ENTRY(gpio, PRINTALL_OPTION_APPEND_NEWLINE), + PRINTSET_ENTRY(loopback, PRINTALL_OPTION_APPEND_NEWLINE), + PRINTSET_ENTRY(rx_mux, PRINTALL_OPTION_APPEND_NEWLINE), + PRINTSET_ENTRY(lnagain, PRINTALL_OPTION_NONE), + PRINTSET_ENTRY(rxvga1, PRINTALL_OPTION_NONE), + PRINTSET_ENTRY(rxvga2, PRINTALL_OPTION_NONE), + PRINTSET_ENTRY(txvga1, PRINTALL_OPTION_NONE), + PRINTSET_ENTRY(txvga2, PRINTALL_OPTION_APPEND_NEWLINE), + PRINTSET_ENTRY(sampling, PRINTALL_OPTION_APPEND_NEWLINE), + PRINTSET_ENTRY(samplerate, PRINTALL_OPTION_APPEND_NEWLINE), + PRINTSET_ENTRY(trimdac, PRINTALL_OPTION_APPEND_NEWLINE), + PRINTSET_ENTRY(vctcxo_tamer, PRINTALL_OPTION_APPEND_NEWLINE), + PRINTSET_ENTRY(xb_spi, PRINTALL_OPTION_SKIP), + PRINTSET_ENTRY(xb_gpio, PRINTALL_OPTION_NONE), + PRINTSET_ENTRY(xb_gpio_dir, PRINTALL_OPTION_NONE), /* End of table marked by entry with NULL/empty fields */ { FIELD_INIT(.print, NULL), FIELD_INIT(.set, NULL), FIELD_INIT(.name, "") } @@ -1489,6 +1491,77 @@ int set_trimdac(struct cli_state *state, int argc, char **argv) return rv; } +int set_vctcxo_tamer(struct cli_state *state, int argc, char **argv) +{ + int status; + + bladerf_vctcxo_tamer_mode mode = BLADERF_VCTCXO_TAMER_INVALID; + + if (argc != 3) { + return CLI_RET_NARGS; + } + + if (!strcasecmp(argv[2], "diabled") || !strcasecmp(argv[2], "off")) { + mode = BLADERF_VCTCXO_TAMER_DISABLED; + } else if (!strcasecmp(argv[2], "1PPS") || !strcasecmp(argv[2], "1 PPS")) { + mode = BLADERF_VCTCXO_TAMER_1_PPS; + } else if (!strcasecmp(argv[2], "10MHZ") || !strcasecmp(argv[2], "10 MHZ")) { + mode = BLADERF_VCTCXO_TAMER_10_MHZ; + } else if (!strcasecmp(argv[2], "10M")) { + mode = BLADERF_VCTCXO_TAMER_10_MHZ; + } else { + cli_err_nnl(state, "Invalid VCTCXO tamer option", "%s\n", argv[2]); + return CLI_RET_INVPARAM; + } + + status = bladerf_set_vctcxo_tamer_mode(state->dev, mode); + if (status != 0) { + state->last_lib_error = status; + return CLI_RET_LIBBLADERF; + } + + return CLI_RET_OK; +} + +int print_vctcxo_tamer(struct cli_state *state, int argc, char *argv[]) +{ + int status; + const char *mode_str; + + bladerf_vctcxo_tamer_mode mode = BLADERF_VCTCXO_TAMER_INVALID; + + if (argc != 2) { + return CLI_RET_NARGS; + } + + status = bladerf_get_vctcxo_tamer_mode(state->dev, &mode); + if (status != 0) { + state->last_lib_error = status; + return CLI_RET_LIBBLADERF; + } + + switch (mode) { + case BLADERF_VCTCXO_TAMER_DISABLED: + mode_str = "Disabled"; + break; + + case BLADERF_VCTCXO_TAMER_1_PPS: + mode_str = "1 PPS"; + break; + + case BLADERF_VCTCXO_TAMER_10_MHZ: + mode_str = "10 MHz"; + break; + + default: + mode_str = "Unknown"; + break; + } + + printf("VCTCXO tamer mode: %s\n", mode_str); + return CLI_RET_OK; +} + int print_xb_spi(struct cli_state *state, int argc, char **argv) { cli_err_nnl(state, "Error", "XB SPI is currently write-only.\n");