Track preamble and EOT and estimate DCD

diff --git a/m17core/src/decode.rs b/m17core/src/decode.rs
index 86567d9a6a4d4488228d3d62f61acf7a3090ac68..911d67371cf5f5273446992cd2d472cb4ac18b47 100755 (executable)
--- a/m17core/src/decode.rs
+++ b/m17core/src/decode.rs
@@ -3,8 +3,8 @@ use crate::{
     fec::{self, p_1, p_2, p_3},
     interleave::interleave,
     protocol::{
     fec::{self, p_1, p_2, p_3},
     interleave::interleave,
     protocol::{

-        LsfFrame, PacketFrame, PacketFrameCounter, StreamFrame, BERT_SYNC, LSF_SYNC, PACKET_SYNC,
-        STREAM_SYNC,
+        LsfFrame, PacketFrame, PacketFrameCounter, StreamFrame, BERT_SYNC, END_OF_TRANSMISSION,
+        LSF_SYNC, PACKET_SYNC, PREAMBLE, STREAM_SYNC,

     },
     random::random_xor,
 };
     },
     random::random_xor,
 };


@@ -33,6 +33,8 @@ pub(crate) enum SyncBurst {
     Bert,
     Stream,
     Packet,
     Bert,
     Stream,
     Packet,

+    Preamble,
+    EndOfTransmission,

 }
 
 impl SyncBurst {
 }
 
 impl SyncBurst {


@@ -42,6 +44,8 @@ impl SyncBurst {
             Self::Bert => BERT_SYNC,
             Self::Stream => STREAM_SYNC,
             Self::Packet => PACKET_SYNC,
             Self::Bert => BERT_SYNC,
             Self::Stream => STREAM_SYNC,
             Self::Packet => PACKET_SYNC,

+            Self::Preamble => PREAMBLE,
+            Self::EndOfTransmission => END_OF_TRANSMISSION,

         }
     }
 }
         }
     }
 }

diff --git a/m17core/src/modem.rs b/m17core/src/modem.rs
index b333ef56ad992eaa261a086cab39783e4e560e7c..8cbd0033d8e9358f10fd281028903ea8db1d0593 100644 (file)
--- a/m17core/src/modem.rs
+++ b/m17core/src/modem.rs
@@ -29,6 +29,8 @@ pub struct SoftDemodulator {
     sample: u64,
     /// Remaining samples to read in before attempting to decode the current candidate
     samples_until_decode: Option<u16>,
     sample: u64,
     /// Remaining samples to read in before attempting to decode the current candidate
     samples_until_decode: Option<u16>,

+    /// Do we think there is a data carrier, i.e., channel in use? If so, at what sample does it expire?
+    dcd: Option<u64>,

 }
 
 impl SoftDemodulator {
 }
 
 impl SoftDemodulator {


@@ -41,6 +43,25 @@ impl SoftDemodulator {
             candidate: None,
             sample: 0,
             samples_until_decode: None,
             candidate: None,
             sample: 0,
             samples_until_decode: None,

+            dcd: None,
+        }
+    }
+}
+
+impl SoftDemodulator {
+    fn dcd_until(&mut self, end_sample: u64) {
+        if self.dcd.is_none() {
+            debug!("SoftDemodulator DCD on");
+        }
+        self.dcd = Some(end_sample);
+    }
+
+    fn check_dcd(&mut self) {
+        if let Some(end_sample) = self.dcd {
+            if self.sample > end_sample {
+                self.dcd = None;
+                debug!("SoftDemodulator DCD off");
+            }

         }
     }
 }
         }
     }
 }


@@ -59,6 +80,7 @@ impl Demodulator for SoftDemodulator {
         self.rx_cursor = (self.rx_cursor + 1) % 1920;
 
         self.sample += 1;
         self.rx_cursor = (self.rx_cursor + 1) % 1920;
 
         self.sample += 1;

+        self.check_dcd();

 
         if let Some(samples_until_decode) = self.samples_until_decode {
             let sud = samples_until_decode - 1;
 
         if let Some(samples_until_decode) = self.samples_until_decode {
             let sud = samples_until_decode - 1;


@@ -97,6 +119,9 @@ impl Demodulator for SoftDemodulator {
                             return Some(Frame::Packet(frame));
                         }
                     }
                             return Some(Frame::Packet(frame));
                         }
                     }

+                    SyncBurst::Preamble | SyncBurst::EndOfTransmission => {
+                        // should never be chosen as a candidate
+                    }

                 }
             }
         }
                 }
             }
         }


@@ -107,6 +132,15 @@ impl Demodulator for SoftDemodulator {
             burst_window[i] = self.rx_win[c];
         }
 
             burst_window[i] = self.rx_win[c];
         }
 

+        for burst in [SyncBurst::Preamble, SyncBurst::EndOfTransmission] {
+            let (diff, _, _) = sync_burst_correlation(burst.target(), &burst_window);
+            if diff < SYNC_THRESHOLD {
+                // arbitrary choice, 240 samples = 5ms
+                // these bursts keep repeating so it will keep pushing out the DCD end time
+                self.dcd_until(self.sample + 240);
+            }
+        }
+

         for burst in [
             SyncBurst::Lsf,
             SyncBurst::Bert,
         for burst in [
             SyncBurst::Lsf,
             SyncBurst::Bert,


@@ -148,6 +182,8 @@ impl Demodulator for SoftDemodulator {
                     self.sample - c.age as u64,
                     c.diff
                 );
                     self.sample - c.age as u64,
                     c.diff
                 );

+                // After any of these frame types you would expect to see a full EOT
+                self.dcd_until(self.sample + 1920 + 1920);

             }
         }
 
             }
         }
 

diff --git a/m17core/src/protocol.rs b/m17core/src/protocol.rs
index f2e154ea944cb9c4e25517c9dfc1cfa7177b4fba..e4b3b15f508f37a71e0862614219b94be8f6d487 100755 (executable)
--- a/m17core/src/protocol.rs
+++ b/m17core/src/protocol.rs
@@ -4,6 +4,8 @@ pub(crate) const LSF_SYNC: [i8; 8] = [1, 1, 1, 1, -1, -1, 1, -1];
 pub(crate) const BERT_SYNC: [i8; 8] = [-1, 1, -1, -1, 1, 1, 1, 1];
 pub(crate) const STREAM_SYNC: [i8; 8] = [-1, -1, -1, -1, 1, 1, -1, 1];
 pub(crate) const PACKET_SYNC: [i8; 8] = [1, -1, 1, 1, -1, -1, -1, -1];
 pub(crate) const BERT_SYNC: [i8; 8] = [-1, 1, -1, -1, 1, 1, 1, 1];
 pub(crate) const STREAM_SYNC: [i8; 8] = [-1, -1, -1, -1, 1, 1, -1, 1];
 pub(crate) const PACKET_SYNC: [i8; 8] = [1, -1, 1, 1, -1, -1, -1, -1];

+pub(crate) const PREAMBLE: [i8; 8] = [1, -1, 1, -1, 1, -1, 1, -1];
+pub(crate) const END_OF_TRANSMISSION: [i8; 8] = [1, 1, 1, 1, 1, 1, -1, 1];

 
 #[derive(Debug, Clone, PartialEq, Eq, Copy)]
 pub enum Mode {
 
 #[derive(Debug, Clone, PartialEq, Eq, Copy)]
 pub enum Mode {