Fixing merge

src/bin/dual-iir.rs

@@ -152,6 +152,7 @@ const APP: () = {
             ref settings,
             ref mut iir_state,
             ref mut telemetry,
+            ref mut generator,
         } = c.resources;
 
         let digital_inputs = [
@@ -192,7 +193,7 @@ const APP: () = {
             }
 
             // Stream the data.
-            c.resources.generator.send(&adc_samples, &dac_samples);
+            generator.send(&adc_samples, &dac_samples);
 
             // Update telemetry measurements.
             telemetry.adcs =

src/net/data_stream.rs

@@ -85,7 +85,7 @@ impl BlockGenerator {
 
     pub fn send(
         &mut self,
-        adcs: &[&[u16; SAMPLE_BUFFER_SIZE]; 2],
+        adcs: &[&mut [u16; SAMPLE_BUFFER_SIZE]; 2],
         dacs: &[&mut [u16; SAMPLE_BUFFER_SIZE]; 2],
     ) {
         let block = AdcDacData {

src/net/mod.rs

@@ -22,11 +22,13 @@ use miniconf_client::MiniconfClient;
 use network_processor::NetworkProcessor;
 use shared::NetworkManager;
 use telemetry::TelemetryClient;
+use data_stream::{DataStream, BlockGenerator};
 
 use core::fmt::Write;
 use heapless::String;
 use miniconf::Miniconf;
 use serde::Serialize;
+use smoltcp_nal::embedded_nal::SocketAddr;
 
 pub type NetworkReference = shared::NetworkStackProxy<'static, NetworkStack>;