octagonal/oxydsp
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better tag interface, starting bpsk

Browse Source
This commit is contained in:
Albin Chaboissier
2026-03-25 13:27:46 +01:00
parent b13e846fa5
commit 7766d9b91d
13 changed files with 360 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
examples/bfsk-modem/src/main.rs
View File

@ -1,40 +1,3 @@
use std::collections::VecDeque;
use std::fs::File;
use std::io;
use std::io::Write;
use std::sync::mpsc;
use cpal::traits::DeviceTrait;
use cpal::traits::HostTrait;
use eframe::NativeOptions;
use egui::Color32;
use egui_plot::Line;
use egui_plot::PlotPoints;
use num::Complex;
use num::Zero;
use oxydsp_dsp::blocks::filtering::fir::FirFilter;
use oxydsp_dsp::blocks::iq::zero_if::ZeroIf;
use oxydsp_dsp::blocks::math::basic::Adder;
use oxydsp_dsp::blocks::math::basic::Multiplier;
use oxydsp_dsp::blocks::synthesis::Nco;
use oxydsp_dsp::blocks::synthesis::OscillatorSource;
use oxydsp_dsp::blocks::ted::early_late::EarlyLateGate;
use oxydsp_dsp::blocks::utilities::adapters::Map;
use oxydsp_dsp::blocks::utilities::adapters::MapResultTagged;
use oxydsp_dsp::blocks::utilities::adapters::NullSink;
use oxydsp_dsp::blocks::utilities::adapters::Repeat;
use oxydsp_dsp::blocks::utilities::adapters::Scan;
use oxydsp_dsp::blocks::utilities::adapters::ScanTagged;
use oxydsp_dsp::blocks::utilities::channels::RxSource;
use oxydsp_dsp::blocks::utilities::iter::IterSource;
use oxydsp_dsp::blocks::utilities::squelch::Squelch;
use oxydsp_dsp::filtering::fir::Fir;
use oxydsp_dsp::units::DigitalFrequency;
use oxydsp_flowgraph::block::BlockResult;
use oxydsp_flowgraph::flowgraph;
use oxydsp_flowgraph::graph::FlowGraph;
use rand::random;
use crate::receiver::RadioReceiver;
use crate::transmitter::Transmitter;
@ -51,7 +14,7 @@ fn main()
loop
{
let mut user_input = String::new();
io::stdin().read_line(&mut user_input).unwrap();
std::io::stdin().read_line(&mut user_input).unwrap();
println!("Transmitting ...");
tx.transmit(user_input.as_bytes().to_vec());
}

12
examples/bfsk-modem/src/receiver.rs
View File

