From 504f69d9db1c73ca50bf4156e5c2fc1201bc6cb3 Mon Sep 17 00:00:00 2001 From: Jason McHuff <20979597+rosecitytransit@users.noreply.github.com> Date: Sun, 10 Dec 2017 21:48:09 -0800 Subject: [PATCH 1/5] Have System ID, WACN, NAC output in hex Hex is what is commonly used for these. I hope I did this right, haven't tested it yet. --- trunk-recorder/systems/system.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/trunk-recorder/systems/system.cc b/trunk-recorder/systems/system.cc index 6db02d3e1..b8191b34c 100644 --- a/trunk-recorder/systems/system.cc +++ b/trunk-recorder/systems/system.cc @@ -51,7 +51,9 @@ void System::update_status(TrunkMessage message) { sys_id = message.sys_id; wacn = message.wacn; nac = message.nac; - BOOST_LOG_TRIVIAL(info) << "[" << short_name << "]\tDecoding System ID " << std::dec << message.sys_id << " WACN: " << message.wacn << " NAC: " << message.nac << std::dec; + 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) { lfsr = new p25p2_lfsr(nac, sys_id, wacn); xor_mask = lfsr->getXorChars(xor_mask_len); From 4857330df8f2ae60adf34cd02ce92619d29f0df1 Mon Sep 17 00:00:00 2001 From: Jason McHuff <20979597+rosecitytransit@users.noreply.github.com> Date: Sun, 10 Dec 2017 22:02:53 -0800 Subject: [PATCH 2/5] Version 1 of my audio player Web page From attachment to #79 --- audioplayer.php | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 audioplayer.php diff --git a/audioplayer.php b/audioplayer.php new file mode 100644 index 000000000..eb66e2fef --- /dev/null +++ b/audioplayer.php @@ -0,0 +1,111 @@ + + + +"; + +$talkgroups = array('ALL'=>"ALL", 1767=>"Example1", 1777=>"Example2") +?> + +Trunk Recorder audio player + +
+

Calls on

+
Change: Month: Day: Channel(s):
+ +
+ +

Click on a row to begin sequential playback, click file size to download

+ +
+"; + echo date("H:i:s",$exploded[1]).""; + if (isset($talkgroups[$exploded[0]])) echo $talkgroups[$exploded[0]]; else echo $exploded[0]; + echo ""; + echo sprintf($exploded[2]/1000000)."".round(filesize($file) / 1024)."k
+"; } } } +else echo "Pick a different date"; +?> + + + \ No newline at end of file From 5c02da8d9528ada6c103fdb947981d4e0eb01c6e Mon Sep 17 00:00:00 2001 From: Jason McHuff <20979597+rosecitytransit@users.noreply.github.com> Date: Sun, 10 Dec 2017 22:20:25 -0800 Subject: [PATCH 3/5] Add channel to H1, secure query parsing --- audioplayer.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/audioplayer.php b/audioplayer.php index eb66e2fef..bfa7ce1f5 100644 --- a/audioplayer.php +++ b/audioplayer.php @@ -4,7 +4,20 @@ "; @@ -58,7 +71,8 @@ function init() { window.onload=init;
-

Calls on

+

Calls on

Change: Month: Date: Mon, 11 Dec 2017 00:28:40 -0800 Subject: [PATCH 5/5] Fix for #149 (adding log_setup) adds log_setup before log under SET(BOOST_REQUIRED_COMPONENTS), see https://github.com/boostorg/log/issues/18 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ea222c52..398250632 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,7 @@ SET(BOOST_REQUIRED_COMPONENTS system program_options filesystem + log_setup log regex )