signal detector auto-threshold

robotastic · Feb 10, 2024 · e3e0b5d · e3e0b5d
1 parent b7b4e30
commit e3e0b5d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/trunk-recorder/gr_blocks/decoders/tps_decoder_sink_impl.cc b/trunk-recorder/gr_blocks/decoders/tps_decoder_sink_impl.cc
@@ -119,6 +119,12 @@ void tps_decoder_sink_impl::process_message(gr::message::sptr msg) {
 
   std::string s = msg->to_string();
 
+ if (s.length() < 2) {
+    BOOST_LOG_TRIVIAL(error) << "P25 Parse error, s: " << s << " Len: " << s.length();
+    //messages.push_back(message);
+    return;
+  }
+
   // # nac is always 1st two bytes
   // ac = (ord(s[0]) << 8) + ord(s[1])
   uint8_t s0 = (int)s[0];

diff --git a/trunk-recorder/gr_blocks/signal_detector_cvf_impl.cc b/trunk-recorder/gr_blocks/signal_detector_cvf_impl.cc
@@ -81,7 +81,7 @@ signal_detector_cvf_impl::signal_detector_cvf_impl(double samp_rate,
 #endif
   d_threshold = threshold;
   d_sensitivity = sensitivity;
-  d_auto_threshold = auto_threshold;
+  d_auto_threshold = true; //auto_threshold;
   d_average = average;
   d_quantization = quantization;
   d_min_bw = min_bw;
@@ -220,6 +220,7 @@ void signal_detector_cvf_impl::build_threshold() {
   // search specified normized jump
   for (unsigned int i = 0; i < d_fft_len; i++) {
     if ((d_tmp_pxx[i + 1] - d_tmp_pxx[i]) / range > 1 - d_sensitivity) {
+
       d_threshold = d_tmp_pxx[i];
       break;
     }

diff --git a/trunk-recorder/systems/p25_parser.cc b/trunk-recorder/systems/p25_parser.cc
@@ -972,7 +972,7 @@ std::vector<TrunkMessage> P25Parser::parse_message(gr::message::sptr msg, System
 
  if (s.length() < 2) {
     BOOST_LOG_TRIVIAL(error) << "P25 Parse error, s: " << s << " Len: " << s.length();
-    messages.push_back(message);
+    //messages.push_back(message);
     return messages;
   }