kai/pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing merge

Browse Source
This commit is contained in:
Ryan Summers 2021-06-09 12:52:13 +02:00
parent e01d430e8e
commit b292cf45ab
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/dual-iir.rs
View File

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

2
src/net/data_stream.rs
View File

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

2
src/net/mod.rs
View File

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