Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust integer config values to double #876

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Adjust integer config values to double #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions trunk-recorder/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ bool load_config(string config_file, Config &config, gr::top_block_sptr &tb, std
BOOST_LOG_TRIVIAL(info) << "Broadcast Signals: " << config.broadcast_signals;
config.default_mode = data.value("defaultMode", "digital");
BOOST_LOG_TRIVIAL(info) << "Default Mode: " << config.default_mode;
config.call_timeout = data.value("callTimeout", 3);
config.call_timeout = data.value("callTimeout", 3.0);
BOOST_LOG_TRIVIAL(info) << "Call Timeout (seconds): " << config.call_timeout;
config.control_message_warn_rate = data.value("controlWarnRate", 10);
BOOST_LOG_TRIVIAL(info) << "Control channel warning rate: " << config.control_message_warn_rate;
Expand Down Expand Up @@ -250,7 +250,7 @@ bool load_config(string config_file, Config &config, gr::top_block_sptr &tb, std
bool qpsk_mod = true;
double digital_levels = element.value("digitalLevels", 1.0);
double analog_levels = element.value("analogLevels", 8.0);
double squelch_db = element.value("squelch", -160);
double squelch_db = element.value("squelch", -160.0);
int max_dev = element.value("maxDev", 4000);
double filter_width = element.value("filterWidth", 1.0);
bool conversation_mode = element.value("conversationMode", true);
Expand Down
2 changes: 1 addition & 1 deletion trunk-recorder/global_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct Config {
bool new_call_from_update;
bool debug_recorder;
int debug_recorder_port;
int call_timeout;
double call_timeout;
bool console_log;
bool log_file;
int control_message_warn_rate;
Expand Down