From 6ab72edad471df747e3bfb61ed758ae94326d7a0 Mon Sep 17 00:00:00 2001 From: Nick M Date: Tue, 28 Nov 2023 11:06:09 -0500 Subject: [PATCH] adjust config values to double --- trunk-recorder/config.cc | 4 ++-- trunk-recorder/global_structs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk-recorder/config.cc b/trunk-recorder/config.cc index b67694688..028d2fd68 100644 --- a/trunk-recorder/config.cc +++ b/trunk-recorder/config.cc @@ -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; @@ -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); diff --git a/trunk-recorder/global_structs.h b/trunk-recorder/global_structs.h index f4830fd22..ea1ae3864 100644 --- a/trunk-recorder/global_structs.h +++ b/trunk-recorder/global_structs.h @@ -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;