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

Renaming AdcSample -> AdcCode

master
Ryan Summers 2021-05-07 14:11:25 +02:00
parent 923790b0b9
commit 60b1b112b1
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ use serde::Deserialize;
use dsp::iir; use dsp::iir;
use hardware::{ use hardware::{
Adc0Input, Adc1Input, AdcSample, AfeGain, Dac0Output, Dac1Output, DacCode, Adc0Input, Adc1Input, AdcCode, AfeGain, Dac0Output, Dac1Output, DacCode,
DigitalInput0, DigitalInput1, InputPin, SystemTimer, AFE0, AFE1, DigitalInput0, DigitalInput1, InputPin, SystemTimer, AFE0, AFE1,
}; };
@ -160,7 +160,7 @@ const APP: () = {
// Update telemetry measurements. // Update telemetry measurements.
c.resources.telemetry.adcs = c.resources.telemetry.adcs =
[AdcSample(adc_samples[0][0]), AdcSample(adc_samples[1][0])]; [AdcCode(adc_samples[0][0]), AdcCode(adc_samples[1][0])];
c.resources.telemetry.dacs = c.resources.telemetry.dacs =
[DacCode(dac_samples[0][0]), DacCode(dac_samples[1][0])]; [DacCode(dac_samples[0][0]), DacCode(dac_samples[1][0])];

4
src/bin/lockin.rs
View File

@ -12,7 +12,7 @@ use dsp::{Accu, Complex, ComplexExt, Lockin, RPLL};
use stabilizer::net; use stabilizer::net;
use stabilizer::hardware::{ use stabilizer::hardware::{
design_parameters, setup, Adc0Input, Adc1Input, AdcSample, AfeGain, design_parameters, setup, Adc0Input, Adc1Input, AdcCode, AfeGain,
Dac0Output, Dac1Output, DacCode, DigitalInput0, DigitalInput1, Dac0Output, Dac1Output, DacCode, DigitalInput0, DigitalInput1,
InputStamper, SystemTimer, AFE0, AFE1, InputStamper, SystemTimer, AFE0, AFE1,
}; };
@ -240,7 +240,7 @@ const APP: () = {
// Update telemetry measurements. // Update telemetry measurements.
c.resources.telemetry.adcs = c.resources.telemetry.adcs =
[AdcSample(adc_samples[0][0]), AdcSample(adc_samples[1][0])]; [AdcCode(adc_samples[0][0]), AdcCode(adc_samples[1][0])];
c.resources.telemetry.dacs = c.resources.telemetry.dacs =
[DacCode(dac_samples[0][0]), DacCode(dac_samples[1][0])]; [DacCode(dac_samples[0][0]), DacCode(dac_samples[1][0])];

4
src/hardware/adc.rs
View File

@ -86,9 +86,9 @@ use hal::dma::{
/// A type representing an ADC sample. /// A type representing an ADC sample.
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
pub struct AdcSample(pub u16); pub struct AdcCode(pub u16);
impl Into<f32> for AdcSample { impl Into<f32> for AdcCode {
/// Convert raw ADC codes to/from voltage levels. /// Convert raw ADC codes to/from voltage levels.
/// ///
/// # Note /// # Note

2
src/hardware/mod.rs
View File

@ -19,7 +19,7 @@ pub mod pounder;
mod system_timer; mod system_timer;
mod timers; mod timers;
pub use adc::{Adc0Input, Adc1Input, AdcSample}; pub use adc::{Adc0Input, Adc1Input, AdcCode};
pub use afe::Gain as AfeGain; pub use afe::Gain as AfeGain;
pub use cycle_counter::CycleCounter; pub use cycle_counter::CycleCounter;
pub use dac::{Dac0Output, Dac1Output, DacCode}; pub use dac::{Dac0Output, Dac1Output, DacCode};

6
src/net/telemetry.rs
View File

@ -16,7 +16,7 @@ use serde::Serialize;
use super::NetworkReference; use super::NetworkReference;
use crate::hardware::{ use crate::hardware::{
design_parameters::MQTT_BROKER, AdcSample, AfeGain, DacCode, design_parameters::MQTT_BROKER, AdcCode, AfeGain, DacCode,
}; };
/// The telemetry client for reporting telemetry data over MQTT. /// The telemetry client for reporting telemetry data over MQTT.
@ -35,7 +35,7 @@ pub struct TelemetryClient<T: Serialize> {
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
pub struct TelemetryBuffer { pub struct TelemetryBuffer {
/// The latest input sample on ADC0/ADC1. /// The latest input sample on ADC0/ADC1.
pub adcs: [AdcSample; 2], pub adcs: [AdcCode; 2],
/// The latest output code on DAC0/DAC1. /// The latest output code on DAC0/DAC1.
pub dacs: [DacCode; 2], pub dacs: [DacCode; 2],
/// The latest digital input states during processing. /// The latest digital input states during processing.
@ -57,7 +57,7 @@ pub struct Telemetry {
impl Default for TelemetryBuffer { impl Default for TelemetryBuffer {
fn default() -> Self { fn default() -> Self {
Self { Self {
adcs: [AdcSample(0), AdcSample(0)], adcs: [AdcCode(0), AdcCode(0)],
dacs: [DacCode(0), DacCode(0)], dacs: [DacCode(0), DacCode(0)],
digital_inputs: [false, false], digital_inputs: [false, false],
} }