Merge branch 'master' of https://github.com/robotastic/trunk-recorder

TrunkRecorder · Oct 17, 2021 · 99a3152 · 99a3152
2 parents 1b0b2a9 + 7700386
commit 99a3152
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ RTL-SDR dongles; HackRF; Ettus USRP B200, B210, B205; BladeRF; Airspy
 |              |           Docker            |                   Ubuntu                   |       RaspberryOS       |              Arch Linux               |                Homebrew                 |                MacPorts                 |
 | ------------ | :-------------------------: | :----------------------------------------: | :---------------------: | :-----------------------------------: | :-------------------------------------: | :-------------------------------------: |
 | Linux        | [📄](docs/INSTALL-DOCKER.md) | [📄](docs/INSTALL-LINUX.md#**ubuntu-2104**) |                         | [📄](docs/INSTALL-LINUX.md#arch-linux) |                                         |                                         |
-| Raspberry Pi | [📄](docs/INSTALL-DOCKER.md) |          [📄](docs/INSTALL-PI.md)           | [📄](docs/INSTALL-PI.md) |                                       |                                         |                                         |
+| Raspberry Pi | [📄](docs/INSTALL-DOCKER.md) |          [📄](docs/INSTALL-PI.md)           | [📄](docs/INSTALL-PI.md) [🎬](https://youtu.be/DizBtDZ6kE8) |                                       |                                         |                                         |
 | MacOS        |                             |                                            |                         |                                       | [📄](docs/INSTALL-MAC.md#using-homebrew) | [📄](docs/INSTALL-MAC.md#using-macports) |
 
 

diff --git a/plugins/stat_socket/stat_socket.cc b/plugins/stat_socket/stat_socket.cc
@@ -444,8 +444,8 @@ class Stat_Socket : public Plugin_Api {
 
     boost::property_tree::ptree signal;
     signal.put("unit_id", unitId);
-    signal.put("signal_system_type", signaling_type);
-    signal.put("signal_type", sig_type);
+    //signal.put("signal_system_type", signaling_type);
+    //signal.put("signal_type", sig_type);
 
     if (call != NULL) {
       signal.add_child("call", call->get_stats());

diff --git a/trunk-recorder/call_concluder/call_concluder.cc b/trunk-recorder/call_concluder/call_concluder.cc
@@ -55,14 +55,17 @@ int create_call_json(Call_Data_t call_info) {
 
   if (json_file.is_open()) {
     json_file << "{\n";
-    json_file << "\"freq\": " << call_info.freq << ",\n";
+    json_file << "\"freq\": " << std::fixed << std::setprecision(0) << call_info.freq << ",\n";
     json_file << "\"start_time\": " << call_info.start_time << ",\n";
     json_file << "\"stop_time\": " << call_info.stop_time << ",\n";
     json_file << "\"emergency\": " << call_info.emergency << ",\n";
     json_file << "\"encrypted\": " << call_info.encrypted << ",\n";
     json_file << "\"call_length\": " << call_info.length << ",\n";
     //json_file << "\"source\": \"" << this->get_recorder()->get_source()->get_device() << "\",\n";
     json_file << "\"talkgroup\": " << call_info.talkgroup << ",\n";
+    json_file << "\"freqList\": [";
+    json_file << "{ \"freq\": " << std::fixed << std::setprecision(0) << call_info.freq << ", \"time\": " << call_info.start_time << ", \"pos\": 0.0, \"len\": " << call_info.length << ", \"error_count\": 0.0, \"spike_count\": 0.0}";
+    json_file << "],\n";
     json_file << "\"srcList\": [ ";
 
     for (std::size_t i = 0; i < call_info.transmission_source_list.size(); i++) {