Radio ptt enable

Cargo.toml

@@ -11,3 +11,4 @@ hound = "3.5.1"
 plotters = "0.3.7"
 rand = "0.9.2"
 tokio = { version = "1.47.1", features = ["full", "macros", "net", "sync", "time"] }
+tun-tap = "0.1.4"

run_net.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+echo "running as $1"
+
+cargo b --release
+sudo setcap cap_net_admin+eip target/release/rdsp
+./target/release/rdsp 0 > /dev/ttyACM0 &
+sleep .5
+sudo ip a a $1/24 dev radio0
+sudo ip -6 addr flush radio0
+sudo ip link set radio0 up 
+sudo ip -6 addr flush radio0
+

send_udp.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-ffmpeg -re -i audio/modulated.wav -f s16le -acodec pcm_s16le udp://127.0.0.1:8080

src/filtering/impulse_response.rs

@@ -1,43 +1,44 @@
 // Utilities for impulse response design
-pub mod design
-{
+pub mod design {
+    use crate::complex::Complex32;
     use crate::fft::FFT;
     use crate::windows::{self, Window};
-    use crate::complex::Complex32;
+
+    // Completely stolen from sdrpp dsp code
+    pub fn estimate_fir_length(transition_width: f32, sample_rate: f32) -> f32 {
+        3.8 * sample_rate / transition_width
+    }
 
     ///Designs a impulse response from a desired transfer function using windowing technique
-    pub fn ir_from_transfer_function(transfer_function: &[Complex32], ir_length: usize, window: Window) -> Vec<Complex32>
-    {
+    pub fn ir_from_transfer_function(
+        transfer_function: &[Complex32],
+        window: Window,
+    ) -> Vec<Complex32> {
         let tf_len = transfer_function.len();
         let mut ifft = FFT::new_inv(tf_len);
-        
+
         // Compute ideal convolution kernel/impulse response
         ifft.execute(transfer_function);
 
         // Shorten and window
         let mut ir = vec![];
 
-        for i in 0..ir_length
-        {
+        for i in 0..tf_len {
             // Get value within ifft result (centering/trimming)
-            let k = (tf_len - (ir_length / 2) + i) % tf_len;
+            let k = (tf_len - (tf_len / 2) + i) % tf_len;
             // Windowing
-            ir.push(
-                ifft.get_output()[k] * window(i as f32 / ir_length as f32) / tf_len as f32
-            );
+            ir.push(ifft.get_output()[k] * window(i as f32 / tf_len as f32) / tf_len as f32);
         }
 
         ir
     }
 
-    pub fn frequency_response(impulse_response: &[Complex32]) -> Vec<Complex32>
-    {
+    pub fn frequency_response(impulse_response: &[Complex32]) -> Vec<Complex32> {
         let len = impulse_response.len();
         let mut fft = FFT::new(len, windows::rectangular);
         // Recenter impulse response
-        let mut centered_ir = vec![]; 
-        for i in 0..len
-        {
+        let mut centered_ir = vec![];
+        for i in 0..len {
             let k = (len / 2) + i;
             centered_ir.push(impulse_response[k % len]);
         }

src/iq.rs

@@ -1,15 +1,13 @@
-use std::f32::consts::PI;
 use crate::{complex::Complex32, filtering::fir::FIRFilter, math::map, nco::Nco, windows};
+use std::f32::consts::PI;
 
-pub struct IQSampler
-{
+pub struct IQSampler {
     local_oscillator: Nco,
     low_pass_i: FIRFilter,
     low_pass_q: FIRFilter,
 }
 
-impl IQSampler
-{
+impl IQSampler {
     pub fn new(center_freq: f32) -> Self {
         // Design a lowpass filter that cuts off at the center freq
         // Estimate FIR length :
@@ -17,14 +15,17 @@ impl IQSampler
 
         // Ideal transfer function :
         let mut transfer_function = vec![Complex32::zero(); fir_length];
-        let bin_id = map(center_freq, 0., PI, 0., transfer_function.len() as f32 / 2.).floor() as usize;
-        for i in 0..bin_id
-        {
+        let bin_id =
+            map(center_freq, 0., PI, 0., transfer_function.len() as f32 / 2.).floor() as usize;
+        for i in 0..bin_id {
             transfer_function[i] = Complex32::new(1., 0.);
             transfer_function[fir_length - 1 - i] = Complex32::new(1., 0.);
         }
 
-        let ir = crate::filtering::impulse_response::design::ir_from_transfer_function(&transfer_function, fir_length, windows::blackmann);
+        let ir = crate::filtering::impulse_response::design::ir_from_transfer_function(
+            &transfer_function,
+            windows::blackmann,
+        );
         let mut low_pass_i = FIRFilter::new(&ir);
         let mut low_pass_q = FIRFilter::new(&ir);
         low_pass_i.normalize_dc();
@@ -33,12 +34,11 @@ impl IQSampler
         IQSampler {
             local_oscillator: Nco::new(center_freq),
             low_pass_i,
-            low_pass_q
+            low_pass_q,
         }
     }
 
-    pub fn sample(&mut self, input_sample: f32) -> Complex32
-    {
+    pub fn sample(&mut self, input_sample: f32) -> Complex32 {
         let i_mixed = self.local_oscillator.cexp().re * input_sample;
         let q_mixed = self.local_oscillator.cexp().im * input_sample;
         self.local_oscillator.step();
@@ -46,8 +46,7 @@ impl IQSampler
         // TODO: Could use one filter for both I and Q
         Complex32::new(
             self.low_pass_i.next(Complex32::new(i_mixed, 0.)).re,
-            self.low_pass_q.next(Complex32::new(q_mixed, 0.)).re
+            self.low_pass_q.next(Complex32::new(q_mixed, 0.)).re,
         ) * 2.
-
     }
 }

src/main.rs

@@ -7,10 +7,12 @@ mod filtering;
 mod iq;
 mod math;
 mod nco;
+mod squelch;
 mod ted;
 mod units;
 mod windows;
 
+use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
 use egui_plot::{Legend, Line, Plot};
 use hound::WavWriter;
 use rand::{Rng, rand_core::le, seq::index::sample};
@@ -18,34 +20,56 @@ use std::{
     cell::{Cell, RefCell},
     collections::VecDeque,
     env::{self, args},
+    f32::consts::PI,
+    fmt::Display,
     fs::File,
-    io::{BufWriter, Sink, Write, stdout},
+    io::{BufWriter, Read, Sink, Write, stdout},
     ops::DerefMut,
-    sync::Arc,
+    sync::{Arc, atomic::AtomicU64, mpsc::RecvTimeoutError},
     time::Duration,
+    u64,
 };
-use tokio::{join, net::UdpSocket, select, sync::mpsc::error::TryRecvError, time::timeout};
+use tokio::{
+    io::{self, AsyncReadExt, AsyncWriteExt},
+    join,
+    net::{TcpSocket, TcpStream, UdpSocket},
+    select,
+    sync::mpsc::{UnboundedSender, error::TryRecvError, unbounded_channel},
+    time::timeout,
+};
+use tun_tap::Iface;
 
 use crate::{
     bfsk::BFSKMod,
     complex::Complex32,
-    filtering::{dc_block::DCBlocker, fir::FIRFilter},
+    filtering::{
+        dc_block::DCBlocker,
+        fir::FIRFilter,
+        impulse_response::{
+            self,
+            design::{estimate_fir_length, frequency_response},
+        },
+    },
     iq::IQSampler,
+    math::map,
     nco::Nco,
+    squelch::Squelch,
     ted::elg::ELGate,
     units::frequency::hz_to_rad_per_sample,
 };
-use eframe::egui::{self, CentralPanel, Color32};
+use eframe::egui::{self, CentralPanel, Color32, RichText};
 use tokio::sync::RwLock;
 use tokio::sync::mpsc::{Receiver, Sender, channel};
 
-const BAUD_RATE: u32 = 1000;
+const BAUD_RATE: u32 = 1200;
 const SAMPLE_RATE: u32 = 48000;
 
 // Modulation parameters
 const CENTER_FREQ: f32 = 1700.;
 const DEVIATION: f32 = 500.;
 
+static mut INSTANCE_ID: u32 = 0;
+
 pub enum SampleSenderCommand {
     Open,
     Close,
@@ -93,11 +117,121 @@ impl SampleSender for WavSampleSender {
     }
 }
 
+struct FSKReceiver {
+    eye_sender: Sender<Vec<f32>>,
+    phase_lowpass: FIRFilter,
+    baseband_filter: FIRFilter,
+    elg: ELGate,
+    last_byte: u8,
+    frame_constructor: FrameConstructor,
+    bit_count: Option<u32>,
+    last_sample: Complex32,
+}
+
+impl FSKReceiver {
+    fn new(eye_sender: Sender<Vec<f32>>) -> Self {
+        let samples_per_symbol = (SAMPLE_RATE as f32) / (BAUD_RATE as f32);
+
+        let mut phase_lowpass =
+            FIRFilter::new(&vec![Complex32::new(1., 0.); samples_per_symbol as usize]);
+        phase_lowpass.normalize_dc();
+        //let mut dc_block = DCBlocker::new(0.999);
+        //let mut dc_block = DCBlocker::new(1.);
+
+        let loop_i = 0.03;
+        let loop_p = 0.1;
+        let mut loop_ir = vec![Complex32::new(loop_i, 0.); samples_per_symbol as usize / 4];
+        loop_ir.push(Complex32::new(loop_p, 0.));
+        let elg = ELGate::new(samples_per_symbol, FIRFilter::new(&loop_ir));
+
+        // Baseband filter
+        let bbf_length = estimate_fir_length(100., SAMPLE_RATE as f32).floor() as usize;
+        let mut frequency_response = vec![Complex32::zero(); bbf_length].into_boxed_slice();
+        let cutoff_bin = map(
+            hz_to_rad_per_sample(DEVIATION + 300., SAMPLE_RATE as f32),
+            0.,
+            2. * PI,
+            0.,
+            bbf_length as f32,
+        )
+        .floor() as usize;
+
+        // Design transfer function
+        for i in 0..cutoff_bin {
+            frequency_response[i] = Complex32::new(1., 0.);
+            frequency_response[bbf_length - 1 - i] = Complex32::new(1., 0.);
+        }
+
+        Self {
+            //iq_sampler: IQSampler::new(hz_to_rad_per_sample(CENTER_FREQ, SAMPLE_RATE as f32)),
+            phase_lowpass,
+            baseband_filter: FIRFilter::new(&impulse_response::design::ir_from_transfer_function(
+                &frequency_response,
+                windows::blackmann,
+            )),
+            elg,
+            last_byte: 0x00u8,
+            frame_constructor: FrameConstructor::new(),
+            bit_count: None,
+            eye_sender,
+            last_sample: Complex32::new(1., 0.),
+        }
+    }
+
+    async fn receive(&mut self, iq: Complex32) -> Result<Option<Frame>, FrameConstructionError> {
+        // Frame reconstruction
+        let filtered_bb = self.baseband_filter.next(iq);
+        // let dphi = self
+        //     .phase_lowpass
+        //     .next_real((self.last_sample * filtered_bb.conj()).arg());
+        let dphi = (self.last_sample * filtered_bb.conj()).arg();
+        self.last_sample = filtered_bb;
+        if let Some((bit_sample, eye)) = self.elg.next_eye(dphi) {
+            let _ = self.eye_sender.send(eye).await;
+            self.last_byte >>= 1;
+            self.last_byte |= ((bit_sample > 0.) as u8) << 7;
+            //last_byte <<= 1;
+            //last_byte |= ((bit_sample < 0.) as u8);
+            self.bit_count = self.bit_count.map(|x| x + 1);
+
+            if let None = self.bit_count
+                && self.last_byte == 0xD8
+            {
+                // Potential frame starts
+                self.last_byte = 0;
+                self.frame_constructor = FrameConstructor::new();
+                self.bit_count = Some(0);
+            }
+
+            if let Some(8) = self.bit_count {
+                let frame_opt = self.frame_constructor.add_byte(self.last_byte);
+                self.bit_count = Some(0);
+                //print!("{}", last_byte as char);
+                eprint!(".{:x}.", self.last_byte);
+                let _ = std::io::stdout().flush();
+                return frame_opt;
+            }
+        }
+        return Ok(None);
+    }
+}
+
+#[derive(Debug)]
+enum TransceiverState {
+    Waiting,
+    Receiving,
+    EOT,
+    SendingAck,
+    Sending,
+    Listening,
+}
+
 struct Transceiver {
     tx_stream: Sender<Vec<u8>>,
     rx_stream: Receiver<Vec<u8>>,
 
     eye_receiver: Receiver<Vec<f32>>,
+    state_receiver: Receiver<TransceiverState>,
 }
 
 impl Transceiver {
@@ -117,214 +251,140 @@ impl Transceiver {
         self.eye_receiver.try_recv()
     }
 
-    pub fn start(
-        mut sample_stream: Receiver<f32>,
-        mut sample_sender: Sender<SampleSenderCommand>,
-    ) -> Self {
+    pub fn try_recv_state(&mut self) -> Result<TransceiverState, TryRecvError> {
+        self.state_receiver.try_recv()
+    }
+
+    pub fn start(mut sample_stream: Receiver<f32>, mut sample_sender: Sender<Vec<f32>>) -> Self {
         let mut resend: Option<Vec<u8>> = None;
         let (mut eyes_tx, eyes_rx) = channel::<Vec<f32>>(1024);
+        let (mut state_tx, state_rx) = channel::<TransceiverState>(1024);
+        state_tx.try_send(TransceiverState::Waiting);
 
-        let (rx_stream_sender, rx_stream_receiver) = channel::<Vec<u8>>(1024);
+        let (rx_stream_sender, mut rx_stream_receiver) = channel::<Vec<u8>>(1024);
         let (tx_stream_sender, mut tx_stream_receiver) = channel::<Vec<u8>>(1024);
 
+        let receiving = Arc::new(RwLock::new(false));
         tokio::spawn(async move {
+            let mut squelch = Squelch::new(200, 0.5);
+            let mut iq_sampler =
+                IQSampler::new(hz_to_rad_per_sample(CENTER_FREQ, SAMPLE_RATE as f32));
+
+            let mut current_message = None;
             loop {
                 select! {
-                    _ = Self::squelch_detector(&mut sample_stream) =>
-                    {
-                        println!("Squelch up");
-                        select!
-                        {
-                            x = Self::receive(&mut sample_stream, &mut eyes_tx) =>
-                            {
-                                match x
-                                {
-                                    Err(()) => {continue;},
-                                    Ok(Frame::Ack) =>
-                                    {
-                                        resend = None;
-                                    }
-                                    Ok(Frame::Data(data)) =>
-                                    {
-                                        println!("Got data frame, send data");
-                                        let _ = rx_stream_sender.send(data).await;
-                                        tokio::time::sleep(Duration::from_secs(1)).await;
-                                        println!("Got data frame, sending ack");
-                                        Self::transmit(Frame::Ack, &mut sample_sender).await;
-                                        println!("Sent ack");
-                                    }
-                                }
-                            },
-                            _ = tokio::time::sleep(Duration::from_secs(100)) => {continue;}, //TODO: 65
-                                                                                           //sec
-                                                                                           //timeout
-                        }
-                    }, // End squelch
-                    data_opt = async
-                    {
-                        tokio::time::sleep(Duration::from_secs(2)).await;
-                        if let Some(resend_data) = resend.clone()
-                        {
-                            Some(resend_data)
-                        }
-                        else
-                        {
-                            tx_stream_receiver.recv().await
-                        }
+                    _ = async {
+                            while squelch.next(iq_sampler.sample(sample_stream.recv().await.unwrap())).is_none() {}
                     }
                     =>
                     {
-                        if let Some(data) = data_opt
+                        state_tx.try_send(TransceiverState::Receiving);
+                        // Wait for end of tranmission
+                        let mut recv = Some(FSKReceiver::new(eyes_tx.clone()));
+                        let mut send_ack = false;
+                        while let Some(iq) = squelch.next(iq_sampler.sample(sample_stream.recv().await.unwrap()))
                         {
-                            Self::transmit(Frame::Data(data.clone()), &mut sample_sender).await;
-                            resend = Some(data);
+                            if recv.as_ref().is_some()
+                            {
+                                match recv.as_mut().unwrap().receive(iq).await
+                                {
+                                    Ok(Some(Frame::Data(dat))) => {
+                                        eprintln!("GOT DATA");
+                                        let _ = rx_stream_sender.try_send(dat);
+                                        send_ack = false;
+                                        recv = None;
+                                        state_tx.try_send(TransceiverState::EOT);
+                                    },
+                                    //Ok(Some(Frame::Ack)) => {current_message = None; recv = None; state_tx.try_send(TransceiverState::EOT);},
+                                    Err(()) => {recv = None;},
+                                    _ => {}
+                                }
+                            }
                         }
+                        if send_ack
+                        {
+                            state_tx.try_send(TransceiverState::SendingAck);
+                            Self::transmit(Frame::Ack, &mut sample_sender).await;
+                        }
+                        state_tx.try_send(TransceiverState::Waiting);
+                    },
+                    message = async
+                    {
+                        if current_message.is_none()
+                        {
+                            current_message = Some((tx_stream_receiver).recv().await.unwrap());
+                        }
+                        state_tx.try_send(TransceiverState::Listening);
+                        tokio::time::sleep(Duration::from_millis(50 * rand::random_range(1..10))).await;
+                        current_message.as_ref().unwrap()
+                    } =>
+                    {
+                        state_tx.try_send(TransceiverState::Sending);
+                        eprintln!("Sending message");
+                        Self::transmit(Frame::Data(message.clone()), &mut sample_sender).await;
+                        current_message = None;
+                        eprintln!("Sent message");
+                        state_tx.try_send(TransceiverState::Waiting);
                     }
-                }
+                };
             }
         });
 
         Self {
             eye_receiver: eyes_rx,
+            state_receiver: state_rx,
 
             tx_stream: tx_stream_sender,
             rx_stream: rx_stream_receiver,
         }
     }
 
-    async fn squelch_detector(sample_stream: &mut Receiver<f32>) {
-        let length = 200;
-        let level = 0.4;
-        let mut iq_sampler = IQSampler::new(hz_to_rad_per_sample(CENTER_FREQ, SAMPLE_RATE as f32));
-        let mut squelch_sum = 0.;
-        let mut i = 0;
-        while let Some(smpl) = sample_stream.recv().await {
-            let iq = iq_sampler.sample(smpl);
-            squelch_sum += iq.mag() / length as f32;
-            i += 1;
-
-            if i >= length {
-                if squelch_sum >= level {
-                    return;
-                }
-                i = 0;
-                squelch_sum = 0.;
-            }
-        }
-    }
-
-    pub async fn transmit(frame: Frame, samples_sender: &mut Sender<SampleSenderCommand>) {
+    pub async fn transmit(frame: Frame, samples_sender: &mut Sender<Vec<f32>>) {
         let bytes = frame.bytes();
-        let mut bit_stream = bytes.iter().flat_map(|x| byte_to_bits(*x));
-        let modulator = BFSKMod::new(
-            (SAMPLE_RATE as f32 / BAUD_RATE as f32).round() as u32,
-            hz_to_rad_per_sample(DEVIATION, SAMPLE_RATE as f32),
-            &mut bit_stream,
-        );
+        let data = bytes
+            .iter()
+            .flat_map(|x| byte_to_bits(*x))
+            .collect::<Vec<_>>();
 
-        let up_lo = Nco::new(hz_to_rad_per_sample(CENTER_FREQ, SAMPLE_RATE as f32));
-        samples_sender.send(SampleSenderCommand::Open).await;
-        for (m, up) in modulator.zip(up_lo) {
-            let sample = m * up;
-            samples_sender
-                .send(SampleSenderCommand::Sample(sample.re))
-                .await;
-        }
-        samples_sender.send(SampleSenderCommand::Close).await;
-    }
-
-    async fn receive(
-        sample_stream: &mut Receiver<f32>,
-        eye_sender: &mut Sender<Vec<f32>>,
-    ) -> Result<Frame, FrameConstructionError> {
-        let mut iq_sampler = IQSampler::new(hz_to_rad_per_sample(CENTER_FREQ, SAMPLE_RATE as f32));
-
-        let samples_per_symbol = (SAMPLE_RATE as f32) / (BAUD_RATE as f32);
-
-        let correllator_length = samples_per_symbol as usize;
-        let mut pos_nco = Nco::new(hz_to_rad_per_sample(DEVIATION, SAMPLE_RATE as f32));
-        let mut neg_nco = Nco::new(hz_to_rad_per_sample(-DEVIATION, SAMPLE_RATE as f32));
-        let pos_ir = (0..correllator_length).map(|i| {
-            pos_nco.step();
-            pos_nco.cexp() * windows::blackmann(i as f32 / correllator_length as f32)
-        });
-        let neg_ir = (0..correllator_length).map(|i| {
-            neg_nco.step();
-            neg_nco.cexp() * windows::blackmann(i as f32 / correllator_length as f32)
-        });
-        let mut pos_correllator = FIRFilter::new(&pos_ir.collect::<Vec<_>>());
-        let mut neg_correllator = FIRFilter::new(&neg_ir.collect::<Vec<_>>());
-        pos_correllator.normalize_freq(hz_to_rad_per_sample(DEVIATION, SAMPLE_RATE as f32));
-        neg_correllator.normalize_freq(hz_to_rad_per_sample(-DEVIATION, SAMPLE_RATE as f32));
-
-        let mut matched_lowpass = FIRFilter::new(&vec![
-            Complex32::new(1., 0.);
-            samples_per_symbol as usize / 2
-        ]);
-        matched_lowpass.normalize_freq(hz_to_rad_per_sample(DEVIATION, SAMPLE_RATE as f32));
-        //let mut dc_block = DCBlocker::new(0.999);
-        let mut dc_block = DCBlocker::new(1.);
-
-        let loop_i = 0.0;
-        let loop_p = 0.1;
-        let mut loop_ir = vec![Complex32::new(loop_i, 0.); samples_per_symbol as usize];
-        loop_ir.push(Complex32::new(loop_p, 0.));
-        let mut elg = ELGate::new(samples_per_symbol, FIRFilter::new(&loop_ir));
-
-        // Frame reconstruction
-        let mut last_byte = 0x00u8;
-        let mut frame_constructor = FrameConstructor::new();
-        let mut bit_count: Option<u32> = None;
-        while let Some(sample) = sample_stream.recv().await {
-            let iq = iq_sampler.sample(sample);
-            let matched =
-                matched_lowpass
-                    .next_real(dc_block.next_real(
-                        pos_correllator.next(iq).mag() - neg_correllator.next(iq).mag(),
-                    ));
-            if let Some((bit_sample, eye)) = elg.next_eye(matched) {
-                let _ = eye_sender.send(eye).await;
-                last_byte >>= 1;
-                last_byte |= ((bit_sample > 0.) as u8) << 7;
-                //last_byte <<= 1;
-                //last_byte |= ((bit_sample < 0.) as u8);
-                bit_count = bit_count.map(|x| x + 1);
-
-                if let None = bit_count
-                    && last_byte == 0xD8
-                {
-                    // Potential frame starts
-                    last_byte = 0;
-                    frame_constructor = FrameConstructor::new();
-                    bit_count = Some(0);
-                }
-
-                if let Some(8) = bit_count {
-                    let frame_opt = frame_constructor.add_byte(last_byte);
-                    bit_count = Some(0);
-                    //print!("{}", last_byte as char);
-                    print!(".{:x}.", last_byte);
-                    let _ = std::io::stdout().flush();
-
-                    if let Ok(Some(Frame::Ack)) = frame_opt {
-                        println!("Got ack");
-                        return Ok(Frame::Ack);
-                    }
-
-                    if let Ok(Some(Frame::Data(ref frame_data))) = frame_opt {
-                        println!("Got data");
-                        return Ok(Frame::Data(frame_data.to_vec()));
-                    }
-
-                    if let Err(()) = frame_opt {
-                        // Erroneous frame
-                        println!("Error");
-                        return Err(());
-                    }
-                }
+        let sample_per_symbols = SAMPLE_RATE / BAUD_RATE;
+        let bitstream = (0..(bytes.len() * 8 * sample_per_symbols as usize)).map(|i| {
+            if data[i / sample_per_symbols as usize] {
+                1.
+            } else {
+                -1.
             }
+        });
+
+        // Synthesise impulse response
+        let mut impulse_response =
+            vec![Complex32::zero(); sample_per_symbols as usize].into_boxed_slice();
+        for (i, x) in impulse_response.iter_mut().enumerate() {
+            *x = Complex32::new(
+                windows::gaussian(0.3, i as f32 / sample_per_symbols as f32),
+                0.,
+            );
         }
-        return Err(());
+
+        let mut gaussian_filter = FIRFilter::new(&impulse_response);
+        gaussian_filter.normalize_dc();
+        let filtered_bitstream = bitstream.map(|x| gaussian_filter.next_real(x));
+
+        let mut nco = Nco::new(0.);
+        let mut lo = Nco::new(hz_to_rad_per_sample(CENTER_FREQ, SAMPLE_RATE as f32));
+
+        // Generate passband
+        let samples = filtered_bitstream
+            .map(|f| {
+                nco.set_frequency(hz_to_rad_per_sample(f * DEVIATION, SAMPLE_RATE as f32));
+                nco.step_n(1);
+                lo.step_n(1);
+                (nco.cexp() * lo.cexp()).re
+            })
+            .collect::<Vec<_>>();
+
+        let len = samples.len();
+        samples_sender.send(samples).await.unwrap();
+        tokio::time::sleep(Duration::from_secs_f32(len as f32 / SAMPLE_RATE as f32)).await;
     }
 }
 
@@ -353,7 +413,7 @@ impl FrameConstructor {
 
     pub fn add_byte(&mut self, byte: u8) -> Result<Option<Frame>, FrameConstructionError> {
         if self.frame.is_empty() && byte != 0xC4 && byte != 0x4C && !self.started {
-            println!("Wrong type {:x}", byte);
+            eprintln!("Wrong type {:x}", byte);
             self.started = true;
             return Err(());
         }
@@ -388,7 +448,7 @@ impl FrameConstructor {
                 )));
             }
 
-            println!("Checksum failed");
+            eprintln!("Checksum failed");
             return Err(());
         }
 
@@ -405,7 +465,7 @@ impl Frame {
         let mut output_bytes = vec![];
 
         // Initial training sequence
-        output_bytes.append(&mut vec![0b01010101; 64]);
+        output_bytes.append(&mut vec![0b01010101; 32]);
 
         // Preamble byte
         output_bytes.push(0xD8);
@@ -433,13 +493,27 @@ impl Frame {
         }
 
         // SEND EOT
-        output_bytes.extend(std::iter::repeat_n(4, 32));
+        output_bytes.extend(std::iter::repeat_n(4, 16));
         output_bytes
     }
 }
 
 #[tokio::main]
 async fn main() {
+    // Read instance
+    eprintln!(
+        "fir length: {}",
+        impulse_response::design::estimate_fir_length(1000., 48000.)
+    );
+    let id = std::env::args().collect::<Vec<_>>()[1]
+        .parse::<u32>()
+        .expect("NO INPUT ID");
+    assert!(id == 0 || id == 1);
+
+    unsafe {
+        INSTANCE_ID = id;
+    };
+
     //Transceiver::transmit(Frame::Data("Skibditoilet".repeat(100).bytes().collect::<Vec<_>>()), &mut WavSampleSender{}).await;
     //Transceiver::transmit(Frame::Ack, &mut WavSampleSender::default()).await;
     //return;
@@ -463,97 +537,117 @@ impl SampleSender for DummySampleSender {
 }
 
 struct EguiApp {
-    a_transceiver: Transceiver,
-    b_transceiver: Transceiver,
+    transceiver: Transceiver,
 
-    eyes_a: VecDeque<Vec<f32>>,
-    eyes_b: VecDeque<Vec<f32>>,
+    eyes: VecDeque<Vec<f32>>,
+    current_state: TransceiverState,
+    iface: Iface,
 }
 impl EguiApp {
     fn new(_cc: &eframe::CreationContext<'_>) -> Self {
-        let (up_a_sender, mut up_a_receiver) = channel::<SampleSenderCommand>(1024);
-        let (down_a_sender, down_a_receiver) = channel::<f32>(1024);
+        let iface = Iface::new("radio%d", tun_tap::Mode::Tap).unwrap();
+        iface.set_non_blocking().unwrap();
 
-        let (up_b_sender, mut up_b_receiver) = channel::<SampleSenderCommand>(1024);
-        let (down_b_sender, down_b_receiver) = channel::<f32>(1024);
+        let (up_sender, mut up_receiver) = channel::<Vec<f32>>(16);
+        let (down_sender, down_receiver) = channel::<f32>(1024);
 
-        let (a2b_tx, mut a2b_rx) = channel::<f32>(1024);
-        let (b2a_tx, mut b2a_rx) = channel::<f32>(1024);
+        let transceiver = Transceiver::start(down_receiver, up_sender);
 
-        let a_txrx = Transceiver::start(down_a_receiver, up_a_sender);
-        let b_txrx = Transceiver::start(down_b_receiver, up_b_sender);
+        let instance_id = unsafe { INSTANCE_ID };
+        tokio::task::spawn(async move {
+            eprintln!("Waiting for connection ...");
 
-        // A dummy channel
-        tokio::spawn(async move {
-            //let rng = rand::thread_rng();
-            let mut sending = false;
-            loop {
-                let noise = rand::random::<f32>() * 0.1;
-                let mut sample = 0.;
+            // let socket = Arc::new(
+            //     UdpSocket::bind(format!("0.0.0.0:{}", 9000 + instance_id))
+            //         .await
+            //         .unwrap(),
+            // );
+            // socket
+            //     .connect(format!("127.0.0.1:{}", 9000 + (1 - instance_id)))
+            //     .await
+            //     .unwrap();
 
-                match up_a_receiver.try_recv() {
-                    Ok(SampleSenderCommand::Open) => {
-                        sending = true;
-                    }
-                    Ok(SampleSenderCommand::Close) => {
-                        sending = false;
-                    }
-                    Ok(SampleSenderCommand::Sample(x)) => {
-                        sample = x;
-                    }
-                    _ => {}
-                }
+            // Receiving end
+            let host = cpal::default_host();
 
-                if sending {
-                    // Flush receiver buffer but ignore
-                    while let Ok(_) = b2a_rx.try_recv() {}
+            let device = host.default_input_device().expect("No input device");
+            let mut config = device
+                .supported_input_configs()
+                .unwrap()
+                .next()
+                .unwrap()
+                .with_sample_rate(cpal::SampleRate(48000));
 
-                    // Send to other
-                    a2b_tx.send(sample + noise).await.unwrap();
-                } else if let Ok(down_sample) = b2a_rx.try_recv() {
-                    down_a_sender.send(down_sample).await.unwrap();
-                }
-            }
-        });
+            let stream = device
+                .build_input_stream(
+                    &config.into(),
+                    move |data: &[f32], _| {
+                        for x in data.iter() {
+                            let _ = down_sender.blocking_send(*x * 30.); // non-blocking send
+                        }
+                    },
+                    move |err| eprintln!("Stream error: {}", err),
+                    None,
+                )
+                .unwrap();
+            stream.play().unwrap();
 
-        // B dummy channel
-        tokio::spawn(async move {
-            let mut sending = false;
-            loop {
-                let noise = rand::random::<f32>() * 0.1;
-                let mut sample = 0.;
+            let device = host.default_output_device().unwrap();
+            let mut supported_configs_range = device.supported_output_configs().unwrap();
+            let supported_config = supported_configs_range
+                .find(|config| {
+                    config.sample_format() == cpal::SampleFormat::F32
+                        && config.min_sample_rate().0 <= 48000
+                        && config.max_sample_rate().0 >= 48000
+                })
+                .expect("Device does not support 48kHz f32 output");
+            let config = supported_config
+                .with_sample_rate(cpal::SampleRate(48_000))
+                .config();
 
-                match up_b_receiver.try_recv() {
-                    Ok(SampleSenderCommand::Open) => {
-                        sending = true;
-                    }
-                    Ok(SampleSenderCommand::Close) => {
-                        sending = false;
-                    }
-                    Ok(SampleSenderCommand::Sample(x)) => {
-                        sample = x;
-                    }
-                    _ => {}
-                }
+            while let Some(stream) = up_receiver.recv().await {
+                let stream_len = stream.len();
+                let progression = Arc::new(AtomicU64::new(0));
+                let (finished_tx, mut finished_rx) = channel::<()>(16);
 
-                if sending {
-                    // Flush receiver buffer but ignore
-                    while let Ok(_) = a2b_rx.try_recv() {}
+                print!("o");
+                stdout().flush().unwrap();
+                let send_stream = device
+                    .build_output_stream(
+                        &config,
+                        move |data: &mut [f32], _: &cpal::OutputCallbackInfo| {
+                            for d in data.iter_mut() {
+                                if progression.load(std::sync::atomic::Ordering::Relaxed) as usize
+                                    == stream.len()
+                                {
+                                    let _ = finished_tx.blocking_send(());
+                                    break;
+                                }
 
-                    // Send to other
-                    b2a_tx.send(sample + noise).await.unwrap();
-                } else if let Ok(down_sample) = a2b_rx.try_recv() {
-                    down_b_sender.send(down_sample).await.unwrap();
-                }
+                                *d = stream[progression
+                                    .fetch_add(1, std::sync::atomic::Ordering::Relaxed)
+                                    as usize];
+                            }
+                        },
+                        move |err| {
+                            eprintln!("Stream error: {}", err);
+                        },
+                        None,
+                    )
+                    .unwrap();
+                send_stream.play().unwrap();
+                let _ = finished_rx.recv().await;
+                print!("c");
+                stdout().flush().unwrap();
             }
         });
 
         EguiApp {
-            a_transceiver: a_txrx,
-            b_transceiver: b_txrx,
+            transceiver,
 
-            eyes_a: VecDeque::new(),
-            eyes_b: VecDeque::new(),
+            eyes: VecDeque::new(),
+            current_state: TransceiverState::Waiting,
+            iface,
         }
     }
 }
@@ -563,64 +657,65 @@ impl eframe::App for EguiApp {
         egui::CentralPanel::default().show(ctx, |ui| {
             let max_eyes = 100;
 
-            while let Ok(eye) = self.a_transceiver.try_recv_eye() {
-                self.eyes_a.push_back(eye);
-            }
-            while self.eyes_a.len() > max_eyes {
-                self.eyes_a.pop_front();
+            // INTERFACE
+            let mut frame = [0u8; 2000];
+            while let Ok(length) = self.iface.recv(&mut frame) {
+                //break;
+                let _ = self
+                    .transceiver
+                    .get_sender()
+                    .try_send(Vec::from(&frame[0..length]));
             }
 
-            while let Ok(eye) = self.b_transceiver.try_recv_eye() {
-                self.eyes_b.push_back(eye);
-            }
-            while self.eyes_b.len() > max_eyes {
-                self.eyes_b.pop_front();
+            while let Ok(frame) = self.transceiver.try_recv() {
+                let _ = self.iface.send(frame.as_slice());
             }
 
-            ui.columns(2, |uis| {
-                Plot::new("EyeA")
-                    .legend(Legend::default())
-                    .show(&mut uis[0], |plot_ui| {
-                        //plot_ui.set_auto_bounds(Vec2b { x: false, y: false });
-                        for eye in self.eyes_a.iter() {
-                            let line = Line::new(
-                                "EyeA",
-                                eye.iter()
-                                    .enumerate()
-                                    .map(|(i, x)| [i as f64, *x as f64])
-                                    .collect::<Vec<_>>(),
-                            )
-                            .color(Color32::LIGHT_GREEN);
-                            plot_ui.line(line);
-                        }
-                    });
+            while let Ok(eye) = self.transceiver.try_recv_eye() {
+                self.eyes.push_back(eye);
+            }
+            while self.eyes.len() > max_eyes {
+                self.eyes.pop_front();
+            }
+            if let Ok(new_state) = self.transceiver.try_recv_state() {
+                self.current_state = new_state;
+            }
 
-                if uis[0].button("Start").clicked() {
-                    let snd = self.a_transceiver.get_sender();
-                    tokio::spawn(async move {
-                        let _ = snd
-                            .send("Skibditoilet".repeat(100).as_bytes().to_vec())
-                            .await;
-                    });
-                }
-
-                Plot::new("EyeB")
-                    .legend(Legend::default())
-                    .show(&mut uis[1], |plot_ui| {
-                        //plot_ui.set_auto_bounds(Vec2b { x: false, y: false });
-                        for eye in self.eyes_b.iter() {
-                            let line = Line::new(
-                                "EyeB",
-                                eye.iter()
-                                    .enumerate()
-                                    .map(|(i, x)| [i as f64, *x as f64])
-                                    .collect::<Vec<_>>(),
-                            )
-                            .color(Color32::LIGHT_GREEN);
-                            plot_ui.line(line);
-                        }
-                    });
+            ui.horizontal(|ui| {
+                // if ui.button("Start").clicked() {
+                //     let snd = self.transceiver.get_sender();
+                //     let data = (0..rand::random_range(50..250))
+                //         .map(|_| rand::random::<char>() as u8)
+                //         .collect::<Vec<_>>();
+                //
+                //     tokio::spawn(async move {
+                //         let _ = snd.send(data).await;
+                //     });
+                // }
+                //
+                ui.label(
+                    RichText::new(format!("{:?}", self.current_state))
+                        .size(35.)
+                        .color(Color32::LIGHT_GREEN),
+                );
             });
+
+            Plot::new("EyeA")
+                .legend(Legend::default())
+                .show(ui, |plot_ui| {
+                    //plot_ui.set_auto_bounds(Vec2b { x: false, y: false });
+                    for eye in self.eyes.iter() {
+                        let line = Line::new(
+                            "EyeA",
+                            eye.iter()
+                                .enumerate()
+                                .map(|(i, x)| [i as f64, *x as f64])
+                                .collect::<Vec<_>>(),
+                        )
+                        .color(Color32::LIGHT_GREEN);
+                        plot_ui.line(line);
+                    }
+                });
         }); // Central panel
 
         std::thread::sleep(Duration::from_millis(16));

src/squelch.rs

@@ -0,0 +1,34 @@
+use std::collections::VecDeque;
+
+use rand::seq::index::sample;
+
+use crate::complex::Complex32;
+
+pub struct Squelch {
+    window: VecDeque<f32>,
+    sum: f32,
+    level: f32,
+}
+
+impl Squelch {
+    pub fn new(length: usize, level: f32) -> Self {
+        Squelch {
+            window: VecDeque::from(vec![0.; length]),
+            sum: 0.,
+            level,
+        }
+    }
+
+    pub fn next(&mut self, sample: Complex32) -> Option<Complex32> {
+        let oldest = self.window.pop_back().unwrap();
+        self.window.push_front(sample.mag());
+        self.sum -= oldest;
+        self.sum += sample.mag();
+
+        if self.sum / (self.window.len() as f32) > self.level {
+            Some(sample)
+        } else {
+            None
+        }
+    }
+}

src/ted/elg.rs

@@ -1,10 +1,11 @@
-use std::collections::VecDeque;
 use crate::filtering::fir::FIRFilter;
+use std::collections::VecDeque;
 
 // Crued Early late gate timing error detector
 pub struct ELGate {
     samples_per_symbol: f32,
     buffer: VecDeque<f32>, // Store baseband, matched filtered samples,
+    eye_buffer: VecDeque<f32>,
 
     loop_filter: FIRFilter,
     delta: f32,
@@ -18,6 +19,7 @@ impl ELGate {
             samples_per_symbol,
             loop_filter,
             buffer: VecDeque::with_capacity(2 * samples_per_symbol.ceil() as usize),
+            eye_buffer: VecDeque::with_capacity(2 * samples_per_symbol.ceil() as usize),
             delta: 0.5,
             next_sample: samples_per_symbol,
             current_position: 0.,
@@ -30,8 +32,26 @@ impl ELGate {
 
     pub fn next_eye(&mut self, sample: f32) -> Option<(f32, Vec<f32>)> {
         self.buffer.push_front(sample);
+        self.eye_buffer.push_front(sample);
+
         self.current_position += 1.;
         if self.current_position >= self.next_sample {
+            // Eye stuff
+            let mut eye = Vec::new();
+            if self.eye_buffer.len() >= (self.samples_per_symbol / 2.) as usize {
+                let start_index = (self.samples_per_symbol / 2.) as usize;
+                let end_index = (start_index * 3).min(self.eye_buffer.len());
+                eye = self
+                    .eye_buffer
+                    .range(start_index..)
+                    .copied()
+                    .collect::<Vec<_>>();
+
+                while self.eye_buffer.len() > start_index {
+                    self.eye_buffer.pop_back();
+                }
+            }
+
             // Sample center, early late
             let early_id = (self.samples_per_symbol / 2. + self.samples_per_symbol * self.delta)
                 .floor()
@@ -63,4 +83,3 @@ impl ELGate {
         }
     }
 }
-

src/windows.rs

@@ -10,18 +10,20 @@ pub fn bartlett(t: f32) -> f32 {
     if t < 0.5 { 2. * t } else { 2. - 2. * t }
 }
 
-pub fn hann(t: f32) -> f32
-{
+pub fn hann(t: f32) -> f32 {
     0.5 - 0.5 * (2. * PI * t).cos()
 }
 
-pub fn hamming(t: f32) -> f32
-{
+pub fn hamming(t: f32) -> f32 {
     0.54 - 0.46 * (2. * PI * t).cos()
 }
 
-pub fn blackmann(t: f32) -> f32
-{
+pub fn blackmann(t: f32) -> f32 {
     let x = 2. * PI * t;
     0.45 - 0.5 * x.cos() + 0.08 * (2. * x).cos()
 }
+
+pub fn gaussian(sigma: f32, t: f32) -> f32 {
+    let sq = (t - 0.5) / sigma;
+    (-sq * sq).exp()
+}