Skip to content

Include frequency in CC decode rate warning #1030

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions trunk-recorder/monitor_systems.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ bool start_recorder(Call *call, TrunkMessage message, Config &config, System *sy
bool source_found = false;
bool recorder_found = false;
bool override_record_unknown = false;

Recorder *recorder;
Recorder *debug_recorder;
Recorder *sigmf_recorder;

if (!talkgroup){
BOOST_FOREACH (auto &TGID, sys->get_talkgroup_patch(call->get_talkgroup())) { //for each talkgroup in the patch
if (sys->find_talkgroup(TGID) != NULL){ //if the patched talkgroup is known
Expand Down Expand Up @@ -219,7 +219,7 @@ void manage_conventional_call(Call *call, Config &config) {
// if any recording has happened

if (call->get_current_length() > 0) {

BOOST_LOG_TRIVIAL(trace) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\033[0m Call Length: " << call->get_current_length() << "s\t Idle: " << call->get_recorder()->is_idle() << "\t Squelched: " << call->get_recorder()->is_squelched() << " Idle Count: " << call->get_idle_count();

// means that the squelch is on and it has stopped recording
Expand Down Expand Up @@ -753,9 +753,9 @@ void check_message_count(float timeDiff, Config &config, gr::top_block_sptr &tb,
}

if (msgs_decoded_per_second < config.control_message_warn_rate) {
BOOST_LOG_TRIVIAL(error) << "[" << sys->get_short_name() << "]\t Control Channel Message Decode Rate: " << msgs_decoded_per_second << "/sec, count: " << sys->message_count;
BOOST_LOG_TRIVIAL(error) << "[" << sys->get_short_name() << "]\tfreq: " << format_freq(sys->get_current_control_channel()) << "\tControl Channel Message Decode Rate: " << msgs_decoded_per_second << "/sec, count: " << sys->message_count;
} else if (config.control_message_warn_rate == -1) {
BOOST_LOG_TRIVIAL(info) << "[" << sys->get_short_name() << "]\t Control Channel Message Decode Rate: " << msgs_decoded_per_second << "/sec, count: " << sys->message_count;
BOOST_LOG_TRIVIAL(info) << "[" << sys->get_short_name() << "]\tfreq: " << format_freq(sys->get_current_control_channel()) << "\tControl Channel Message Decode Rate: " << msgs_decoded_per_second << "/sec, count: " << sys->message_count;
}
}
sys->message_count = 0;
Expand Down Expand Up @@ -898,4 +898,4 @@ int monitor_messages(Config &config, gr::top_block_sptr &tb, std::vector<Source
print_status(sources, systems, calls);
}
}
}
}
Loading