@ -28,6 +28,7 @@ use oxydsp_flowgraph::flowgraph;
use oxydsp_flowgraph::graph::FlowGraph;
use oxydsp_flowgraph::tag::Tag;
use oxydsp_flowgraph::tag::Tagged;
use oxydsp_flowgraph::tag::Tags;
use crate::CARRIER;
use crate::DEVIATION;
@ -149,6 +150,7 @@ impl RadioReceiver
pub fn start_new() -> Self
{
let carrier = DigitalFrequency::from_time_frequency(CARRIER, SAMPLE_RATE as f64);
let mut tags = Tags::default();
let (audio_tx, audio_rx) = mpsc::channel();
let (packet_tx, packet_rx) = mpsc::channel::<Vec<u8>>();
@ -174,11 +176,13 @@ impl RadioReceiver
let mut elg_loop = Fir(vec![1. / 20.; 30]);
*elg_loop.0.last_mut().unwrap() = 1.;
let (elg, arg) = EarlyLateGate::new(arg, elg_loop, SAMPLE_PER_SYMBOL);
let symbol_tag = tags.allocate_tag("early late gate symbol");
let (elg, arg) = EarlyLateGate::new(arg, elg_loop, SAMPLE_PER_SYMBOL, symbol_tag.clone());
// // Eye diagram
let (tx, rx) = mpsc::channel::<(Vec<f32>, f32)>();
//let (eye_sender, arg) = ScanTagged::new(arg, VecDeque::<()>::new(), move |history, x| {
let symbol_tag2 = symbol_tag.clone();
let (eye_sender, arg) = ScanTagged::new(arg, VecDeque::new(), move |history, x| {
let cloned_tag = x.1.clone();
if history.len() == 2 * SAMPLE_PER_SYMBOL
@ -188,9 +192,9 @@ impl RadioReceiver
let mut error: f32 = 0.;
let is_symbol_center = x.1.as_ref().is_some_and(|t| {
if let Some(err) = t.retrieve("elg_symbol")
if let Some(err) = t.retrieve(symbol_tag2.clone())
{
error = *err.downcast().unwrap();
error = *err;
true
}
else
@ -216,7 +220,7 @@ impl RadioReceiver
if sample
.1
.as_ref()
.is_some_and(|t| t.retrieve("elg_symbol").is_some())
.is_some_and(|t| t.retrieve(symbol_tag.clone()).is_some())
&& let Some(packet) = builder.next_bit(sample.0 < 0.)
{
let _ = packet_tx.send(packet);

42
examples/bfsk-modem/src/transmitter.rs
View File

@ -1,44 +1,16 @@
use std::collections::VecDeque;
use std::fs::File;
use std::io::Write;
use std::iter::FusedIterator;
use std::net::UdpSocket;
use std::ops::BitXor;
use std::sync::mpsc;
use std::sync::mpsc::Receiver;
use std::sync::mpsc::Sender;
use std::sync::mpsc::SyncSender;
use std::sync::mpsc::sync_channel;
use std::thread::JoinHandle;
use std::time::Duration;
use cpal::Stream;
use cpal::traits::DeviceTrait;
use cpal::traits::HostTrait;
use eframe::NativeOptions;
use egui::Color32;
use egui::output;
use egui_plot::Line;
use egui_plot::PlotPoints;
use num::Complex;
use num::Zero;
use oxydsp_dsp::blocks::filtering::fir::FirFilter;
use oxydsp_dsp::blocks::iq::zero_if::ZeroIf;
use oxydsp_dsp::blocks::math::basic::Adder;
use oxydsp_dsp::blocks::math::basic::Multiplier;
use oxydsp_dsp::blocks::synthesis::Nco;
use oxydsp_dsp::blocks::synthesis::OscillatorSource;
use oxydsp_dsp::blocks::ted::early_late::EarlyLateGate;
use oxydsp_dsp::blocks::utilities::adapters::Map;
use oxydsp_dsp::blocks::utilities::adapters::MapResultTagged;
use oxydsp_dsp::blocks::utilities::adapters::NullSink;
use oxydsp_dsp::blocks::utilities::adapters::Repeat;
use oxydsp_dsp::blocks::utilities::adapters::Scan;
use oxydsp_dsp::blocks::utilities::adapters::ScanTagged;
use oxydsp_dsp::blocks::utilities::channels::RxSource;
use oxydsp_dsp::blocks::utilities::channels::TxSink;
use oxydsp_dsp::blocks::utilities::iter::IterSource;
use oxydsp_dsp::blocks::utilities::squelch::Squelch;
use oxydsp_dsp::filtering::fir::Fir;
use oxydsp_dsp::units::DigitalFrequency;
use oxydsp_flowgraph::BlockIO;
@ -49,6 +21,14 @@ use oxydsp_flowgraph::graph::FlowGraph;
use oxydsp_flowgraph::io::In;
use oxydsp_flowgraph::io::Out;
use rand::random;
use std::iter::FusedIterator;
use std::net::UdpSocket;
use std::ops::BitXor;
use std::sync::mpsc;
use std::sync::mpsc::Receiver;
use std::sync::mpsc::SyncSender;
use std::sync::mpsc::sync_channel;
use std::thread::JoinHandle;
use crate::CARRIER;
use crate::DEVIATION;
@ -200,11 +180,11 @@ impl Transmitter
// gaussian fir
let fir = Fir((0..SAMPLE_PER_SYMBOL)
.map(|x| gaussian(0.1, x as f32 / SAMPLE_PER_SYMBOL as f32))
.map(|x| gaussian(0.8, x as f32 / SAMPLE_PER_SYMBOL as f32))
.collect())
.normalized();
//let (bit_filter, bits) = FirFilter::new(bits, fir);
let (bit_filter, bits) = FirFilter::new(bits, fir);
let (to_freq, freq) = Map::new(bits, move |x| {
DigitalFrequency::from_time_frequency(DEVIATION * x as f64, SAMPLE_RATE as f64)
});
@ -240,7 +220,7 @@ impl Transmitter
packet_rec,
linearizer,
//reverb,
//bit_filter,
bit_filter,
udp_map,
to_freq,
repeat,

15
examples/dpsk-modem/Cargo.toml Normal file
View File

@ -0,0 +1,15 @@
[package]
name = "dpsk-modem"
version = "0.1.0"
edition = "2024"
[dependencies]
oxydsp-flowgraph = {path = "../../oxydsp-flowgraph/"}
oxydsp-dsp = {path = "../../oxydsp-dsp/"}
egui = "0.33.3"
egui_plot = "0.34.1"
eframe = { version = "0.33.3", features = ["default_fonts", "wayland"] }
num = "0.4.3"
hound = "3.5.1"
rand = "0.10.0"
cpal = "0.17.3"

BIN
examples/dpsk-modem/mod.wav Normal file
View File

Binary file not shown.

153
examples/dpsk-modem/src/main.rs Normal file
View File

@ -0,0 +1,153 @@
use std::collections::VecDeque;
use std::sync::mpsc::channel;
use std::time::Duration;
use eframe::NativeOptions;
use egui::Color32;
use egui_plot::PlotPoints;
use egui_plot::Points;
use num::Complex;
use num::Integer;
use oxydsp_dsp::blocks::iq::zero_if::ZeroIf;
use oxydsp_dsp::blocks::math::basic::Multiplier;
use oxydsp_dsp::blocks::synthesis::OscillatorSource;
use oxydsp_dsp::blocks::utilities::adapters::MapResultTagged;
use oxydsp_dsp::blocks::utilities::adapters::NullSink;
use oxydsp_dsp::blocks::utilities::adapters::Repeat;
use oxydsp_dsp::blocks::utilities::adapters::Scan;
use oxydsp_dsp::blocks::utilities::channels::TxSink;
use oxydsp_dsp::blocks::utilities::iter::IterSource;
use oxydsp_dsp::filtering::fir::Fir;
use oxydsp_dsp::units::DigitalFrequency;
use oxydsp_flowgraph::block::BlockResult;
use oxydsp_flowgraph::flowgraph;
use oxydsp_flowgraph::tag::Tags;
use rand::random;
use rand::random_bool;
const SAMPLE_RATE: usize = 48_000;
const CARRIER: f64 = 1000.;
const SAMPLE_PER_SYMBOL: usize = 96;
fn main()
{
modulator();
demodulator();
println!("Hello, world!");
}
fn demodulator()
{
let mut reader = hound::WavReader::open("mod.wav").unwrap();
let samples = reader
.samples::<i16>()
.map(|x| (x.unwrap() as f32) / (i16::MAX as f32))
.collect::<Vec<_>>();
let (signal_source, signal) = IterSource::new(samples.into_iter());
let (mut zero_if, baseband) = ZeroIf::new(
signal,
DigitalFrequency::from_time_frequency(CARRIER, SAMPLE_RATE as f64).into(),
);
zero_if.set_fir(Fir::lowpass(
DigitalFrequency::from_time_frequency(CARRIER + 100., SAMPLE_RATE as f64),
100,
));
let (constellation_tx, conbtellation_rx) = channel::<Complex<f32>>();
let tx_sink = TxSink::new(baseband, constellation_tx);
let graph = flowgraph![signal_source, zero_if, tx_sink];
graph.run();
let mut constellation = VecDeque::new();
let mut n = 0;
eframe::run_simple_native("Plot", NativeOptions::default(), move |ctx, _frame| {
while let Ok(sample) = conbtellation_rx.try_recv()
{
if constellation.len() >= 100_000
{
let _ = constellation.pop_back();
}
if n.is_multiple_of(&SAMPLE_PER_SYMBOL)
{
constellation.push_front(sample);
}
n += 1;
}
egui::CentralPanel::default().show(ctx, |ui| {
egui_plot::Plot::new("hello").show(ui, |plot_ui| {
plot_ui.points(
Points::new(
"constellation",
constellation
.iter()
.map(|s| [s.re as f64, s.im as f64])
.collect::<PlotPoints>(),
)
.id("constellation")
.color(Color32::GREEN),
);
});
ctx.request_repaint();
});
})
.unwrap();
}
fn modulator()
{
let random_source = (0..1000).map(|_| random_bool(0.5));
let mut tags = Tags::new();
let (mut bit_source, bits) = IterSource::new(random_source);
let last_tag = tags.allocate_tag("finished");
bit_source.tag_last_with(last_tag.clone());
let (phase_map, phase) = Scan::new(bits, 1., |state, bit| {
if bit
{
*state *= -1.;
}
*state
});
let (repeater, phase) = Repeat::new(phase, SAMPLE_PER_SYMBOL);
let (oscillator, passband) = OscillatorSource::<f32>::new(
DigitalFrequency::from_time_frequency(CARRIER, SAMPLE_RATE as f64).into(),
);
let (multiplier, passband) = Multiplier::new(passband, phase);
let (output_tx, output_rx) = channel::<Complex<f32>>();
let (tx_map, passband) = MapResultTagged::new(passband, move |s| {
let _ = output_tx.send(s.0);
if s.retrieve(&last_tag).is_some()
{
return (s, BlockResult::Exit);
}
(s, BlockResult::Ok)
});
let null_sink = NullSink::new(passband);
let graph = flowgraph![
bit_source, phase_map, repeater, oscillator, multiplier, tx_map, null_sink
];
graph.run();
let spec = hound::WavSpec {
channels: 1,
sample_rate: SAMPLE_RATE as u32,
bits_per_sample: 16,
sample_format: hound::SampleFormat::Int,
};
let mut writer = hound::WavWriter::create("mod.wav", spec).unwrap();
for sample in output_rx.iter()
{
let amplitude = i16::MAX as f32;
writer
.write_sample(((sample.re + random::<f32>() * 0.2) * amplitude) as i16)
.unwrap();
}
writer.finalize().unwrap();
}