aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick M <taclane@users.noreply.github.com>2023-03-03 10:46:31 -0500
committerNick M <taclane@users.noreply.github.com>2023-03-03 10:46:31 -0500
commit23a8f62ada5245c01e45f6fb797dc6766e96e7fd (patch)
tree87bce79106d9ae23711bb294bf4be0473990c230
parent0fd3778ccc6b8b8ad36648692bf5debb023b2774 (diff)
Console cleanup initial
-rw-r--r--lib/op25_repeater/lib/p25_frame_assembler_impl.cc2
-rw-r--r--trunk-recorder/call_impl.cc2
-rw-r--r--trunk-recorder/main.cc12
-rw-r--r--trunk-recorder/systems/system_impl.cc2
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/op25_repeater/lib/p25_frame_assembler_impl.cc b/lib/op25_repeater/lib/p25_frame_assembler_impl.cc
index 93bf4854..a49f3951 100644
--- a/lib/op25_repeater/lib/p25_frame_assembler_impl.cc
+++ b/lib/op25_repeater/lib/p25_frame_assembler_impl.cc
@@ -242,7 +242,7 @@ p25_frame_assembler_impl::general_work (int noutput_items,
void p25_frame_assembler_impl::set_phase2_tdma(bool p) {
d_do_phase2_tdma = p;
- BOOST_LOG_TRIVIAL(info) << "Setting TDMA to: " << p;
+ BOOST_LOG_TRIVIAL(debug) << "Setting TDMA to: " << p;
if (d_do_audio_output) {
if (d_do_phase2_tdma) {
d_input_rate = 6000;
diff --git a/trunk-recorder/call_impl.cc b/trunk-recorder/call_impl.cc
index 80689b29..c55cb8df 100644
--- a/trunk-recorder/call_impl.cc
+++ b/trunk-recorder/call_impl.cc
@@ -134,7 +134,7 @@ void Call_impl::conclude_call() {
if (!recorder) {
BOOST_LOG_TRIVIAL(error) << "Call_impl::end_call() State is recording, but no recorder assigned!";
}
- BOOST_LOG_TRIVIAL(info) << "[" << sys->get_short_name() << "]\t\033[0;34m" << this->get_call_num() << "C\033[0m\tTG: " << this->get_talkgroup_display() << "\tFreq: " << format_freq(get_freq()) << "\t\u001b[33mConcluding Recorded Call_impl\u001b[0m - Last Update: " << this->since_last_update() << "s\tCall_impl Elapsed: " << this->elapsed();
+ BOOST_LOG_TRIVIAL(info) << "[" << sys->get_short_name() << "]\t\033[0;34m" << this->get_call_num() << "C\033[0m\tTG: " << this->get_talkgroup_display() << "\tFreq: " << format_freq(get_freq()) << "\t\u001b[33mConcluding Recorded Call\u001b[0m - Last Update: " << this->since_last_update() << "s\tCall_impl Elapsed: " << this->elapsed();
this->get_recorder()->stop();
transmission_list = this->get_recorder()->get_transmission_list();
diff --git a/trunk-recorder/main.cc b/trunk-recorder/main.cc
index 497166de..9e3447dd 100644
--- a/trunk-recorder/main.cc
+++ b/trunk-recorder/main.cc
@@ -934,7 +934,7 @@ void manage_calls() {
continue;
}*/
} else {
- BOOST_LOG_TRIVIAL(error) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36m Call set to Inactive, but has no recorder\u001b[0m";
+ BOOST_LOG_TRIVIAL(error) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\033[0m\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36m Call set to Inactive, but has no recorder\u001b[0m";
}
}
@@ -1069,7 +1069,7 @@ void handle_call_grant(TrunkMessage message, System *sys) {
if ((call->get_talkgroup() == message.talkgroup) && (call->get_sys_num() == message.sys_num) && (call->get_freq() == message.freq) && (call->get_tdma_slot() == message.tdma_slot) && (call->get_phase2_tdma() == message.phase2_tdma)) {
call_found = true;
- // BOOST_LOG_TRIVIAL(info) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36m GRANT Message for existing Call\u001b[0m";
+ // BOOST_LOG_TRIVIAL(info) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\033[0m\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36m GRANT Message for existing Call\u001b[0m";
if (call->get_state() == RECORDING) {
call->set_record_more_transmissions(true);
@@ -1092,7 +1092,7 @@ void handle_call_grant(TrunkMessage message, System *sys) {
if (recorder != NULL) {
recorder_state = format_state(recorder->get_state());
}
- BOOST_LOG_TRIVIAL(info) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36mStopping RECORDING call, Recorder State: " << recorder_state << " RX overlapping TG message Freq, TG:" << message.talkgroup << "\u001b[0m";
+ BOOST_LOG_TRIVIAL(info) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\033[0m\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36mStopping RECORDING call, Recorder State: " << recorder_state << " RX overlapping TG message Freq, TG:" << message.talkgroup << "\u001b[0m";
call->set_state(COMPLETED);
call->conclude_call();
@@ -1109,7 +1109,7 @@ void handle_call_grant(TrunkMessage message, System *sys) {
if (recorder != NULL) {
recorder_state = format_state(recorder->get_state());
}
- BOOST_LOG_TRIVIAL(info) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36mStopping INACTIVE call, Recorder State: " << recorder_state << " RX overlapping TG message Freq TG:" << message.talkgroup << "\u001b[0m";
+ BOOST_LOG_TRIVIAL(info) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\033[0m\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36mStopping INACTIVE call, Recorder State: " << recorder_state << " RX overlapping TG message Freq TG:" << message.talkgroup << "\u001b[0m";
call->set_state(COMPLETED);
call->conclude_call();
@@ -1190,9 +1190,9 @@ void handle_call_update(TrunkMessage message, System *sys) {
// Only a RECORDING call can be set to INACTIVE
// We should be safe to set it to RECORDING if it starts to get UPDATE messages
call->set_state(RECORDING);
- BOOST_LOG_TRIVIAL(trace) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36m Reactivating an INACTIVE Call \u001b[0m";
+ BOOST_LOG_TRIVIAL(trace) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\033[0m\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36m Reactivating an INACTIVE Call \u001b[0m";
}
- // BOOST_LOG_TRIVIAL(info) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36m Updating Call \u001b[0m";
+ // BOOST_LOG_TRIVIAL(info) << "[" << call->get_short_name() << "]\t\033[0;34m" << call->get_call_num() << "C\033[0m\tTG: " << call->get_talkgroup_display() << "\tFreq: " << format_freq(call->get_freq()) << "\t\u001b[36m Updating Call \u001b[0m";
// It is helpful to have both GRANT and UPDATE messages allow for new calls to be started
// This is because GRANT message can be sometimes dropped if the control channel is not perfect
diff --git a/trunk-recorder/systems/system_impl.cc b/trunk-recorder/systems/system_impl.cc
index 4424d6a0..ca8dad22 100644
--- a/trunk-recorder/systems/system_impl.cc
+++ b/trunk-recorder/systems/system_impl.cc
@@ -122,7 +122,7 @@ bool System_impl::update_status(TrunkMessage message) {
sys_id = message.sys_id;
wacn = message.wacn;
nac = message.nac;
- BOOST_LOG_TRIVIAL(info) << "[" << short_name << "]\tDecoding System_impl ID "
+ BOOST_LOG_TRIVIAL(info) << "[" << short_name << "]\tDecoding System ID "
<< std::hex << std::uppercase << message.sys_id << " WACN: "
<< std::hex << std::uppercase << message.wacn << " NAC: " << std::hex << std::uppercase << message.nac;
if (sys_id && wacn && nac) {