diff --git a/hdl/quartus/build_bladerf.sh b/hdl/quartus/build_bladerf.sh index 69b459aa..583900a4 100755 --- a/hdl/quartus/build_bladerf.sh +++ b/hdl/quartus/build_bladerf.sh @@ -482,4 +482,4 @@ printf "%s %02d:%02d:%02d\n" "Total Build Time:" "$(($SECONDS / 3600))" "$((($SE echo "" # Delete empty SOPC directories in the user's home directory -find ~ -maxdepth 1 -type d -empty -iname "sopc_altera_pll*" -delete +#find ~ -maxdepth 1 -type d -empty -iname "sopc_altera_pll*" -delete diff --git a/host/libraries/libbladeRF/src/helpers/configfile.c b/host/libraries/libbladeRF/src/helpers/configfile.c index 869dfdbb..bfa339c6 100644 --- a/host/libraries/libbladeRF/src/helpers/configfile.c +++ b/host/libraries/libbladeRF/src/helpers/configfile.c @@ -321,7 +321,14 @@ int config_load_options_file(struct bladerf *dev) if (status < 0) { log_warning("Invalid config option `%s' on line %d\n", optv[j].key, optv[j].lineno); - break; + /* Some config options will require the FPGA to be loaded, however + * this function is called during bladerf_open(). The solution is + * to treat BLADERF_ERR_NOT_INIT as a warning and continue. */ + if (status == BLADERF_ERR_NOT_INIT) { + status = 0; + } else { + break; + } } } diff --git a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c index 765b87e0..ae1d4013 100644 --- a/host/utilities/bladeRF-cli/src/cmd/printset_impl.c +++ b/host/utilities/bladeRF-cli/src/cmd/printset_impl.c @@ -1468,8 +1468,8 @@ static int _do_set_samplerate(struct cli_state *state, bladerf_feature feature; const char *settext = - " Setting %s sample rate - req: %9" PRIu64 " %" PRIu64 "/%" PRIu64 - "Hz, actual: %9" PRIu64 " %" PRIu64 "/%" PRIu64 "Hz\n"; + " Setting %s sample rate - requested: I=%9" PRIu64 " N=%" PRIu64 "/D=%" PRIu64 + "Hz, actual: I=%9" PRIu64 " N=%" PRIu64 "/D=%" PRIu64 "Hz\n"; const char *samplewarning = "\n" @@ -1619,6 +1619,8 @@ int set_samplerate(struct cli_state *state, int argc, char **argv) } rv = ps_foreach_chan(state, true, true, ch, _do_set_samplerate, &rate); + printf("\n I, N, D are respectively the Integer, Numerator, and Denominator settings for the " + "Fractional PLL.\n"); out: return rv;