diff options
author | andreas128 <Andreas> | 2017-06-07 21:11:20 +0100 |
---|---|---|
committer | andreas128 <Andreas> | 2017-06-07 21:11:20 +0100 |
commit | e37567081d00778aea70ab42ad294679dff328be (patch) | |
tree | c2dfbfb8f6f0a9cd942a28713cf850fcf62a8984 /src/ConfigParser.cpp | |
parent | 02aa4b6c14506b72eb2fe9d3f4e99b751e2e91c8 (diff) | |
parent | 418eb33d0948bb12b7b2ed2179d43ad66258aa72 (diff) | |
download | dabmod-e37567081d00778aea70ab42ad294679dff328be.tar.gz dabmod-e37567081d00778aea70ab42ad294679dff328be.tar.bz2 dabmod-e37567081d00778aea70ab42ad294679dff328be.zip |
Merge branch 'next_memless' into next
Diffstat (limited to 'src/ConfigParser.cpp')
-rw-r--r-- | src/ConfigParser.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp index 393f58a..459811f 100644 --- a/src/ConfigParser.cpp +++ b/src/ConfigParser.cpp @@ -168,6 +168,12 @@ static void parse_configfile( pt.get<std::string>("firfilter.filtertapsfile", "default"); } + // Poly coefficients: + if (pt.get("poly.enabled", 0) == 1) { + mod_settings.polyCoefFilename = + pt.get<std::string>("poly.polycoeffile", "default"); + } + // Output options std::string output_selected; try { @@ -212,6 +218,7 @@ static void parse_configfile( } outputuhd_conf.txgain = pt.get("uhdoutput.txgain", 0.0); + outputuhd_conf.rxgain = pt.get("uhdoutput.rxgain", 0.0); outputuhd_conf.frequency = pt.get<double>("uhdoutput.frequency", 0); std::string chan = pt.get<std::string>("uhdoutput.channel", ""); outputuhd_conf.dabMode = mod_settings.dabMode; @@ -249,6 +256,8 @@ static void parse_configfile( outputuhd_conf.maxGPSHoldoverTime = pt.get("uhdoutput.max_gps_holdover_time", 0); + outputuhd_conf.dpdFeedbackServerPort = pt.get<long>("uhdoutput.dpd_port", 0); + mod_settings.outputuhd_conf = outputuhd_conf; mod_settings.useUHDOutput = 1; } |