Compare commits
2 Commits
fcb5cf1d4e
...
d8ec083dbc
| Author | SHA1 | Date |
|---|---|---|
 atse
|
d8ec083dbc | |
|
atse
|
1962135e79 |
|
|
@ -1,12 +1,9 @@
|
||||||
use stm32f4xx_hal::{
|
|
||||||
hal::{
|
|
||||||
blocking::spi::Transfer,
|
|
||||||
digital::v2::OutputPin,
|
|
||||||
},
|
|
||||||
time::MegaHertz,
|
|
||||||
spi,
|
|
||||||
};
|
|
||||||
use crate::timer::sleep;
|
use crate::timer::sleep;
|
||||||
|
use stm32f4xx_hal::{
|
||||||
|
hal::{blocking::spi::Transfer, digital::v2::OutputPin},
|
||||||
|
spi,
|
||||||
|
time::MegaHertz,
|
||||||
|
};
|
||||||
|
|
||||||
/// SPI Mode 1
|
/// SPI Mode 1
|
||||||
pub const SPI_MODE: spi::Mode = spi::Mode {
|
pub const SPI_MODE: spi::Mode = spi::Mode {
|
||||||
|
|
@ -28,10 +25,7 @@ impl<SPI: Transfer<u8>, S: OutputPin> Dac<SPI, S> {
|
||||||
pub fn new(spi: SPI, mut sync: S) -> Self {
|
pub fn new(spi: SPI, mut sync: S) -> Self {
|
||||||
let _ = sync.set_low();
|
let _ = sync.set_low();
|
||||||
|
|
||||||
Dac {
|
Dac { spi, sync }
|
||||||
spi,
|
|
||||||
sync,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn write(&mut self, buf: &mut [u8]) -> Result<(), SPI::Error> {
|
fn write(&mut self, buf: &mut [u8]) -> Result<(), SPI::Error> {
|
||||||
|
|
@ -47,11 +41,7 @@ impl<SPI: Transfer<u8>, S: OutputPin> Dac<SPI, S> {
|
||||||
|
|
||||||
pub fn set(&mut self, value: u32) -> Result<u32, SPI::Error> {
|
pub fn set(&mut self, value: u32) -> Result<u32, SPI::Error> {
|
||||||
let value = value.min(MAX_VALUE);
|
let value = value.min(MAX_VALUE);
|
||||||
let mut buf = [
|
let mut buf = [(value >> 14) as u8, (value >> 6) as u8, (value << 2) as u8];
|
||||||
(value >> 14) as u8,
|
|
||||||
(value >> 6) as u8,
|
|
||||||
(value << 2) as u8,
|
|
||||||
];
|
|
||||||
self.write(&mut buf)?;
|
self.write(&mut buf)?;
|
||||||
Ok(value)
|
Ok(value)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,12 @@
|
||||||
|
use super::{
|
||||||
|
checksum::{Checksum, ChecksumMode},
|
||||||
|
regs::{self, Register, RegisterData},
|
||||||
|
DigitalFilterOrder, Input, Mode, PostFilter, RefSource,
|
||||||
|
};
|
||||||
use core::fmt;
|
use core::fmt;
|
||||||
use log::{info, warn};
|
use log::{info, warn};
|
||||||
use stm32f4xx_hal::hal::{
|
use stm32f4xx_hal::hal::{blocking::spi::Transfer, digital::v2::OutputPin};
|
||||||
blocking::spi::Transfer,
|
use uom::si::{electric_potential::volt, f64::ElectricPotential};
|
||||||
digital::v2::OutputPin,
|
|
||||||
};
|
|
||||||
use uom::si::{
|
|
||||||
f64::ElectricPotential,
|
|
||||||
electric_potential::volt,
|
|
||||||
};
|
|
||||||
use super::{
|
|
||||||
regs::{self, Register, RegisterData},
|
|
||||||
checksum::{ChecksumMode, Checksum},
|
|
||||||
Mode, Input, RefSource, PostFilter, DigitalFilterOrder,
|
|
||||||
};
|
|
||||||
|
|
||||||
/// AD7172-2 implementation
|
/// AD7172-2 implementation
|
||||||
///
|
///
|
||||||
|
|
@ -27,7 +21,8 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
pub fn new(spi: SPI, mut nss: NSS) -> Result<Self, SPI::Error> {
|
pub fn new(spi: SPI, mut nss: NSS) -> Result<Self, SPI::Error> {
|
||||||
let _ = nss.set_high();
|
let _ = nss.set_high();
|
||||||
let mut adc = Adc {
|
let mut adc = Adc {
|
||||||
spi, nss,
|
spi,
|
||||||
|
nss,
|
||||||
checksum_mode: ChecksumMode::Off,
|
checksum_mode: ChecksumMode::Off,
|
||||||
};
|
};
|
||||||
adc.reset()?;
|
adc.reset()?;
|
||||||
|
|
@ -55,8 +50,7 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
|
|
||||||
/// `0x00DX` for AD7172-2
|
/// `0x00DX` for AD7172-2
|
||||||
pub fn identify(&mut self) -> Result<u16, SPI::Error> {
|
pub fn identify(&mut self) -> Result<u16, SPI::Error> {
|
||||||
self.read_reg(®s::Id)
|
self.read_reg(®s::Id).map(|id| id.id())
|
||||||
.map(|id| id.id())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_checksum_mode(&mut self, mode: ChecksumMode) -> Result<(), SPI::Error> {
|
pub fn set_checksum_mode(&mut self, mode: ChecksumMode) -> Result<(), SPI::Error> {
|
||||||
|
|
@ -76,7 +70,10 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn setup_channel(
|
pub fn setup_channel(
|
||||||
&mut self, index: u8, in_pos: Input, in_neg: Input
|
&mut self,
|
||||||
|
index: u8,
|
||||||
|
in_pos: Input,
|
||||||
|
in_neg: Input,
|
||||||
) -> Result<(), SPI::Error> {
|
) -> Result<(), SPI::Error> {
|
||||||
self.update_reg(®s::SetupCon { index }, |data| {
|
self.update_reg(®s::SetupCon { index }, |data| {
|
||||||
data.set_bipolar(false);
|
data.set_bipolar(false);
|
||||||
|
|
@ -106,7 +103,11 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
let offset = self.read_reg(®s::Offset { index })?.offset();
|
let offset = self.read_reg(®s::Offset { index })?.offset();
|
||||||
let gain = self.read_reg(®s::Gain { index })?.gain();
|
let gain = self.read_reg(®s::Gain { index })?.gain();
|
||||||
let bipolar = self.read_reg(®s::SetupCon { index })?.bipolar();
|
let bipolar = self.read_reg(®s::SetupCon { index })?.bipolar();
|
||||||
Ok(ChannelCalibration { offset, gain, bipolar })
|
Ok(ChannelCalibration {
|
||||||
|
offset,
|
||||||
|
gain,
|
||||||
|
bipolar,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn start_continuous_conversion(&mut self) -> Result<(), SPI::Error> {
|
pub fn start_continuous_conversion(&mut self) -> Result<(), SPI::Error> {
|
||||||
|
|
@ -119,8 +120,7 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_postfilter(&mut self, index: u8) -> Result<Option<PostFilter>, SPI::Error> {
|
pub fn get_postfilter(&mut self, index: u8) -> Result<Option<PostFilter>, SPI::Error> {
|
||||||
self.read_reg(®s::FiltCon { index })
|
self.read_reg(®s::FiltCon { index }).map(|data| {
|
||||||
.map(|data| {
|
|
||||||
if data.enh_filt_en() {
|
if data.enh_filt_en() {
|
||||||
Some(data.enh_filt())
|
Some(data.enh_filt())
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -129,22 +129,23 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_postfilter(&mut self, index: u8, filter: Option<PostFilter>) -> Result<(), SPI::Error> {
|
pub fn set_postfilter(
|
||||||
self.update_reg(®s::FiltCon { index }, |data| {
|
&mut self,
|
||||||
match filter {
|
index: u8,
|
||||||
|
filter: Option<PostFilter>,
|
||||||
|
) -> Result<(), SPI::Error> {
|
||||||
|
self.update_reg(®s::FiltCon { index }, |data| match filter {
|
||||||
None => data.set_enh_filt_en(false),
|
None => data.set_enh_filt_en(false),
|
||||||
Some(filter) => {
|
Some(filter) => {
|
||||||
data.set_enh_filt_en(true);
|
data.set_enh_filt_en(true);
|
||||||
data.set_enh_filt(filter);
|
data.set_enh_filt(filter);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns the channel the data is from
|
/// Returns the channel the data is from
|
||||||
pub fn data_ready(&mut self) -> Result<Option<u8>, SPI::Error> {
|
pub fn data_ready(&mut self) -> Result<Option<u8>, SPI::Error> {
|
||||||
self.read_reg(®s::Status)
|
self.read_reg(®s::Status).map(|status| {
|
||||||
.map(|status| {
|
|
||||||
if status.ready() {
|
if status.ready() {
|
||||||
Some(status.channel())
|
Some(status.channel())
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -155,8 +156,7 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
|
|
||||||
/// Get data
|
/// Get data
|
||||||
pub fn read_data(&mut self) -> Result<u32, SPI::Error> {
|
pub fn read_data(&mut self) -> Result<u32, SPI::Error> {
|
||||||
self.read_reg(®s::Data)
|
self.read_reg(®s::Data).map(|data| data.data())
|
||||||
.map(|data| data.data())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_reg<R: regs::Register>(&mut self, reg: &R) -> Result<R::Data, SPI::Error> {
|
fn read_reg<R: regs::Register>(&mut self, reg: &R) -> Result<R::Data, SPI::Error> {
|
||||||
|
|
@ -175,12 +175,21 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// Retry
|
// Retry
|
||||||
warn!("read_reg {:02X}: checksum error: {:?}!={:?}, retrying", reg.address(), checksum_expected, checksum_in);
|
warn!(
|
||||||
|
"read_reg {:02X}: checksum error: {:?}!={:?}, retrying",
|
||||||
|
reg.address(),
|
||||||
|
checksum_expected,
|
||||||
|
checksum_in
|
||||||
|
);
|
||||||
}
|
}
|
||||||
Ok(reg_data)
|
Ok(reg_data)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn write_reg<R: regs::Register>(&mut self, reg: &R, reg_data: &mut R::Data) -> Result<(), SPI::Error> {
|
fn write_reg<R: regs::Register>(
|
||||||
|
&mut self,
|
||||||
|
reg: &R,
|
||||||
|
reg_data: &mut R::Data,
|
||||||
|
) -> Result<(), SPI::Error> {
|
||||||
loop {
|
loop {
|
||||||
let address = reg.address();
|
let address = reg.address();
|
||||||
let mut checksum = Checksum::new(match self.checksum_mode {
|
let mut checksum = Checksum::new(match self.checksum_mode {
|
||||||
|
|
@ -190,7 +199,7 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
ChecksumMode::Crc => ChecksumMode::Crc,
|
ChecksumMode::Crc => ChecksumMode::Crc,
|
||||||
});
|
});
|
||||||
checksum.feed(&[address]);
|
checksum.feed(&[address]);
|
||||||
checksum.feed(®_data);
|
checksum.feed(reg_data);
|
||||||
let checksum_out = checksum.result();
|
let checksum_out = checksum.result();
|
||||||
|
|
||||||
let mut data = reg_data.clone();
|
let mut data = reg_data.clone();
|
||||||
|
|
@ -201,7 +210,10 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
if *readback_data == **reg_data {
|
if *readback_data == **reg_data {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
warn!("write_reg {:02X}: readback error, {:?}!={:?}, retrying", address, &*readback_data, &**reg_data);
|
warn!(
|
||||||
|
"write_reg {:02X}: readback error, {:?}!={:?}, retrying",
|
||||||
|
address, &*readback_data, &**reg_data
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -225,7 +237,12 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn transfer<'w>(&mut self, addr: u8, reg_data: &'w mut [u8], checksum: Option<u8>) -> Result<Option<u8>, SPI::Error> {
|
fn transfer(
|
||||||
|
&mut self,
|
||||||
|
addr: u8,
|
||||||
|
reg_data: &mut [u8],
|
||||||
|
checksum: Option<u8>,
|
||||||
|
) -> Result<Option<u8>, SPI::Error> {
|
||||||
let mut addr_buf = [addr];
|
let mut addr_buf = [addr];
|
||||||
|
|
||||||
let _ = self.nss.set_low();
|
let _ = self.nss.set_low();
|
||||||
|
|
@ -234,8 +251,7 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
Err(e) => Err(e),
|
Err(e) => Err(e),
|
||||||
};
|
};
|
||||||
let result = match (result, checksum) {
|
let result = match (result, checksum) {
|
||||||
(Ok(_), None) =>
|
(Ok(_), None) => Ok(None),
|
||||||
Ok(None),
|
|
||||||
(Ok(_), Some(checksum_out)) => {
|
(Ok(_), Some(checksum_out)) => {
|
||||||
let mut checksum_buf = [checksum_out; 1];
|
let mut checksum_buf = [checksum_out; 1];
|
||||||
match self.spi.transfer(&mut checksum_buf) {
|
match self.spi.transfer(&mut checksum_buf) {
|
||||||
|
|
@ -243,8 +259,7 @@ impl<SPI: Transfer<u8, Error = E>, NSS: OutputPin, E: fmt::Debug> Adc<SPI, NSS>
|
||||||
Err(e) => Err(e),
|
Err(e) => Err(e),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
(Err(e), _) =>
|
(Err(e), _) => Err(e),
|
||||||
Err(e),
|
|
||||||
};
|
};
|
||||||
let _ = self.nss.set_high();
|
let _ = self.nss.set_high();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,13 +29,13 @@ impl Checksum {
|
||||||
|
|
||||||
fn feed_byte(&mut self, input: u8) {
|
fn feed_byte(&mut self, input: u8) {
|
||||||
match self.mode {
|
match self.mode {
|
||||||
ChecksumMode::Off => {},
|
ChecksumMode::Off => {}
|
||||||
ChecksumMode::Xor => self.state ^= input,
|
ChecksumMode::Xor => self.state ^= input,
|
||||||
ChecksumMode::Crc => {
|
ChecksumMode::Crc => {
|
||||||
for i in 0..8 {
|
for i in 0..8 {
|
||||||
let input_mask = 0x80 >> i;
|
let input_mask = 0x80 >> i;
|
||||||
self.state = (self.state << 1) ^
|
self.state = (self.state << 1)
|
||||||
if ((self.state & 0x80) != 0) != ((input & input_mask) != 0) {
|
^ if ((self.state & 0x80) != 0) != ((input & input_mask) != 0) {
|
||||||
0x07 /* x8 + x2 + x + 1 */
|
0x07 /* x8 + x2 + x + 1 */
|
||||||
} else {
|
} else {
|
||||||
0
|
0
|
||||||
|
|
@ -54,7 +54,7 @@ impl Checksum {
|
||||||
pub fn result(&self) -> Option<u8> {
|
pub fn result(&self) -> Option<u8> {
|
||||||
match self.mode {
|
match self.mode {
|
||||||
ChecksumMode::Off => None,
|
ChecksumMode::Off => None,
|
||||||
_ => Some(self.state)
|
_ => Some(self.state),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
use core::fmt;
|
use core::fmt;
|
||||||
use num_traits::float::Float;
|
use num_traits::float::Float;
|
||||||
use serde::{Serialize, Deserialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use stm32f4xx_hal::{
|
use stm32f4xx_hal::{spi, time::MegaHertz};
|
||||||
time::MegaHertz,
|
|
||||||
spi,
|
|
||||||
};
|
|
||||||
|
|
||||||
pub mod regs;
|
|
||||||
mod checksum;
|
mod checksum;
|
||||||
|
pub mod regs;
|
||||||
pub use checksum::ChecksumMode;
|
pub use checksum::ChecksumMode;
|
||||||
mod adc;
|
mod adc;
|
||||||
pub use adc::*;
|
pub use adc::*;
|
||||||
|
|
@ -22,7 +19,6 @@ pub const SPI_CLOCK: MegaHertz = MegaHertz(2);
|
||||||
|
|
||||||
pub const MAX_VALUE: u32 = 0xFF_FFFF;
|
pub const MAX_VALUE: u32 = 0xFF_FFFF;
|
||||||
|
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug)]
|
#[derive(Clone, Copy, Debug)]
|
||||||
#[repr(u8)]
|
#[repr(u8)]
|
||||||
pub enum Mode {
|
pub enum Mode {
|
||||||
|
|
@ -105,7 +101,8 @@ impl fmt::Display for Input {
|
||||||
RefPos => "ref+",
|
RefPos => "ref+",
|
||||||
RefNeg => "ref-",
|
RefNeg => "ref-",
|
||||||
_ => "<INVALID>",
|
_ => "<INVALID>",
|
||||||
}.fmt(fmt)
|
}
|
||||||
|
.fmt(fmt)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -141,7 +138,8 @@ impl fmt::Display for RefSource {
|
||||||
Internal => "internal",
|
Internal => "internal",
|
||||||
Avdd1MinusAvss => "avdd1-avss",
|
Avdd1MinusAvss => "avdd1-avss",
|
||||||
_ => "<INVALID>",
|
_ => "<INVALID>",
|
||||||
}.fmt(fmt)
|
}
|
||||||
|
.fmt(fmt)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use core::ops::{Deref, DerefMut};
|
|
||||||
use byteorder::{BigEndian, ByteOrder};
|
|
||||||
use bit_field::BitField;
|
use bit_field::BitField;
|
||||||
|
use byteorder::{BigEndian, ByteOrder};
|
||||||
|
use core::ops::{Deref, DerefMut};
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
|
@ -9,7 +9,7 @@ pub trait Register {
|
||||||
fn address(&self) -> u8;
|
fn address(&self) -> u8;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait RegisterData: Clone + Deref<Target=[u8]> + DerefMut {
|
pub trait RegisterData: Clone + Deref<Target = [u8]> + DerefMut {
|
||||||
fn empty() -> Self;
|
fn empty() -> Self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -49,7 +49,9 @@ macro_rules! def_reg {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
($Reg: ident, u8, $reg: ident, $addr: expr, $size: expr) => {
|
($Reg: ident, u8, $reg: ident, $addr: expr, $size: expr) => {
|
||||||
pub struct $Reg { pub index: u8, }
|
pub struct $Reg {
|
||||||
|
pub index: u8,
|
||||||
|
}
|
||||||
impl Register for $Reg {
|
impl Register for $Reg {
|
||||||
type Data = $reg::Data;
|
type Data = $reg::Data;
|
||||||
fn address(&self) -> u8 {
|
fn address(&self) -> u8 {
|
||||||
|
|
@ -76,7 +78,7 @@ macro_rules! def_reg {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
macro_rules! reg_bit {
|
macro_rules! reg_bit {
|
||||||
|
|
@ -146,7 +148,7 @@ def_reg!(Status, status, 0x00, 1);
|
||||||
impl status::Data {
|
impl status::Data {
|
||||||
/// Is there new data to read?
|
/// Is there new data to read?
|
||||||
pub fn ready(&self) -> bool {
|
pub fn ready(&self) -> bool {
|
||||||
! self.not_ready()
|
!self.not_ready()
|
||||||
}
|
}
|
||||||
|
|
||||||
reg_bit!(not_ready, 0, 7, "No data ready indicator");
|
reg_bit!(not_ready, 0, 7, "No data ready indicator");
|
||||||
|
|
@ -159,9 +161,21 @@ impl status::Data {
|
||||||
def_reg!(AdcMode, adc_mode, 0x01, 2);
|
def_reg!(AdcMode, adc_mode, 0x01, 2);
|
||||||
impl adc_mode::Data {
|
impl adc_mode::Data {
|
||||||
reg_bits!(delay, set_delay, 0, 0..=2, "Delay after channel switch");
|
reg_bits!(delay, set_delay, 0, 0..=2, "Delay after channel switch");
|
||||||
reg_bit!(sing_cyc, set_sing_cyc, 0, 5, "Can only used with single channel");
|
reg_bit!(
|
||||||
|
sing_cyc,
|
||||||
|
set_sing_cyc,
|
||||||
|
0,
|
||||||
|
5,
|
||||||
|
"Can only used with single channel"
|
||||||
|
);
|
||||||
reg_bit!(hide_delay, set_hide_delay, 0, 6, "Hide delay");
|
reg_bit!(hide_delay, set_hide_delay, 0, 6, "Hide delay");
|
||||||
reg_bit!(ref_en, set_ref_en, 0, 7, "Enable internal reference, output buffered 2.5 V to REFOUT");
|
reg_bit!(
|
||||||
|
ref_en,
|
||||||
|
set_ref_en,
|
||||||
|
0,
|
||||||
|
7,
|
||||||
|
"Enable internal reference, output buffered 2.5 V to REFOUT"
|
||||||
|
);
|
||||||
reg_bits!(clockset, set_clocksel, 1, 2..=3, "Clock source");
|
reg_bits!(clockset, set_clocksel, 1, 2..=3, "Clock source");
|
||||||
reg_bits!(mode, set_mode, 1, 4..=6, Mode, "Operating mode");
|
reg_bits!(mode, set_mode, 1, 4..=6, Mode, "Operating mode");
|
||||||
}
|
}
|
||||||
|
|
@ -174,15 +188,19 @@ impl if_mode::Data {
|
||||||
def_reg!(Data, data, 0x04, 3);
|
def_reg!(Data, data, 0x04, 3);
|
||||||
impl data::Data {
|
impl data::Data {
|
||||||
pub fn data(&self) -> u32 {
|
pub fn data(&self) -> u32 {
|
||||||
(u32::from(self.0[0]) << 16) |
|
(u32::from(self.0[0]) << 16) | (u32::from(self.0[1]) << 8) | u32::from(self.0[2])
|
||||||
(u32::from(self.0[1]) << 8) |
|
|
||||||
u32::from(self.0[2])
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def_reg!(GpioCon, gpio_con, 0x06, 2);
|
def_reg!(GpioCon, gpio_con, 0x06, 2);
|
||||||
impl gpio_con::Data {
|
impl gpio_con::Data {
|
||||||
reg_bit!(sync_en, set_sync_en, 0, 3, "Enables the SYNC/ERROR pin as a sync input");
|
reg_bit!(
|
||||||
|
sync_en,
|
||||||
|
set_sync_en,
|
||||||
|
0,
|
||||||
|
3,
|
||||||
|
"Enables the SYNC/ERROR pin as a sync input"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
def_reg!(Id, id, 0x07, 2);
|
def_reg!(Id, id, 0x07, 2);
|
||||||
|
|
@ -200,8 +218,7 @@ impl channel::Data {
|
||||||
/// Which input is connected to positive input of this channel
|
/// Which input is connected to positive input of this channel
|
||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
pub fn a_in_pos(&self) -> Input {
|
pub fn a_in_pos(&self) -> Input {
|
||||||
((self.0[0].get_bits(0..=1) << 3) |
|
((self.0[0].get_bits(0..=1) << 3) | self.0[1].get_bits(5..=7)).into()
|
||||||
self.0[1].get_bits(5..=7)).into()
|
|
||||||
}
|
}
|
||||||
/// Set which input is connected to positive input of this channel
|
/// Set which input is connected to positive input of this channel
|
||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
|
|
@ -210,27 +227,66 @@ impl channel::Data {
|
||||||
self.0[0].set_bits(0..=1, value >> 3);
|
self.0[0].set_bits(0..=1, value >> 3);
|
||||||
self.0[1].set_bits(5..=7, value & 0x7);
|
self.0[1].set_bits(5..=7, value & 0x7);
|
||||||
}
|
}
|
||||||
reg_bits!(a_in_neg, set_a_in_neg, 1, 0..=4, Input,
|
reg_bits!(
|
||||||
"Which input is connected to negative input of this channel");
|
a_in_neg,
|
||||||
|
set_a_in_neg,
|
||||||
|
1,
|
||||||
|
0..=4,
|
||||||
|
Input,
|
||||||
|
"Which input is connected to negative input of this channel"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
def_reg!(SetupCon, u8, setup_con, 0x20, 2);
|
def_reg!(SetupCon, u8, setup_con, 0x20, 2);
|
||||||
impl setup_con::Data {
|
impl setup_con::Data {
|
||||||
reg_bit!(bipolar, set_bipolar, 0, 4, "Unipolar (`false`) or bipolar (`true`) coded output");
|
reg_bit!(
|
||||||
|
bipolar,
|
||||||
|
set_bipolar,
|
||||||
|
0,
|
||||||
|
4,
|
||||||
|
"Unipolar (`false`) or bipolar (`true`) coded output"
|
||||||
|
);
|
||||||
reg_bit!(refbuf_pos, set_refbuf_pos, 0, 3, "Enable REF+ input buffer");
|
reg_bit!(refbuf_pos, set_refbuf_pos, 0, 3, "Enable REF+ input buffer");
|
||||||
reg_bit!(refbuf_neg, set_refbuf_neg, 0, 2, "Enable REF- input buffer");
|
reg_bit!(refbuf_neg, set_refbuf_neg, 0, 2, "Enable REF- input buffer");
|
||||||
reg_bit!(ainbuf_pos, set_ainbuf_pos, 0, 1, "Enable AIN+ input buffer");
|
reg_bit!(ainbuf_pos, set_ainbuf_pos, 0, 1, "Enable AIN+ input buffer");
|
||||||
reg_bit!(ainbuf_neg, set_ainbuf_neg, 0, 0, "Enable AIN- input buffer");
|
reg_bit!(ainbuf_neg, set_ainbuf_neg, 0, 0, "Enable AIN- input buffer");
|
||||||
reg_bit!(burnout_en, 1, 7, "enables a 10 µA current source on the positive analog input selected and a 10 µA current sink on the negative analog input selected");
|
reg_bit!(burnout_en, 1, 7, "enables a 10 µA current source on the positive analog input selected and a 10 µA current sink on the negative analog input selected");
|
||||||
reg_bits!(ref_sel, set_ref_sel, 1, 4..=5, RefSource, "Select reference source for conversion");
|
reg_bits!(
|
||||||
|
ref_sel,
|
||||||
|
set_ref_sel,
|
||||||
|
1,
|
||||||
|
4..=5,
|
||||||
|
RefSource,
|
||||||
|
"Select reference source for conversion"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
def_reg!(FiltCon, u8, filt_con, 0x28, 2);
|
def_reg!(FiltCon, u8, filt_con, 0x28, 2);
|
||||||
impl filt_con::Data {
|
impl filt_con::Data {
|
||||||
reg_bit!(sinc3_map, 0, 7, "If set, mapping of filter register changes to directly program the decimation rate of the sinc3 filter");
|
reg_bit!(sinc3_map, 0, 7, "If set, mapping of filter register changes to directly program the decimation rate of the sinc3 filter");
|
||||||
reg_bit!(enh_filt_en, set_enh_filt_en, 0, 3, "Enable postfilters for enhanced 50Hz and 60Hz rejection");
|
reg_bit!(
|
||||||
reg_bits!(enh_filt, set_enh_filt, 0, 0..=2, PostFilter, "Select postfilters for enhanced 50Hz and 60Hz rejection");
|
enh_filt_en,
|
||||||
reg_bits!(order, set_order, 1, 5..=6, DigitalFilterOrder, "order of the digital filter that processes the modulator data");
|
set_enh_filt_en,
|
||||||
|
0,
|
||||||
|
3,
|
||||||
|
"Enable postfilters for enhanced 50Hz and 60Hz rejection"
|
||||||
|
);
|
||||||
|
reg_bits!(
|
||||||
|
enh_filt,
|
||||||
|
set_enh_filt,
|
||||||
|
0,
|
||||||
|
0..=2,
|
||||||
|
PostFilter,
|
||||||
|
"Select postfilters for enhanced 50Hz and 60Hz rejection"
|
||||||
|
);
|
||||||
|
reg_bits!(
|
||||||
|
order,
|
||||||
|
set_order,
|
||||||
|
1,
|
||||||
|
5..=6,
|
||||||
|
DigitalFilterOrder,
|
||||||
|
"order of the digital filter that processes the modulator data"
|
||||||
|
);
|
||||||
reg_bits!(odr, set_odr, 1, 0..=4, "Output data rate");
|
reg_bits!(odr, set_odr, 1, 0..=4, "Output data rate");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -238,9 +294,7 @@ def_reg!(Offset, u8, offset, 0x30, 3);
|
||||||
impl offset::Data {
|
impl offset::Data {
|
||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
pub fn offset(&self) -> u32 {
|
pub fn offset(&self) -> u32 {
|
||||||
(u32::from(self.0[0]) << 16) |
|
(u32::from(self.0[0]) << 16) | (u32::from(self.0[1]) << 8) | u32::from(self.0[2])
|
||||||
(u32::from(self.0[1]) << 8) |
|
|
||||||
u32::from(self.0[2])
|
|
||||||
}
|
}
|
||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
pub fn set_offset(&mut self, value: u32) {
|
pub fn set_offset(&mut self, value: u32) {
|
||||||
|
|
@ -254,9 +308,7 @@ def_reg!(Gain, u8, gain, 0x38, 3);
|
||||||
impl gain::Data {
|
impl gain::Data {
|
||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
pub fn gain(&self) -> u32 {
|
pub fn gain(&self) -> u32 {
|
||||||
(u32::from(self.0[0]) << 16) |
|
(u32::from(self.0[0]) << 16) | (u32::from(self.0[1]) << 8) | u32::from(self.0[2])
|
||||||
(u32::from(self.0[1]) << 8) |
|
|
||||||
u32::from(self.0[2])
|
|
||||||
}
|
}
|
||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
pub fn set_gain(&mut self, value: u32) {
|
pub fn set_gain(&mut self, value: u32) {
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,10 @@
|
||||||
use stm32f4xx_hal::hal::digital::v2::OutputPin;
|
|
||||||
use uom::si::{
|
|
||||||
f64::ElectricPotential,
|
|
||||||
electric_potential::volt,
|
|
||||||
};
|
|
||||||
use crate::{
|
use crate::{
|
||||||
ad5680,
|
ad5680, ad7172,
|
||||||
ad7172,
|
|
||||||
channel_state::ChannelState,
|
channel_state::ChannelState,
|
||||||
pins::{ChannelPins, ChannelPinSet},
|
pins::{ChannelPinSet, ChannelPins},
|
||||||
};
|
};
|
||||||
|
use stm32f4xx_hal::hal::digital::v2::OutputPin;
|
||||||
|
use uom::si::{electric_potential::volt, f64::ElectricPotential};
|
||||||
|
|
||||||
/// Marker type for the first channel
|
/// Marker type for the first channel
|
||||||
pub struct Channel0;
|
pub struct Channel0;
|
||||||
|
|
@ -40,7 +36,8 @@ impl<C: ChannelPins> Channel<C> {
|
||||||
|
|
||||||
Channel {
|
Channel {
|
||||||
state,
|
state,
|
||||||
dac, vref_meas,
|
dac,
|
||||||
|
vref_meas,
|
||||||
shdn: pins.shdn,
|
shdn: pins.shdn,
|
||||||
vref_pin: pins.vref_pin,
|
vref_pin: pins.vref_pin,
|
||||||
itec_pin: pins.itec_pin,
|
itec_pin: pins.itec_pin,
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,19 @@
|
||||||
use smoltcp::time::{Duration, Instant};
|
|
||||||
use uom::si::{
|
|
||||||
f64::{
|
|
||||||
ElectricPotential,
|
|
||||||
ElectricCurrent,
|
|
||||||
ElectricalResistance,
|
|
||||||
ThermodynamicTemperature,
|
|
||||||
Time,
|
|
||||||
},
|
|
||||||
electric_potential::volt,
|
|
||||||
electric_current::ampere,
|
|
||||||
electrical_resistance::ohm,
|
|
||||||
thermodynamic_temperature::degree_celsius,
|
|
||||||
time::millisecond,
|
|
||||||
};
|
|
||||||
use crate::{
|
use crate::{
|
||||||
ad7172,
|
ad7172,
|
||||||
pid,
|
|
||||||
config::PwmLimits,
|
|
||||||
steinhart_hart as sh,
|
|
||||||
command_parser::{CenterPoint, Polarity},
|
command_parser::{CenterPoint, Polarity},
|
||||||
|
config::PwmLimits,
|
||||||
|
pid, steinhart_hart as sh,
|
||||||
|
};
|
||||||
|
use smoltcp::time::{Duration, Instant};
|
||||||
|
use uom::si::{
|
||||||
|
electric_current::ampere,
|
||||||
|
electric_potential::volt,
|
||||||
|
electrical_resistance::ohm,
|
||||||
|
f64::{
|
||||||
|
ElectricCurrent, ElectricPotential, ElectricalResistance, ThermodynamicTemperature, Time,
|
||||||
|
},
|
||||||
|
thermodynamic_temperature::degree_celsius,
|
||||||
|
time::millisecond,
|
||||||
};
|
};
|
||||||
|
|
||||||
const R_INNER: f64 = 2.0 * 5100.0;
|
const R_INNER: f64 = 2.0 * 5100.0;
|
||||||
|
|
@ -48,7 +43,7 @@ impl ChannelState {
|
||||||
adc_time: Instant::from_secs(0),
|
adc_time: Instant::from_secs(0),
|
||||||
// default: 10 Hz
|
// default: 10 Hz
|
||||||
adc_interval: Duration::from_millis(100),
|
adc_interval: Duration::from_millis(100),
|
||||||
center: CenterPoint::Vref,
|
center: CenterPoint::VRef,
|
||||||
dac_value: ElectricPotential::new::<volt>(0.0),
|
dac_value: ElectricPotential::new::<volt>(0.0),
|
||||||
i_set: ElectricCurrent::new::<ampere>(0.0),
|
i_set: ElectricCurrent::new::<ampere>(0.0),
|
||||||
pwm_limits: PwmLimits {
|
pwm_limits: PwmLimits {
|
||||||
|
|
@ -76,8 +71,7 @@ impl ChannelState {
|
||||||
|
|
||||||
/// Update PID state on ADC input, calculate new DAC output
|
/// Update PID state on ADC input, calculate new DAC output
|
||||||
pub fn update_pid(&mut self) -> Option<f64> {
|
pub fn update_pid(&mut self) -> Option<f64> {
|
||||||
let temperature = self.get_temperature()?
|
let temperature = self.get_temperature()?.get::<degree_celsius>();
|
||||||
.get::<degree_celsius>();
|
|
||||||
let pid_output = self.pid.update(temperature);
|
let pid_output = self.pid.update(temperature);
|
||||||
Some(pid_output)
|
Some(pid_output)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
225
src/channels.rs
225
src/channels.rs
|
|
@ -1,3 +1,13 @@
|
||||||
|
use crate::timer::sleep;
|
||||||
|
use crate::{
|
||||||
|
ad5680, ad7172,
|
||||||
|
channel::{Channel, Channel0, Channel1},
|
||||||
|
channel_state::ChannelState,
|
||||||
|
command_handler::JsonBuffer,
|
||||||
|
command_parser::{CenterPoint, Polarity, PwmPin},
|
||||||
|
pins::{self, Channel0VRef, Channel1VRef},
|
||||||
|
steinhart_hart,
|
||||||
|
};
|
||||||
use core::marker::PhantomData;
|
use core::marker::PhantomData;
|
||||||
use heapless::{consts::U2, Vec};
|
use heapless::{consts::U2, Vec};
|
||||||
use num_traits::Zero;
|
use num_traits::Zero;
|
||||||
|
|
@ -5,27 +15,16 @@ use serde::{Serialize, Serializer};
|
||||||
use smoltcp::time::Instant;
|
use smoltcp::time::Instant;
|
||||||
use stm32f4xx_hal::hal;
|
use stm32f4xx_hal::hal;
|
||||||
use uom::si::{
|
use uom::si::{
|
||||||
f64::{ElectricCurrent, ElectricPotential, ElectricalResistance, Time},
|
|
||||||
electric_potential::{millivolt, volt},
|
|
||||||
electric_current::ampere,
|
electric_current::ampere,
|
||||||
|
electric_potential::{millivolt, volt},
|
||||||
electrical_resistance::ohm,
|
electrical_resistance::ohm,
|
||||||
|
f64::{ElectricCurrent, ElectricPotential, ElectricalResistance, Time},
|
||||||
ratio::ratio,
|
ratio::ratio,
|
||||||
thermodynamic_temperature::degree_celsius,
|
thermodynamic_temperature::degree_celsius,
|
||||||
};
|
};
|
||||||
use crate::{
|
|
||||||
ad5680,
|
|
||||||
ad7172,
|
|
||||||
channel::{Channel, Channel0, Channel1},
|
|
||||||
channel_state::ChannelState,
|
|
||||||
command_parser::{CenterPoint, PwmPin, Polarity},
|
|
||||||
command_handler::JsonBuffer,
|
|
||||||
pins::{self, Channel0VRef, Channel1VRef},
|
|
||||||
steinhart_hart,
|
|
||||||
};
|
|
||||||
use crate::timer::sleep;
|
|
||||||
|
|
||||||
pub enum PinsAdcReadTarget {
|
pub enum PinsAdcReadTarget {
|
||||||
VREF,
|
VRef,
|
||||||
DacVfb,
|
DacVfb,
|
||||||
ITec,
|
ITec,
|
||||||
VTec,
|
VTec,
|
||||||
|
|
@ -73,19 +72,25 @@ impl Channels {
|
||||||
adc.set_sync_enable(false).unwrap();
|
adc.set_sync_enable(false).unwrap();
|
||||||
|
|
||||||
// Setup channels and start ADC
|
// Setup channels and start ADC
|
||||||
adc.setup_channel(0, ad7172::Input::Ain2, ad7172::Input::Ain3).unwrap();
|
adc.setup_channel(0, ad7172::Input::Ain2, ad7172::Input::Ain3)
|
||||||
let adc_calibration0 = adc.get_calibration(0)
|
.unwrap();
|
||||||
.expect("adc_calibration0");
|
let adc_calibration0 = adc.get_calibration(0).expect("adc_calibration0");
|
||||||
adc.setup_channel(1, ad7172::Input::Ain0, ad7172::Input::Ain1).unwrap();
|
adc.setup_channel(1, ad7172::Input::Ain0, ad7172::Input::Ain1)
|
||||||
let adc_calibration1 = adc.get_calibration(1)
|
.unwrap();
|
||||||
.expect("adc_calibration1");
|
let adc_calibration1 = adc.get_calibration(1).expect("adc_calibration1");
|
||||||
adc.start_continuous_conversion().unwrap();
|
adc.start_continuous_conversion().unwrap();
|
||||||
|
|
||||||
let channel0 = Channel::new(pins.channel0, adc_calibration0);
|
let channel0 = Channel::new(pins.channel0, adc_calibration0);
|
||||||
let channel1 = Channel::new(pins.channel1, adc_calibration1);
|
let channel1 = Channel::new(pins.channel1, adc_calibration1);
|
||||||
let pins_adc = pins.pins_adc;
|
let pins_adc = pins.pins_adc;
|
||||||
let pwm = pins.pwm;
|
let pwm = pins.pwm;
|
||||||
let mut channels = Channels { channel0, channel1, adc, pins_adc, pwm };
|
let mut channels = Channels {
|
||||||
|
channel0,
|
||||||
|
channel1,
|
||||||
|
adc,
|
||||||
|
pins_adc,
|
||||||
|
pwm,
|
||||||
|
};
|
||||||
for channel in 0..CHANNELS {
|
for channel in 0..CHANNELS {
|
||||||
channels.calibrate_dac_value(channel);
|
channels.calibrate_dac_value(channel);
|
||||||
channels.set_i(channel, ElectricCurrent::new::<ampere>(0.0));
|
channels.set_i(channel, ElectricCurrent::new::<ampere>(0.0));
|
||||||
|
|
@ -126,10 +131,10 @@ impl Channels {
|
||||||
/// calculate the TEC i_set centerpoint
|
/// calculate the TEC i_set centerpoint
|
||||||
pub fn get_center(&mut self, channel: usize) -> ElectricPotential {
|
pub fn get_center(&mut self, channel: usize) -> ElectricPotential {
|
||||||
match self.channel_state(channel).center {
|
match self.channel_state(channel).center {
|
||||||
CenterPoint::Vref =>
|
CenterPoint::VRef => self.adc_read(channel, PinsAdcReadTarget::VRef, 8),
|
||||||
self.adc_read(channel, PinsAdcReadTarget::VREF, 8),
|
CenterPoint::Override(center_point) => {
|
||||||
CenterPoint::Override(center_point) =>
|
ElectricPotential::new::<volt>(center_point.into())
|
||||||
ElectricPotential::new::<volt>(center_point.into()),
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -146,7 +151,7 @@ impl Channels {
|
||||||
|
|
||||||
/// i_set DAC
|
/// i_set DAC
|
||||||
fn set_dac(&mut self, channel: usize, voltage: ElectricPotential) -> ElectricPotential {
|
fn set_dac(&mut self, channel: usize, voltage: ElectricPotential) -> ElectricPotential {
|
||||||
let value = ((voltage / DAC_OUT_V_MAX).get::<ratio>() * (ad5680::MAX_VALUE as f64)) as u32 ;
|
let value = ((voltage / DAC_OUT_V_MAX).get::<ratio>() * (ad5680::MAX_VALUE as f64)) as u32;
|
||||||
match channel {
|
match channel {
|
||||||
0 => self.channel0.dac.set(value).unwrap(),
|
0 => self.channel0.dac.set(value).unwrap(),
|
||||||
1 => self.channel1.dac.set(value).unwrap(),
|
1 => self.channel1.dac.set(value).unwrap(),
|
||||||
|
|
@ -163,7 +168,7 @@ impl Channels {
|
||||||
Polarity::Normal => 1.0,
|
Polarity::Normal => 1.0,
|
||||||
Polarity::Reversed => -1.0,
|
Polarity::Reversed => -1.0,
|
||||||
};
|
};
|
||||||
let vref_meas = match channel.into() {
|
let vref_meas = match channel {
|
||||||
0 => self.channel0.vref_meas,
|
0 => self.channel0.vref_meas,
|
||||||
1 => self.channel1.vref_meas,
|
1 => self.channel1.vref_meas,
|
||||||
_ => unreachable!(),
|
_ => unreachable!(),
|
||||||
|
|
@ -172,54 +177,57 @@ impl Channels {
|
||||||
let r_sense = ElectricalResistance::new::<ohm>(R_SENSE);
|
let r_sense = ElectricalResistance::new::<ohm>(R_SENSE);
|
||||||
let voltage = negate * i_set * 10.0 * r_sense + center_point;
|
let voltage = negate * i_set * 10.0 * r_sense + center_point;
|
||||||
let voltage = self.set_dac(channel, voltage);
|
let voltage = self.set_dac(channel, voltage);
|
||||||
let i_set = negate * (voltage - center_point) / (10.0 * r_sense);
|
|
||||||
i_set
|
negate * (voltage - center_point) / (10.0 * r_sense)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// AN4073: ADC Reading Dispersion can be reduced through Averaging
|
/// AN4073: ADC Reading Dispersion can be reduced through Averaging
|
||||||
pub fn adc_read(&mut self, channel: usize, adc_read_target: PinsAdcReadTarget, avg_pt: u16) -> ElectricPotential {
|
pub fn adc_read(
|
||||||
|
&mut self,
|
||||||
|
channel: usize,
|
||||||
|
adc_read_target: PinsAdcReadTarget,
|
||||||
|
avg_pt: u16,
|
||||||
|
) -> ElectricPotential {
|
||||||
let mut sample: u32 = 0;
|
let mut sample: u32 = 0;
|
||||||
match channel {
|
match channel {
|
||||||
0 => {
|
0 => {
|
||||||
sample = match adc_read_target {
|
sample = match adc_read_target {
|
||||||
PinsAdcReadTarget::VREF => {
|
PinsAdcReadTarget::VRef => match &self.channel0.vref_pin {
|
||||||
match &self.channel0.vref_pin {
|
|
||||||
Channel0VRef::Analog(vref_pin) => {
|
Channel0VRef::Analog(vref_pin) => {
|
||||||
for _ in (0..avg_pt).rev() {
|
for _ in (0..avg_pt).rev() {
|
||||||
sample += self
|
sample += self.pins_adc.convert(
|
||||||
.pins_adc
|
vref_pin,
|
||||||
.convert(vref_pin, stm32f4xx_hal::adc::config::SampleTime::Cycles_480)
|
stm32f4xx_hal::adc::config::SampleTime::Cycles_480,
|
||||||
as u32;
|
) as u32;
|
||||||
}
|
}
|
||||||
sample / avg_pt as u32
|
sample / avg_pt as u32
|
||||||
|
}
|
||||||
|
Channel0VRef::Disabled(_) => 2048_u32,
|
||||||
},
|
},
|
||||||
Channel0VRef::Disabled(_) => {2048 as u32}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
PinsAdcReadTarget::DacVfb => {
|
PinsAdcReadTarget::DacVfb => {
|
||||||
for _ in (0..avg_pt).rev() {
|
for _ in (0..avg_pt).rev() {
|
||||||
sample += self
|
sample += self.pins_adc.convert(
|
||||||
.pins_adc
|
&self.channel0.dac_feedback_pin,
|
||||||
.convert(&self.channel0.dac_feedback_pin,stm32f4xx_hal::adc::config::SampleTime::Cycles_480)
|
stm32f4xx_hal::adc::config::SampleTime::Cycles_480,
|
||||||
as u32;
|
) as u32;
|
||||||
}
|
}
|
||||||
sample / avg_pt as u32
|
sample / avg_pt as u32
|
||||||
}
|
}
|
||||||
PinsAdcReadTarget::ITec => {
|
PinsAdcReadTarget::ITec => {
|
||||||
for _ in (0..avg_pt).rev() {
|
for _ in (0..avg_pt).rev() {
|
||||||
sample += self
|
sample += self.pins_adc.convert(
|
||||||
.pins_adc
|
&self.channel0.itec_pin,
|
||||||
.convert(&self.channel0.itec_pin, stm32f4xx_hal::adc::config::SampleTime::Cycles_480)
|
stm32f4xx_hal::adc::config::SampleTime::Cycles_480,
|
||||||
as u32;
|
) as u32;
|
||||||
}
|
}
|
||||||
sample / avg_pt as u32
|
sample / avg_pt as u32
|
||||||
}
|
}
|
||||||
PinsAdcReadTarget::VTec => {
|
PinsAdcReadTarget::VTec => {
|
||||||
for _ in (0..avg_pt).rev() {
|
for _ in (0..avg_pt).rev() {
|
||||||
sample += self
|
sample += self.pins_adc.convert(
|
||||||
.pins_adc
|
&self.channel0.tec_u_meas_pin,
|
||||||
.convert(&self.channel0.tec_u_meas_pin, stm32f4xx_hal::adc::config::SampleTime::Cycles_480)
|
stm32f4xx_hal::adc::config::SampleTime::Cycles_480,
|
||||||
as u32;
|
) as u32;
|
||||||
}
|
}
|
||||||
sample / avg_pt as u32
|
sample / avg_pt as u32
|
||||||
}
|
}
|
||||||
|
|
@ -229,44 +237,42 @@ impl Channels {
|
||||||
}
|
}
|
||||||
1 => {
|
1 => {
|
||||||
sample = match adc_read_target {
|
sample = match adc_read_target {
|
||||||
PinsAdcReadTarget::VREF => {
|
PinsAdcReadTarget::VRef => match &self.channel1.vref_pin {
|
||||||
match &self.channel1.vref_pin {
|
|
||||||
Channel1VRef::Analog(vref_pin) => {
|
Channel1VRef::Analog(vref_pin) => {
|
||||||
for _ in (0..avg_pt).rev() {
|
for _ in (0..avg_pt).rev() {
|
||||||
sample += self
|
sample += self.pins_adc.convert(
|
||||||
.pins_adc
|
vref_pin,
|
||||||
.convert(vref_pin, stm32f4xx_hal::adc::config::SampleTime::Cycles_480)
|
stm32f4xx_hal::adc::config::SampleTime::Cycles_480,
|
||||||
as u32;
|
) as u32;
|
||||||
}
|
}
|
||||||
sample / avg_pt as u32
|
sample / avg_pt as u32
|
||||||
|
}
|
||||||
|
Channel1VRef::Disabled(_) => 2048_u32,
|
||||||
},
|
},
|
||||||
Channel1VRef::Disabled(_) => {2048 as u32}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
PinsAdcReadTarget::DacVfb => {
|
PinsAdcReadTarget::DacVfb => {
|
||||||
for _ in (0..avg_pt).rev() {
|
for _ in (0..avg_pt).rev() {
|
||||||
sample += self
|
sample += self.pins_adc.convert(
|
||||||
.pins_adc
|
&self.channel1.dac_feedback_pin,
|
||||||
.convert(&self.channel1.dac_feedback_pin, stm32f4xx_hal::adc::config::SampleTime::Cycles_480)
|
stm32f4xx_hal::adc::config::SampleTime::Cycles_480,
|
||||||
as u32;
|
) as u32;
|
||||||
}
|
}
|
||||||
sample / avg_pt as u32
|
sample / avg_pt as u32
|
||||||
}
|
}
|
||||||
PinsAdcReadTarget::ITec => {
|
PinsAdcReadTarget::ITec => {
|
||||||
for _ in (0..avg_pt).rev() {
|
for _ in (0..avg_pt).rev() {
|
||||||
sample += self
|
sample += self.pins_adc.convert(
|
||||||
.pins_adc
|
&self.channel1.itec_pin,
|
||||||
.convert(&self.channel1.itec_pin, stm32f4xx_hal::adc::config::SampleTime::Cycles_480)
|
stm32f4xx_hal::adc::config::SampleTime::Cycles_480,
|
||||||
as u32;
|
) as u32;
|
||||||
}
|
}
|
||||||
sample / avg_pt as u32
|
sample / avg_pt as u32
|
||||||
}
|
}
|
||||||
PinsAdcReadTarget::VTec => {
|
PinsAdcReadTarget::VTec => {
|
||||||
for _ in (0..avg_pt).rev() {
|
for _ in (0..avg_pt).rev() {
|
||||||
sample += self
|
sample += self.pins_adc.convert(
|
||||||
.pins_adc
|
&self.channel1.tec_u_meas_pin,
|
||||||
.convert(&self.channel1.tec_u_meas_pin, stm32f4xx_hal::adc::config::SampleTime::Cycles_480)
|
stm32f4xx_hal::adc::config::SampleTime::Cycles_480,
|
||||||
as u32;
|
) as u32;
|
||||||
}
|
}
|
||||||
sample / avg_pt as u32
|
sample / avg_pt as u32
|
||||||
}
|
}
|
||||||
|
|
@ -274,7 +280,7 @@ impl Channels {
|
||||||
let mv = self.pins_adc.sample_to_millivolts(sample as u16);
|
let mv = self.pins_adc.sample_to_millivolts(sample as u16);
|
||||||
ElectricPotential::new::<millivolt>(mv as f64)
|
ElectricPotential::new::<millivolt>(mv as f64)
|
||||||
}
|
}
|
||||||
_ => unreachable!()
|
_ => unreachable!(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -298,9 +304,9 @@ impl Channels {
|
||||||
let samples = 50;
|
let samples = 50;
|
||||||
let mut target_voltage = ElectricPotential::new::<volt>(0.0);
|
let mut target_voltage = ElectricPotential::new::<volt>(0.0);
|
||||||
for _ in 0..samples {
|
for _ in 0..samples {
|
||||||
target_voltage = target_voltage + self.get_center(channel);
|
target_voltage += self.get_center(channel);
|
||||||
}
|
}
|
||||||
target_voltage = target_voltage / samples as f64;
|
target_voltage /= samples as f64;
|
||||||
let mut start_value = 1;
|
let mut start_value = 1;
|
||||||
let mut best_error = ElectricPotential::new::<volt>(100.0);
|
let mut best_error = ElectricPotential::new::<volt>(100.0);
|
||||||
|
|
||||||
|
|
@ -371,7 +377,9 @@ impl Channels {
|
||||||
|
|
||||||
// Get current passing through TEC
|
// Get current passing through TEC
|
||||||
pub fn get_tec_i(&mut self, channel: usize) -> ElectricCurrent {
|
pub fn get_tec_i(&mut self, channel: usize) -> ElectricCurrent {
|
||||||
let tec_i = (self.adc_read(channel, PinsAdcReadTarget::ITec, 16) - self.adc_read(channel, PinsAdcReadTarget::VREF, 16)) / ElectricalResistance::new::<ohm>(0.4);
|
let tec_i = (self.adc_read(channel, PinsAdcReadTarget::ITec, 16)
|
||||||
|
- self.adc_read(channel, PinsAdcReadTarget::VRef, 16))
|
||||||
|
/ ElectricalResistance::new::<ohm>(0.4);
|
||||||
match self.channel_state(channel).polarity {
|
match self.channel_state(channel).polarity {
|
||||||
Polarity::Normal => tec_i,
|
Polarity::Normal => tec_i,
|
||||||
Polarity::Reversed => -tec_i,
|
Polarity::Reversed => -tec_i,
|
||||||
|
|
@ -380,37 +388,34 @@ impl Channels {
|
||||||
|
|
||||||
// Get voltage across TEC
|
// Get voltage across TEC
|
||||||
pub fn get_tec_v(&mut self, channel: usize) -> ElectricPotential {
|
pub fn get_tec_v(&mut self, channel: usize) -> ElectricPotential {
|
||||||
(self.adc_read(channel, PinsAdcReadTarget::VTec, 16) - ElectricPotential::new::<volt>(1.5)) * 4.0
|
(self.adc_read(channel, PinsAdcReadTarget::VTec, 16) - ElectricPotential::new::<volt>(1.5))
|
||||||
|
* 4.0
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_pwm(&mut self, channel: usize, pin: PwmPin, duty: f64) -> f64 {
|
fn set_pwm(&mut self, channel: usize, pin: PwmPin, duty: f64) -> f64 {
|
||||||
fn set<P: hal::PwmPin<Duty=u16>>(pin: &mut P, duty: f64) -> f64 {
|
fn set<P: hal::PwmPin<Duty = u16>>(pin: &mut P, duty: f64) -> f64 {
|
||||||
let max = pin.get_max_duty();
|
let max = pin.get_max_duty();
|
||||||
let value = ((duty * (max as f64)) as u16).min(max);
|
let value = ((duty * (max as f64)) as u16).min(max);
|
||||||
pin.set_duty(value);
|
pin.set_duty(value);
|
||||||
value as f64 / (max as f64)
|
value as f64 / (max as f64)
|
||||||
}
|
}
|
||||||
match (channel, pin) {
|
match (channel, pin) {
|
||||||
(_, PwmPin::ISet) =>
|
(_, PwmPin::ISet) => panic!("i_set is no pwm pin"),
|
||||||
panic!("i_set is no pwm pin"),
|
(0, PwmPin::MaxIPos) => set(&mut self.pwm.max_i_pos0, duty),
|
||||||
(0, PwmPin::MaxIPos) =>
|
(0, PwmPin::MaxINeg) => set(&mut self.pwm.max_i_neg0, duty),
|
||||||
set(&mut self.pwm.max_i_pos0, duty),
|
(0, PwmPin::MaxV) => set(&mut self.pwm.max_v0, duty),
|
||||||
(0, PwmPin::MaxINeg) =>
|
(1, PwmPin::MaxIPos) => set(&mut self.pwm.max_i_pos1, duty),
|
||||||
set(&mut self.pwm.max_i_neg0, duty),
|
(1, PwmPin::MaxINeg) => set(&mut self.pwm.max_i_neg1, duty),
|
||||||
(0, PwmPin::MaxV) =>
|
(1, PwmPin::MaxV) => set(&mut self.pwm.max_v1, duty),
|
||||||
set(&mut self.pwm.max_v0, duty),
|
_ => unreachable!(),
|
||||||
(1, PwmPin::MaxIPos) =>
|
|
||||||
set(&mut self.pwm.max_i_pos1, duty),
|
|
||||||
(1, PwmPin::MaxINeg) =>
|
|
||||||
set(&mut self.pwm.max_i_neg1, duty),
|
|
||||||
(1, PwmPin::MaxV) =>
|
|
||||||
set(&mut self.pwm.max_v1, duty),
|
|
||||||
_ =>
|
|
||||||
unreachable!(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_max_v(&mut self, channel: usize, max_v: ElectricPotential) -> (ElectricPotential, ElectricPotential) {
|
pub fn set_max_v(
|
||||||
|
&mut self,
|
||||||
|
channel: usize,
|
||||||
|
max_v: ElectricPotential,
|
||||||
|
) -> (ElectricPotential, ElectricPotential) {
|
||||||
let max = 4.0 * ElectricPotential::new::<volt>(3.3);
|
let max = 4.0 * ElectricPotential::new::<volt>(3.3);
|
||||||
let max_v = max_v.min(MAX_TEC_V).max(ElectricPotential::zero());
|
let max_v = max_v.min(MAX_TEC_V).max(ElectricPotential::zero());
|
||||||
let duty = (max_v / max).get::<ratio>();
|
let duty = (max_v / max).get::<ratio>();
|
||||||
|
|
@ -419,7 +424,11 @@ impl Channels {
|
||||||
(duty * max, max)
|
(duty * max, max)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_max_i_pos(&mut self, channel: usize, max_i_pos: ElectricCurrent) -> (ElectricCurrent, ElectricCurrent) {
|
pub fn set_max_i_pos(
|
||||||
|
&mut self,
|
||||||
|
channel: usize,
|
||||||
|
max_i_pos: ElectricCurrent,
|
||||||
|
) -> (ElectricCurrent, ElectricCurrent) {
|
||||||
let max = ElectricCurrent::new::<ampere>(3.0);
|
let max = ElectricCurrent::new::<ampere>(3.0);
|
||||||
let max_i_pos = max_i_pos.min(MAX_TEC_I).max(ElectricCurrent::zero());
|
let max_i_pos = max_i_pos.min(MAX_TEC_I).max(ElectricCurrent::zero());
|
||||||
let duty = (max_i_pos / MAX_TEC_I_DUTY_TO_CURRENT_RATE).get::<ratio>();
|
let duty = (max_i_pos / MAX_TEC_I_DUTY_TO_CURRENT_RATE).get::<ratio>();
|
||||||
|
|
@ -431,7 +440,11 @@ impl Channels {
|
||||||
(duty * MAX_TEC_I_DUTY_TO_CURRENT_RATE, max)
|
(duty * MAX_TEC_I_DUTY_TO_CURRENT_RATE, max)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_max_i_neg(&mut self, channel: usize, max_i_neg: ElectricCurrent) -> (ElectricCurrent, ElectricCurrent) {
|
pub fn set_max_i_neg(
|
||||||
|
&mut self,
|
||||||
|
channel: usize,
|
||||||
|
max_i_neg: ElectricCurrent,
|
||||||
|
) -> (ElectricCurrent, ElectricCurrent) {
|
||||||
let max = ElectricCurrent::new::<ampere>(3.0);
|
let max = ElectricCurrent::new::<ampere>(3.0);
|
||||||
let max_i_neg = max_i_neg.min(MAX_TEC_I).max(ElectricCurrent::zero());
|
let max_i_neg = max_i_neg.min(MAX_TEC_I).max(ElectricCurrent::zero());
|
||||||
let duty = (max_i_neg / MAX_TEC_I_DUTY_TO_CURRENT_RATE).get::<ratio>();
|
let duty = (max_i_neg / MAX_TEC_I_DUTY_TO_CURRENT_RATE).get::<ratio>();
|
||||||
|
|
@ -469,7 +482,8 @@ impl Channels {
|
||||||
interval: state.get_adc_interval(),
|
interval: state.get_adc_interval(),
|
||||||
adc: state.get_adc(),
|
adc: state.get_adc(),
|
||||||
sens: state.get_sens(),
|
sens: state.get_sens(),
|
||||||
temperature: state.get_temperature()
|
temperature: state
|
||||||
|
.get_temperature()
|
||||||
.map(|temperature| temperature.get::<degree_celsius>()),
|
.map(|temperature| temperature.get::<degree_celsius>()),
|
||||||
pid_engaged: state.pid_engaged,
|
pid_engaged: state.pid_engaged,
|
||||||
i_set,
|
i_set,
|
||||||
|
|
@ -528,7 +542,10 @@ impl Channels {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn postfilter_summary(&mut self, channel: usize) -> PostFilterSummary {
|
fn postfilter_summary(&mut self, channel: usize) -> PostFilterSummary {
|
||||||
let rate = self.adc.get_postfilter(channel as u8).unwrap()
|
let rate = self
|
||||||
|
.adc
|
||||||
|
.get_postfilter(channel as u8)
|
||||||
|
.unwrap()
|
||||||
.and_then(|filter| filter.output_rate());
|
.and_then(|filter| filter.output_rate());
|
||||||
PostFilterSummary { channel, rate }
|
PostFilterSummary { channel, rate }
|
||||||
}
|
}
|
||||||
|
|
@ -546,7 +563,9 @@ impl Channels {
|
||||||
SteinhartHartSummary { channel, params }
|
SteinhartHartSummary { channel, params }
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn steinhart_hart_summaries_json(&mut self) -> Result<JsonBuffer, serde_json_core::ser::Error> {
|
pub fn steinhart_hart_summaries_json(
|
||||||
|
&mut self,
|
||||||
|
) -> Result<JsonBuffer, serde_json_core::ser::Error> {
|
||||||
let mut summaries = Vec::<_, U2>::new();
|
let mut summaries = Vec::<_, U2>::new();
|
||||||
for channel in 0..CHANNELS {
|
for channel in 0..CHANNELS {
|
||||||
let _ = summaries.push(self.steinhart_hart_summary(channel));
|
let _ = summaries.push(self.steinhart_hart_summary(channel));
|
||||||
|
|
@ -589,10 +608,8 @@ impl Serialize for CenterPointJson {
|
||||||
S: Serializer,
|
S: Serializer,
|
||||||
{
|
{
|
||||||
match self.0 {
|
match self.0 {
|
||||||
CenterPoint::Vref =>
|
CenterPoint::VRef => serializer.serialize_str("vref"),
|
||||||
serializer.serialize_str("vref"),
|
CenterPoint::Override(vref) => serializer.serialize_f32(vref),
|
||||||
CenterPoint::Override(vref) =>
|
|
||||||
serializer.serialize_f32(vref),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,45 +1,26 @@
|
||||||
use smoltcp::socket::TcpSocket;
|
|
||||||
use log::{error, warn};
|
|
||||||
use core::fmt::Write;
|
|
||||||
use heapless::{consts::U1024, Vec};
|
|
||||||
use super::{
|
use super::{
|
||||||
net,
|
|
||||||
command_parser::{
|
|
||||||
Ipv4Config,
|
|
||||||
Command,
|
|
||||||
ShowCommand,
|
|
||||||
CenterPoint,
|
|
||||||
PidParameter,
|
|
||||||
PwmPin,
|
|
||||||
ShParameter,
|
|
||||||
Polarity
|
|
||||||
},
|
|
||||||
ad7172,
|
ad7172,
|
||||||
CHANNEL_CONFIG_KEY,
|
channels::{Channels, CHANNELS},
|
||||||
channels::{
|
command_parser::{
|
||||||
Channels,
|
CenterPoint, Command, Ipv4Config, PidParameter, Polarity, PwmPin, ShParameter, ShowCommand,
|
||||||
CHANNELS
|
|
||||||
},
|
},
|
||||||
config::ChannelConfig,
|
config::ChannelConfig,
|
||||||
dfu,
|
dfu,
|
||||||
flash_store::FlashStore,
|
flash_store::FlashStore,
|
||||||
FanCtrl,
|
|
||||||
hw_rev::HWRev,
|
hw_rev::HWRev,
|
||||||
|
net, FanCtrl, CHANNEL_CONFIG_KEY,
|
||||||
};
|
};
|
||||||
|
use core::fmt::Write;
|
||||||
|
use heapless::{consts::U1024, Vec};
|
||||||
|
use log::{error, warn};
|
||||||
|
use smoltcp::socket::TcpSocket;
|
||||||
|
|
||||||
use uom::{
|
use uom::si::{
|
||||||
si::{
|
|
||||||
f64::{
|
|
||||||
ElectricCurrent,
|
|
||||||
ElectricPotential,
|
|
||||||
ElectricalResistance,
|
|
||||||
ThermodynamicTemperature,
|
|
||||||
},
|
|
||||||
electric_current::ampere,
|
electric_current::ampere,
|
||||||
electric_potential::volt,
|
electric_potential::volt,
|
||||||
electrical_resistance::ohm,
|
electrical_resistance::ohm,
|
||||||
|
f64::{ElectricCurrent, ElectricPotential, ElectricalResistance, ThermodynamicTemperature},
|
||||||
thermodynamic_temperature::degree_celsius,
|
thermodynamic_temperature::degree_celsius,
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
|
@ -52,9 +33,9 @@ pub enum Handler {
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq)]
|
||||||
pub enum Error {
|
pub enum Error {
|
||||||
ReportError,
|
Report,
|
||||||
PostFilterRateError,
|
PostFilterRate,
|
||||||
FlashError
|
Flash,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub type JsonBuffer = Vec<u8, U1024>;
|
pub type JsonBuffer = Vec<u8, U1024>;
|
||||||
|
|
@ -66,19 +47,19 @@ fn send_line(socket: &mut TcpSocket, data: &[u8]) -> bool {
|
||||||
// instead of sending incomplete line
|
// instead of sending incomplete line
|
||||||
warn!(
|
warn!(
|
||||||
"TCP socket has only {}/{} needed {}",
|
"TCP socket has only {}/{} needed {}",
|
||||||
send_free + 1, socket.send_capacity(), data.len(),
|
send_free + 1,
|
||||||
|
socket.send_capacity(),
|
||||||
|
data.len(),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
match socket.send_slice(&data) {
|
match socket.send_slice(data) {
|
||||||
Ok(sent) if sent == data.len() => {
|
Ok(sent) if sent == data.len() => {
|
||||||
let _ = socket.send_slice(b"\n");
|
let _ = socket.send_slice(b"\n");
|
||||||
// success
|
// success
|
||||||
return true
|
return true;
|
||||||
}
|
}
|
||||||
Ok(sent) =>
|
Ok(sent) => warn!("sent only {}/{} bytes", sent, data.len()),
|
||||||
warn!("sent only {}/{} bytes", sent, data.len()),
|
Err(e) => error!("error sending line: {:?}", e),
|
||||||
Err(e) =>
|
|
||||||
error!("error sending line: {:?}", e),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// not success
|
// not success
|
||||||
|
|
@ -86,7 +67,6 @@ fn send_line(socket: &mut TcpSocket, data: &[u8]) -> bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Handler {
|
impl Handler {
|
||||||
|
|
||||||
fn show_report(socket: &mut TcpSocket, channels: &mut Channels) -> Result<Handler, Error> {
|
fn show_report(socket: &mut TcpSocket, channels: &mut Channels) -> Result<Handler, Error> {
|
||||||
match channels.reports_json() {
|
match channels.reports_json() {
|
||||||
Ok(buf) => {
|
Ok(buf) => {
|
||||||
|
|
@ -95,7 +75,7 @@ impl Handler {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("unable to serialize report: {:?}", e);
|
error!("unable to serialize report: {:?}", e);
|
||||||
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
||||||
return Err(Error::ReportError);
|
return Err(Error::Report);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
|
|
@ -109,7 +89,7 @@ impl Handler {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("unable to serialize pid summary: {:?}", e);
|
error!("unable to serialize pid summary: {:?}", e);
|
||||||
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
||||||
return Err(Error::ReportError);
|
return Err(Error::Report);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
|
|
@ -123,13 +103,16 @@ impl Handler {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("unable to serialize pwm summary: {:?}", e);
|
error!("unable to serialize pwm summary: {:?}", e);
|
||||||
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
||||||
return Err(Error::ReportError);
|
return Err(Error::Report);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn show_steinhart_hart(socket: &mut TcpSocket, channels: &mut Channels) -> Result<Handler, Error> {
|
fn show_steinhart_hart(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
match channels.steinhart_hart_summaries_json() {
|
match channels.steinhart_hart_summaries_json() {
|
||||||
Ok(buf) => {
|
Ok(buf) => {
|
||||||
send_line(socket, &buf);
|
send_line(socket, &buf);
|
||||||
|
|
@ -137,13 +120,13 @@ impl Handler {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("unable to serialize steinhart-hart summaries: {:?}", e);
|
error!("unable to serialize steinhart-hart summaries: {:?}", e);
|
||||||
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
||||||
return Err(Error::ReportError);
|
return Err(Error::Report);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn show_post_filter (socket: &mut TcpSocket, channels: &mut Channels) -> Result<Handler, Error> {
|
fn show_post_filter(socket: &mut TcpSocket, channels: &mut Channels) -> Result<Handler, Error> {
|
||||||
match channels.postfilter_summaries_json() {
|
match channels.postfilter_summaries_json() {
|
||||||
Ok(buf) => {
|
Ok(buf) => {
|
||||||
send_line(socket, &buf);
|
send_line(socket, &buf);
|
||||||
|
|
@ -151,13 +134,13 @@ impl Handler {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("unable to serialize postfilter summary: {:?}", e);
|
error!("unable to serialize postfilter summary: {:?}", e);
|
||||||
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
||||||
return Err(Error::ReportError);
|
return Err(Error::Report);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn show_ipv4 (socket: &mut TcpSocket, ipv4_config: &mut Ipv4Config) -> Result<Handler, Error> {
|
fn show_ipv4(socket: &mut TcpSocket, ipv4_config: &mut Ipv4Config) -> Result<Handler, Error> {
|
||||||
let (cidr, gateway) = net::split_ipv4_config(ipv4_config.clone());
|
let (cidr, gateway) = net::split_ipv4_config(ipv4_config.clone());
|
||||||
let _ = write!(socket, "{{\"addr\":\"{}\"", cidr);
|
let _ = write!(socket, "{{\"addr\":\"{}\"", cidr);
|
||||||
gateway.map(|gateway| write!(socket, ",\"gateway\":\"{}\"", gateway));
|
gateway.map(|gateway| write!(socket, ",\"gateway\":\"{}\"", gateway));
|
||||||
|
|
@ -165,19 +148,34 @@ impl Handler {
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn engage_pid (socket: &mut TcpSocket, channels: &mut Channels, channel: usize) -> Result<Handler, Error> {
|
fn engage_pid(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
channel: usize,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
channels.channel_state(channel).pid_engaged = true;
|
channels.channel_state(channel).pid_engaged = true;
|
||||||
send_line(socket, b"{}");
|
send_line(socket, b"{}");
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_polarity(socket: &mut TcpSocket, channels: &mut Channels, channel: usize, polarity: Polarity) -> Result<Handler, Error> {
|
fn set_polarity(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
channel: usize,
|
||||||
|
polarity: Polarity,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
channels.set_polarity(channel, polarity);
|
channels.set_polarity(channel, polarity);
|
||||||
send_line(socket, b"{}");
|
send_line(socket, b"{}");
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_pwm (socket: &mut TcpSocket, channels: &mut Channels, channel: usize, pin: PwmPin, value: f64) -> Result<Handler, Error> {
|
fn set_pwm(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
channel: usize,
|
||||||
|
pin: PwmPin,
|
||||||
|
value: f64,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
match pin {
|
match pin {
|
||||||
PwmPin::ISet => {
|
PwmPin::ISet => {
|
||||||
channels.channel_state(channel).pid_engaged = false;
|
channels.channel_state(channel).pid_engaged = false;
|
||||||
|
|
@ -202,7 +200,12 @@ impl Handler {
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_center_point(socket: &mut TcpSocket, channels: &mut Channels, channel: usize, center: CenterPoint) -> Result<Handler, Error> {
|
fn set_center_point(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
channel: usize,
|
||||||
|
center: CenterPoint,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
let i_set = channels.get_i(channel);
|
let i_set = channels.get_i(channel);
|
||||||
let state = channels.channel_state(channel);
|
let state = channels.channel_state(channel);
|
||||||
state.center = center;
|
state.center = center;
|
||||||
|
|
@ -213,28 +216,34 @@ impl Handler {
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_pid (socket: &mut TcpSocket, channels: &mut Channels, channel: usize, parameter: PidParameter, value: f64) -> Result<Handler, Error> {
|
fn set_pid(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
channel: usize,
|
||||||
|
parameter: PidParameter,
|
||||||
|
value: f64,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
let pid = &mut channels.channel_state(channel).pid;
|
let pid = &mut channels.channel_state(channel).pid;
|
||||||
use super::command_parser::PidParameter::*;
|
use super::command_parser::PidParameter::*;
|
||||||
match parameter {
|
match parameter {
|
||||||
Target =>
|
Target => pid.target = value,
|
||||||
pid.target = value,
|
KP => pid.parameters.kp = value as f32,
|
||||||
KP =>
|
KI => pid.update_ki(value as f32),
|
||||||
pid.parameters.kp = value as f32,
|
KD => pid.parameters.kd = value as f32,
|
||||||
KI =>
|
OutputMin => pid.parameters.output_min = value as f32,
|
||||||
pid.update_ki(value as f32),
|
OutputMax => pid.parameters.output_max = value as f32,
|
||||||
KD =>
|
|
||||||
pid.parameters.kd = value as f32,
|
|
||||||
OutputMin =>
|
|
||||||
pid.parameters.output_min = value as f32,
|
|
||||||
OutputMax =>
|
|
||||||
pid.parameters.output_max = value as f32,
|
|
||||||
}
|
}
|
||||||
send_line(socket, b"{}");
|
send_line(socket, b"{}");
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_steinhart_hart (socket: &mut TcpSocket, channels: &mut Channels, channel: usize, parameter: ShParameter, value: f64) -> Result<Handler, Error> {
|
fn set_steinhart_hart(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
channel: usize,
|
||||||
|
parameter: ShParameter,
|
||||||
|
value: f64,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
let sh = &mut channels.channel_state(channel).sh;
|
let sh = &mut channels.channel_state(channel).sh;
|
||||||
use super::command_parser::ShParameter::*;
|
use super::command_parser::ShParameter::*;
|
||||||
match parameter {
|
match parameter {
|
||||||
|
|
@ -246,32 +255,52 @@ impl Handler {
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn reset_post_filter (socket: &mut TcpSocket, channels: &mut Channels, channel: usize) -> Result<Handler, Error> {
|
fn reset_post_filter(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
channel: usize,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
channels.adc.set_postfilter(channel as u8, None).unwrap();
|
channels.adc.set_postfilter(channel as u8, None).unwrap();
|
||||||
send_line(socket, b"{}");
|
send_line(socket, b"{}");
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_post_filter (socket: &mut TcpSocket, channels: &mut Channels, channel: usize, rate: f32) -> Result<Handler, Error> {
|
fn set_post_filter(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
channel: usize,
|
||||||
|
rate: f32,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
let filter = ad7172::PostFilter::closest(rate);
|
let filter = ad7172::PostFilter::closest(rate);
|
||||||
match filter {
|
match filter {
|
||||||
Some(filter) => {
|
Some(filter) => {
|
||||||
channels.adc.set_postfilter(channel as u8, Some(filter)).unwrap();
|
channels
|
||||||
|
.adc
|
||||||
|
.set_postfilter(channel as u8, Some(filter))
|
||||||
|
.unwrap();
|
||||||
send_line(socket, b"{}");
|
send_line(socket, b"{}");
|
||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
error!("unable to choose postfilter for rate {:.3}", rate);
|
error!("unable to choose postfilter for rate {:.3}", rate);
|
||||||
send_line(socket, b"{{\"error\": \"unable to choose postfilter rate\"}}");
|
send_line(
|
||||||
return Err(Error::PostFilterRateError);
|
socket,
|
||||||
|
b"{{\"error\": \"unable to choose postfilter rate\"}}",
|
||||||
|
);
|
||||||
|
return Err(Error::PostFilterRate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn load_channel (socket: &mut TcpSocket, channels: &mut Channels, store: &mut FlashStore, channel: Option<usize>) -> Result<Handler, Error> {
|
fn load_channel(
|
||||||
for c in 0..CHANNELS {
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
store: &mut FlashStore,
|
||||||
|
channel: Option<usize>,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
|
for (c, key) in CHANNEL_CONFIG_KEY.iter().enumerate().take(CHANNELS) {
|
||||||
if channel.is_none() || channel == Some(c) {
|
if channel.is_none() || channel == Some(c) {
|
||||||
match store.read_value::<ChannelConfig>(CHANNEL_CONFIG_KEY[c]) {
|
match store.read_value::<ChannelConfig>(key) {
|
||||||
Ok(Some(config)) => {
|
Ok(Some(config)) => {
|
||||||
config.apply(channels, c);
|
config.apply(channels, c);
|
||||||
send_line(socket, b"{}");
|
send_line(socket, b"{}");
|
||||||
|
|
@ -283,7 +312,7 @@ impl Handler {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("unable to load config from flash: {:?}", e);
|
error!("unable to load config from flash: {:?}", e);
|
||||||
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
||||||
return Err(Error::FlashError);
|
return Err(Error::Flash);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -291,19 +320,24 @@ impl Handler {
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn save_channel (socket: &mut TcpSocket, channels: &mut Channels, channel: Option<usize>, store: &mut FlashStore) -> Result<Handler, Error> {
|
fn save_channel(
|
||||||
for c in 0..CHANNELS {
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
channel: Option<usize>,
|
||||||
|
store: &mut FlashStore,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
|
for (c, key) in CHANNEL_CONFIG_KEY.iter().enumerate().take(CHANNELS) {
|
||||||
let mut store_value_buf = [0u8; 256];
|
let mut store_value_buf = [0u8; 256];
|
||||||
if channel.is_none() || channel == Some(c) {
|
if channel.is_none() || channel == Some(c) {
|
||||||
let config = ChannelConfig::new(channels, c);
|
let config = ChannelConfig::new(channels, c);
|
||||||
match store.write_value(CHANNEL_CONFIG_KEY[c], &config, &mut store_value_buf) {
|
match store.write_value(key, &config, &mut store_value_buf) {
|
||||||
Ok(()) => {
|
Ok(()) => {
|
||||||
send_line(socket, b"{}");
|
send_line(socket, b"{}");
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("unable to save channel {} config to flash: {:?}", c, e);
|
error!("unable to save channel {} config to flash: {:?}", c, e);
|
||||||
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
||||||
return Err(Error::FlashError);
|
return Err(Error::Flash);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -311,7 +345,11 @@ impl Handler {
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_ipv4 (socket: &mut TcpSocket, store: &mut FlashStore, config: Ipv4Config) -> Result<Handler, Error> {
|
fn set_ipv4(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
store: &mut FlashStore,
|
||||||
|
config: Ipv4Config,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
let _ = store
|
let _ = store
|
||||||
.write_value("ipv4", &config, [0; 16])
|
.write_value("ipv4", &config, [0; 16])
|
||||||
.map_err(|e| error!("unable to save ipv4 config to flash: {:?}", e));
|
.map_err(|e| error!("unable to save ipv4 config to flash: {:?}", e));
|
||||||
|
|
@ -320,7 +358,7 @@ impl Handler {
|
||||||
Ok(Handler::NewIPV4(new_ipv4_config.unwrap()))
|
Ok(Handler::NewIPV4(new_ipv4_config.unwrap()))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn reset (channels: &mut Channels) -> Result<Handler, Error> {
|
fn reset(channels: &mut Channels) -> Result<Handler, Error> {
|
||||||
for i in 0..CHANNELS {
|
for i in 0..CHANNELS {
|
||||||
channels.power_down(i);
|
channels.power_down(i);
|
||||||
}
|
}
|
||||||
|
|
@ -328,7 +366,7 @@ impl Handler {
|
||||||
Ok(Handler::Reset)
|
Ok(Handler::Reset)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn dfu (channels: &mut Channels) -> Result<Handler, Error> {
|
fn dfu(channels: &mut Channels) -> Result<Handler, Error> {
|
||||||
for i in 0..CHANNELS {
|
for i in 0..CHANNELS {
|
||||||
channels.power_down(i);
|
channels.power_down(i);
|
||||||
}
|
}
|
||||||
|
|
@ -339,9 +377,16 @@ impl Handler {
|
||||||
Ok(Handler::Reset)
|
Ok(Handler::Reset)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_fan(socket: &mut TcpSocket, fan_pwm: u32, fan_ctrl: &mut FanCtrl) -> Result<Handler, Error> {
|
fn set_fan(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
fan_pwm: u32,
|
||||||
|
fan_ctrl: &mut FanCtrl,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
if !fan_ctrl.fan_available() {
|
if !fan_ctrl.fan_available() {
|
||||||
send_line(socket, b"{ \"warning\": \"this thermostat doesn't have a fan!\" }");
|
send_line(
|
||||||
|
socket,
|
||||||
|
b"{ \"warning\": \"this thermostat doesn't have a fan!\" }",
|
||||||
|
);
|
||||||
return Ok(Handler::Handled);
|
return Ok(Handler::Handled);
|
||||||
}
|
}
|
||||||
fan_ctrl.set_auto_mode(false);
|
fan_ctrl.set_auto_mode(false);
|
||||||
|
|
@ -363,14 +408,17 @@ impl Handler {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("unable to serialize fan summary: {:?}", e);
|
error!("unable to serialize fan summary: {:?}", e);
|
||||||
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
||||||
Err(Error::ReportError)
|
Err(Error::Report)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fan_auto(socket: &mut TcpSocket, fan_ctrl: &mut FanCtrl) -> Result<Handler, Error> {
|
fn fan_auto(socket: &mut TcpSocket, fan_ctrl: &mut FanCtrl) -> Result<Handler, Error> {
|
||||||
if !fan_ctrl.fan_available() {
|
if !fan_ctrl.fan_available() {
|
||||||
send_line(socket, b"{ \"warning\": \"this thermostat doesn't have a fan!\" }");
|
send_line(
|
||||||
|
socket,
|
||||||
|
b"{ \"warning\": \"this thermostat doesn't have a fan!\" }",
|
||||||
|
);
|
||||||
return Ok(Handler::Handled);
|
return Ok(Handler::Handled);
|
||||||
}
|
}
|
||||||
fan_ctrl.set_auto_mode(true);
|
fan_ctrl.set_auto_mode(true);
|
||||||
|
|
@ -382,7 +430,13 @@ impl Handler {
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fan_curve(socket: &mut TcpSocket, fan_ctrl: &mut FanCtrl, k_a: f32, k_b: f32, k_c: f32) -> Result<Handler, Error> {
|
fn fan_curve(
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
fan_ctrl: &mut FanCtrl,
|
||||||
|
k_a: f32,
|
||||||
|
k_b: f32,
|
||||||
|
k_c: f32,
|
||||||
|
) -> Result<Handler, Error> {
|
||||||
fan_ctrl.set_curve(k_a, k_b, k_c);
|
fan_ctrl.set_curve(k_a, k_b, k_c);
|
||||||
send_line(socket, b"{}");
|
send_line(socket, b"{}");
|
||||||
Ok(Handler::Handled)
|
Ok(Handler::Handled)
|
||||||
|
|
@ -403,37 +457,71 @@ impl Handler {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("unable to serialize HWRev summary: {:?}", e);
|
error!("unable to serialize HWRev summary: {:?}", e);
|
||||||
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
let _ = writeln!(socket, "{{\"error\":\"{:?}\"}}", e);
|
||||||
Err(Error::ReportError)
|
Err(Error::Report)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn handle_command(command: Command, socket: &mut TcpSocket, channels: &mut Channels, store: &mut FlashStore, ipv4_config: &mut Ipv4Config, fan_ctrl: &mut FanCtrl, hwrev: HWRev) -> Result<Self, Error> {
|
pub fn handle_command(
|
||||||
|
command: Command,
|
||||||
|
socket: &mut TcpSocket,
|
||||||
|
channels: &mut Channels,
|
||||||
|
store: &mut FlashStore,
|
||||||
|
ipv4_config: &mut Ipv4Config,
|
||||||
|
fan_ctrl: &mut FanCtrl,
|
||||||
|
hwrev: HWRev,
|
||||||
|
) -> Result<Self, Error> {
|
||||||
match command {
|
match command {
|
||||||
Command::Quit => Ok(Handler::CloseSocket),
|
Command::Quit => Ok(Handler::CloseSocket),
|
||||||
Command::Show(ShowCommand::Input) => Handler::show_report(socket, channels),
|
Command::Show(ShowCommand::Input) => Handler::show_report(socket, channels),
|
||||||
Command::Show(ShowCommand::Pid) => Handler::show_pid(socket, channels),
|
Command::Show(ShowCommand::Pid) => Handler::show_pid(socket, channels),
|
||||||
Command::Show(ShowCommand::Pwm) => Handler::show_pwm(socket, channels),
|
Command::Show(ShowCommand::Pwm) => Handler::show_pwm(socket, channels),
|
||||||
Command::Show(ShowCommand::SteinhartHart) => Handler::show_steinhart_hart(socket, channels),
|
Command::Show(ShowCommand::SteinhartHart) => {
|
||||||
|
Handler::show_steinhart_hart(socket, channels)
|
||||||
|
}
|
||||||
Command::Show(ShowCommand::PostFilter) => Handler::show_post_filter(socket, channels),
|
Command::Show(ShowCommand::PostFilter) => Handler::show_post_filter(socket, channels),
|
||||||
Command::Show(ShowCommand::Ipv4) => Handler::show_ipv4(socket, ipv4_config),
|
Command::Show(ShowCommand::Ipv4) => Handler::show_ipv4(socket, ipv4_config),
|
||||||
Command::PwmPid { channel } => Handler::engage_pid(socket, channels, channel),
|
Command::PwmPid { channel } => Handler::engage_pid(socket, channels, channel),
|
||||||
Command::PwmPolarity { channel, polarity } => Handler::set_polarity(socket, channels, channel, polarity),
|
Command::PwmPolarity { channel, polarity } => {
|
||||||
Command::Pwm { channel, pin, value } => Handler::set_pwm(socket, channels, channel, pin, value),
|
Handler::set_polarity(socket, channels, channel, polarity)
|
||||||
Command::CenterPoint { channel, center } => Handler::set_center_point(socket, channels, channel, center),
|
}
|
||||||
Command::Pid { channel, parameter, value } => Handler::set_pid(socket, channels, channel, parameter, value),
|
Command::Pwm {
|
||||||
Command::SteinhartHart { channel, parameter, value } => Handler::set_steinhart_hart(socket, channels, channel, parameter, value),
|
channel,
|
||||||
Command::PostFilter { channel, rate: None } => Handler::reset_post_filter(socket, channels, channel),
|
pin,
|
||||||
Command::PostFilter { channel, rate: Some(rate) } => Handler::set_post_filter(socket, channels, channel, rate),
|
value,
|
||||||
|
} => Handler::set_pwm(socket, channels, channel, pin, value),
|
||||||
|
Command::CenterPoint { channel, center } => {
|
||||||
|
Handler::set_center_point(socket, channels, channel, center)
|
||||||
|
}
|
||||||
|
Command::Pid {
|
||||||
|
channel,
|
||||||
|
parameter,
|
||||||
|
value,
|
||||||
|
} => Handler::set_pid(socket, channels, channel, parameter, value),
|
||||||
|
Command::SteinhartHart {
|
||||||
|
channel,
|
||||||
|
parameter,
|
||||||
|
value,
|
||||||
|
} => Handler::set_steinhart_hart(socket, channels, channel, parameter, value),
|
||||||
|
Command::PostFilter {
|
||||||
|
channel,
|
||||||
|
rate: None,
|
||||||
|
} => Handler::reset_post_filter(socket, channels, channel),
|
||||||
|
Command::PostFilter {
|
||||||
|
channel,
|
||||||
|
rate: Some(rate),
|
||||||
|
} => Handler::set_post_filter(socket, channels, channel, rate),
|
||||||
Command::Load { channel } => Handler::load_channel(socket, channels, store, channel),
|
Command::Load { channel } => Handler::load_channel(socket, channels, store, channel),
|
||||||
Command::Save { channel } => Handler::save_channel(socket, channels, channel, store),
|
Command::Save { channel } => Handler::save_channel(socket, channels, channel, store),
|
||||||
Command::Ipv4(config) => Handler::set_ipv4(socket, store, config),
|
Command::Ipv4(config) => Handler::set_ipv4(socket, store, config),
|
||||||
Command::Reset => Handler::reset(channels),
|
Command::Reset => Handler::reset(channels),
|
||||||
Command::Dfu => Handler::dfu(channels),
|
Command::Dfu => Handler::dfu(channels),
|
||||||
Command::FanSet {fan_pwm} => Handler::set_fan(socket, fan_pwm, fan_ctrl),
|
Command::FanSet { fan_pwm } => Handler::set_fan(socket, fan_pwm, fan_ctrl),
|
||||||
Command::ShowFan => Handler::show_fan(socket, fan_ctrl),
|
Command::ShowFan => Handler::show_fan(socket, fan_ctrl),
|
||||||
Command::FanAuto => Handler::fan_auto(socket, fan_ctrl),
|
Command::FanAuto => Handler::fan_auto(socket, fan_ctrl),
|
||||||
Command::FanCurve { k_a, k_b, k_c } => Handler::fan_curve(socket, fan_ctrl, k_a, k_b, k_c),
|
Command::FanCurve { k_a, k_b, k_c } => {
|
||||||
|
Handler::fan_curve(socket, fan_ctrl, k_a, k_b, k_c)
|
||||||
|
}
|
||||||
Command::FanCurveDefaults => Handler::fan_defaults(socket, fan_ctrl),
|
Command::FanCurveDefaults => Handler::fan_defaults(socket, fan_ctrl),
|
||||||
Command::ShowHWRev => Handler::show_hwrev(socket, hwrev),
|
Command::ShowHWRev => Handler::show_hwrev(socket, hwrev),
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,19 +2,20 @@ use core::fmt;
|
||||||
use core::num::ParseIntError;
|
use core::num::ParseIntError;
|
||||||
use core::str::{from_utf8, Utf8Error};
|
use core::str::{from_utf8, Utf8Error};
|
||||||
use nom::{
|
use nom::{
|
||||||
IResult,
|
|
||||||
branch::alt,
|
branch::alt,
|
||||||
bytes::complete::{is_a, tag, take_while1},
|
bytes::complete::{is_a, tag, take_while1},
|
||||||
character::{is_digit, complete::{char, one_of}},
|
character::{
|
||||||
|
complete::{char, one_of},
|
||||||
|
is_digit,
|
||||||
|
},
|
||||||
combinator::{complete, map, opt, value},
|
combinator::{complete, map, opt, value},
|
||||||
sequence::preceded,
|
|
||||||
multi::{fold_many0, fold_many1},
|
|
||||||
error::ErrorKind,
|
error::ErrorKind,
|
||||||
Needed,
|
multi::{fold_many0, fold_many1},
|
||||||
|
sequence::preceded,
|
||||||
|
IResult, Needed,
|
||||||
};
|
};
|
||||||
use num_traits::{Num, ParseFloatError};
|
use num_traits::{Num, ParseFloatError};
|
||||||
use serde::{Serialize, Deserialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq)]
|
||||||
pub enum Error {
|
pub enum Error {
|
||||||
|
|
@ -30,12 +31,9 @@ pub enum Error {
|
||||||
impl<'t> From<nom::Err<(&'t [u8], ErrorKind)>> for Error {
|
impl<'t> From<nom::Err<(&'t [u8], ErrorKind)>> for Error {
|
||||||
fn from(e: nom::Err<(&'t [u8], ErrorKind)>) -> Self {
|
fn from(e: nom::Err<(&'t [u8], ErrorKind)>) -> Self {
|
||||||
match e {
|
match e {
|
||||||
nom::Err::Incomplete(_) =>
|
nom::Err::Incomplete(_) => Error::Incomplete,
|
||||||
Error::Incomplete,
|
nom::Err::Error((_, e)) => Error::Parser(e),
|
||||||
nom::Err::Error((_, e)) =>
|
nom::Err::Failure((_, e)) => Error::Parser(e),
|
||||||
Error::Parser(e),
|
|
||||||
nom::Err::Failure((_, e)) =>
|
|
||||||
Error::Parser(e),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -61,8 +59,7 @@ impl From<ParseFloatError> for Error {
|
||||||
impl fmt::Display for Error {
|
impl fmt::Display for Error {
|
||||||
fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> {
|
fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> {
|
||||||
match self {
|
match self {
|
||||||
Error::Incomplete =>
|
Error::Incomplete => "incomplete input".fmt(fmt),
|
||||||
"incomplete input".fmt(fmt),
|
|
||||||
Error::UnexpectedInput(c) => {
|
Error::UnexpectedInput(c) => {
|
||||||
"unexpected input: ".fmt(fmt)?;
|
"unexpected input: ".fmt(fmt)?;
|
||||||
c.fmt(fmt)
|
c.fmt(fmt)
|
||||||
|
|
@ -79,9 +76,7 @@ impl fmt::Display for Error {
|
||||||
"parsing int: ".fmt(fmt)?;
|
"parsing int: ".fmt(fmt)?;
|
||||||
(e as &dyn core::fmt::Debug).fmt(fmt)
|
(e as &dyn core::fmt::Debug).fmt(fmt)
|
||||||
}
|
}
|
||||||
Error::ParseFloat => {
|
Error::ParseFloat => "parsing float".fmt(fmt),
|
||||||
"parsing float".fmt(fmt)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -131,7 +126,7 @@ pub enum PwmPin {
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
pub enum CenterPoint {
|
pub enum CenterPoint {
|
||||||
Vref,
|
VRef,
|
||||||
Override(f32),
|
Override(f32),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -188,7 +183,7 @@ pub enum Command {
|
||||||
},
|
},
|
||||||
Dfu,
|
Dfu,
|
||||||
FanSet {
|
FanSet {
|
||||||
fan_pwm: u32
|
fan_pwm: u32,
|
||||||
},
|
},
|
||||||
FanAuto,
|
FanAuto,
|
||||||
ShowFan,
|
ShowFan,
|
||||||
|
|
@ -202,12 +197,7 @@ pub enum Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn end(input: &[u8]) -> IResult<&[u8], ()> {
|
fn end(input: &[u8]) -> IResult<&[u8], ()> {
|
||||||
complete(
|
complete(fold_many0(one_of("\r\n\t "), (), |(), _| ()))(input)
|
||||||
fold_many0(
|
|
||||||
one_of("\r\n\t "),
|
|
||||||
(), |(), _| ()
|
|
||||||
)
|
|
||||||
)(input)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn whitespace(input: &[u8]) -> IResult<&[u8], ()> {
|
fn whitespace(input: &[u8]) -> IResult<&[u8], ()> {
|
||||||
|
|
@ -215,14 +205,10 @@ fn whitespace(input: &[u8]) -> IResult<&[u8], ()> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn unsigned(input: &[u8]) -> IResult<&[u8], Result<u32, Error>> {
|
fn unsigned(input: &[u8]) -> IResult<&[u8], Result<u32, Error>> {
|
||||||
take_while1(is_digit)(input)
|
take_while1(is_digit)(input).map(|(input, digits)| {
|
||||||
.map(|(input, digits)| {
|
let result = from_utf8(digits)
|
||||||
let result =
|
|
||||||
from_utf8(digits)
|
|
||||||
.map_err(|e| e.into())
|
.map_err(|e| e.into())
|
||||||
.and_then(|digits| u32::from_str_radix(digits, 10)
|
.and_then(|digits| digits.parse::<u32>().map_err(|e| e.into()));
|
||||||
.map_err(|e| e.into())
|
|
||||||
);
|
|
||||||
(input, result)
|
(input, result)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -230,13 +216,10 @@ fn unsigned(input: &[u8]) -> IResult<&[u8], Result<u32, Error>> {
|
||||||
fn float(input: &[u8]) -> IResult<&[u8], Result<f64, Error>> {
|
fn float(input: &[u8]) -> IResult<&[u8], Result<f64, Error>> {
|
||||||
let (input, sign) = opt(is_a("-"))(input)?;
|
let (input, sign) = opt(is_a("-"))(input)?;
|
||||||
let negative = sign.is_some();
|
let negative = sign.is_some();
|
||||||
let (input, digits) = take_while1(|c| is_digit(c) || c == '.' as u8)(input)?;
|
let (input, digits) = take_while1(|c| is_digit(c) || c == b'.')(input)?;
|
||||||
let result =
|
let result = from_utf8(digits)
|
||||||
from_utf8(digits)
|
|
||||||
.map_err(|e| e.into())
|
.map_err(|e| e.into())
|
||||||
.and_then(|digits| f64::from_str_radix(digits, 10)
|
.and_then(|digits| f64::from_str_radix(digits, 10).map_err(|e| e.into()))
|
||||||
.map_err(|e| e.into())
|
|
||||||
)
|
|
||||||
.map(|result: f64| if negative { -result } else { result });
|
.map(|result: f64| if negative { -result } else { result });
|
||||||
Ok((input, result))
|
Ok((input, result))
|
||||||
}
|
}
|
||||||
|
|
@ -249,57 +232,32 @@ fn report(input: &[u8]) -> IResult<&[u8], Command> {
|
||||||
preceded(
|
preceded(
|
||||||
tag("report"),
|
tag("report"),
|
||||||
// `report` - Report once
|
// `report` - Report once
|
||||||
value(Command::Show(ShowCommand::Input), end)
|
value(Command::Show(ShowCommand::Input), end),
|
||||||
)(input)
|
)(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn pwm_setup(input: &[u8]) -> IResult<&[u8], Result<(PwmPin, f64), Error>> {
|
fn pwm_setup(input: &[u8]) -> IResult<&[u8], Result<(PwmPin, f64), Error>> {
|
||||||
let result_with_pin = |pin: PwmPin|
|
let result_with_pin =
|
||||||
move |result: Result<f64, Error>|
|
|pin: PwmPin| move |result: Result<f64, Error>| result.map(|value| (pin, value));
|
||||||
result.map(|value| (pin, value));
|
|
||||||
|
|
||||||
alt((
|
alt((
|
||||||
map(
|
map(
|
||||||
preceded(
|
preceded(tag("i_set"), preceded(whitespace, float)),
|
||||||
tag("i_set"),
|
result_with_pin(PwmPin::ISet),
|
||||||
preceded(
|
|
||||||
whitespace,
|
|
||||||
float
|
|
||||||
)
|
|
||||||
),
|
|
||||||
result_with_pin(PwmPin::ISet)
|
|
||||||
),
|
),
|
||||||
map(
|
map(
|
||||||
preceded(
|
preceded(tag("max_i_pos"), preceded(whitespace, float)),
|
||||||
tag("max_i_pos"),
|
result_with_pin(PwmPin::MaxIPos),
|
||||||
preceded(
|
|
||||||
whitespace,
|
|
||||||
float
|
|
||||||
)
|
|
||||||
),
|
|
||||||
result_with_pin(PwmPin::MaxIPos)
|
|
||||||
),
|
),
|
||||||
map(
|
map(
|
||||||
preceded(
|
preceded(tag("max_i_neg"), preceded(whitespace, float)),
|
||||||
tag("max_i_neg"),
|
result_with_pin(PwmPin::MaxINeg),
|
||||||
preceded(
|
|
||||||
whitespace,
|
|
||||||
float
|
|
||||||
)
|
|
||||||
),
|
|
||||||
result_with_pin(PwmPin::MaxINeg)
|
|
||||||
),
|
),
|
||||||
map(
|
map(
|
||||||
preceded(
|
preceded(tag("max_v"), preceded(whitespace, float)),
|
||||||
tag("max_v"),
|
result_with_pin(PwmPin::MaxV),
|
||||||
preceded(
|
|
||||||
whitespace,
|
|
||||||
float
|
|
||||||
)
|
|
||||||
),
|
),
|
||||||
result_with_pin(PwmPin::MaxV)
|
))(input)
|
||||||
))
|
|
||||||
)(input)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `pwm <0-1> pid` - Set PWM to be controlled by PID
|
/// `pwm <0-1> pid` - Set PWM to be controlled by PID
|
||||||
|
|
@ -312,10 +270,11 @@ fn pwm_polarity(input: &[u8]) -> IResult<&[u8], Polarity> {
|
||||||
tag("polarity"),
|
tag("polarity"),
|
||||||
preceded(
|
preceded(
|
||||||
whitespace,
|
whitespace,
|
||||||
alt((value(Polarity::Normal, tag("normal")),
|
alt((
|
||||||
value(Polarity::Reversed, tag("reversed"))
|
value(Polarity::Normal, tag("normal")),
|
||||||
))
|
value(Polarity::Reversed, tag("reversed")),
|
||||||
)
|
)),
|
||||||
|
),
|
||||||
)(input)
|
)(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -338,17 +297,22 @@ fn pwm(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
|input| {
|
|input| {
|
||||||
let (input, config) = pwm_setup(input)?;
|
let (input, config) = pwm_setup(input)?;
|
||||||
match config {
|
match config {
|
||||||
Ok((pin, value)) =>
|
Ok((pin, value)) => Ok((
|
||||||
Ok((input, Ok(Command::Pwm { channel, pin, value }))),
|
input,
|
||||||
Err(e) =>
|
Ok(Command::Pwm {
|
||||||
Ok((input, Err(e))),
|
channel,
|
||||||
|
pin,
|
||||||
|
value,
|
||||||
|
}),
|
||||||
|
)),
|
||||||
|
Err(e) => Ok((input, Err(e))),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
))(input)?;
|
))(input)?;
|
||||||
end(input)?;
|
end(input)?;
|
||||||
Ok((input, result))
|
Ok((input, result))
|
||||||
},
|
},
|
||||||
value(Ok(Command::Show(ShowCommand::Pwm)), end)
|
value(Ok(Command::Show(ShowCommand::Pwm)), end),
|
||||||
))(input)
|
))(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -357,26 +321,26 @@ fn center_point(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
let (input, _) = whitespace(input)?;
|
let (input, _) = whitespace(input)?;
|
||||||
let (input, channel) = channel(input)?;
|
let (input, channel) = channel(input)?;
|
||||||
let (input, _) = whitespace(input)?;
|
let (input, _) = whitespace(input)?;
|
||||||
let (input, center) = alt((
|
let (input, center) = alt((value(Ok(CenterPoint::VRef), tag("vref")), |input| {
|
||||||
value(Ok(CenterPoint::Vref), tag("vref")),
|
|
||||||
|input| {
|
|
||||||
let (input, value) = float(input)?;
|
let (input, value) = float(input)?;
|
||||||
Ok((input, value.map(|value| CenterPoint::Override(value as f32))))
|
Ok((
|
||||||
}
|
input,
|
||||||
))(input)?;
|
value.map(|value| CenterPoint::Override(value as f32)),
|
||||||
|
))
|
||||||
|
}))(input)?;
|
||||||
end(input)?;
|
end(input)?;
|
||||||
Ok((input, center.map(|center| Command::CenterPoint {
|
Ok((
|
||||||
channel,
|
input,
|
||||||
center,
|
center.map(|center| Command::CenterPoint { channel, center }),
|
||||||
})))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `pid <0-1> <parameter> <value>`
|
/// `pid <0-1> <parameter> <value>`
|
||||||
fn pid_parameter(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
fn pid_parameter(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
let (input, channel) = channel(input)?;
|
let (input, channel) = channel(input)?;
|
||||||
let (input, _) = whitespace(input)?;
|
let (input, _) = whitespace(input)?;
|
||||||
let (input, parameter) =
|
let (input, parameter) = alt((
|
||||||
alt((value(PidParameter::Target, tag("target")),
|
value(PidParameter::Target, tag("target")),
|
||||||
value(PidParameter::KP, tag("kp")),
|
value(PidParameter::KP, tag("kp")),
|
||||||
value(PidParameter::KI, tag("ki")),
|
value(PidParameter::KI, tag("ki")),
|
||||||
value(PidParameter::KD, tag("kd")),
|
value(PidParameter::KD, tag("kd")),
|
||||||
|
|
@ -385,8 +349,11 @@ fn pid_parameter(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
))(input)?;
|
))(input)?;
|
||||||
let (input, _) = whitespace(input)?;
|
let (input, _) = whitespace(input)?;
|
||||||
let (input, value) = float(input)?;
|
let (input, value) = float(input)?;
|
||||||
let result = value
|
let result = value.map(|value| Command::Pid {
|
||||||
.map(|value| Command::Pid { channel, parameter, value });
|
channel,
|
||||||
|
parameter,
|
||||||
|
value,
|
||||||
|
});
|
||||||
Ok((input, result))
|
Ok((input, result))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -394,11 +361,8 @@ fn pid_parameter(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
fn pid(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
fn pid(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
let (input, _) = tag("pid")(input)?;
|
let (input, _) = tag("pid")(input)?;
|
||||||
alt((
|
alt((
|
||||||
preceded(
|
preceded(whitespace, pid_parameter),
|
||||||
whitespace,
|
value(Ok(Command::Show(ShowCommand::Pid)), end),
|
||||||
pid_parameter
|
|
||||||
),
|
|
||||||
value(Ok(Command::Show(ShowCommand::Pid)), end)
|
|
||||||
))(input)
|
))(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -406,15 +370,18 @@ fn pid(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
fn steinhart_hart_parameter(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
fn steinhart_hart_parameter(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
let (input, channel) = channel(input)?;
|
let (input, channel) = channel(input)?;
|
||||||
let (input, _) = whitespace(input)?;
|
let (input, _) = whitespace(input)?;
|
||||||
let (input, parameter) =
|
let (input, parameter) = alt((
|
||||||
alt((value(ShParameter::T0, tag("t0")),
|
value(ShParameter::T0, tag("t0")),
|
||||||
value(ShParameter::B, tag("b")),
|
value(ShParameter::B, tag("b")),
|
||||||
value(ShParameter::R0, tag("r0"))
|
value(ShParameter::R0, tag("r0")),
|
||||||
))(input)?;
|
))(input)?;
|
||||||
let (input, _) = whitespace(input)?;
|
let (input, _) = whitespace(input)?;
|
||||||
let (input, value) = float(input)?;
|
let (input, value) = float(input)?;
|
||||||
let result = value
|
let result = value.map(|value| Command::SteinhartHart {
|
||||||
.map(|value| Command::SteinhartHart { channel, parameter, value });
|
channel,
|
||||||
|
parameter,
|
||||||
|
value,
|
||||||
|
});
|
||||||
Ok((input, result))
|
Ok((input, result))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -422,42 +389,38 @@ fn steinhart_hart_parameter(input: &[u8]) -> IResult<&[u8], Result<Command, Erro
|
||||||
fn steinhart_hart(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
fn steinhart_hart(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
let (input, _) = tag("s-h")(input)?;
|
let (input, _) = tag("s-h")(input)?;
|
||||||
alt((
|
alt((
|
||||||
preceded(
|
preceded(whitespace, steinhart_hart_parameter),
|
||||||
whitespace,
|
value(Ok(Command::Show(ShowCommand::SteinhartHart)), end),
|
||||||
steinhart_hart_parameter
|
|
||||||
),
|
|
||||||
value(Ok(Command::Show(ShowCommand::SteinhartHart)), end)
|
|
||||||
))(input)
|
))(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn postfilter(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
fn postfilter(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
let (input, _) = tag("postfilter")(input)?;
|
let (input, _) = tag("postfilter")(input)?;
|
||||||
alt((
|
alt((
|
||||||
preceded(
|
preceded(whitespace, |input| {
|
||||||
whitespace,
|
|
||||||
|input| {
|
|
||||||
let (input, channel) = channel(input)?;
|
let (input, channel) = channel(input)?;
|
||||||
let (input, _) = whitespace(input)?;
|
let (input, _) = whitespace(input)?;
|
||||||
alt((
|
alt((
|
||||||
value(Ok(Command::PostFilter {
|
value(
|
||||||
|
Ok(Command::PostFilter {
|
||||||
channel,
|
channel,
|
||||||
rate: None,
|
rate: None,
|
||||||
}), tag("off")),
|
}),
|
||||||
|
tag("off"),
|
||||||
|
),
|
||||||
move |input| {
|
move |input| {
|
||||||
let (input, _) = tag("rate")(input)?;
|
let (input, _) = tag("rate")(input)?;
|
||||||
let (input, _) = whitespace(input)?;
|
let (input, _) = whitespace(input)?;
|
||||||
let (input, rate) = float(input)?;
|
let (input, rate) = float(input)?;
|
||||||
let result = rate
|
let result = rate.map(|rate| Command::PostFilter {
|
||||||
.map(|rate| Command::PostFilter {
|
|
||||||
channel,
|
channel,
|
||||||
rate: Some(rate as f32),
|
rate: Some(rate as f32),
|
||||||
});
|
});
|
||||||
Ok((input, result))
|
Ok((input, result))
|
||||||
}
|
},
|
||||||
))(input)
|
))(input)
|
||||||
}
|
}),
|
||||||
),
|
value(Ok(Command::Show(ShowCommand::PostFilter)), end),
|
||||||
value(Ok(Command::Show(ShowCommand::PostFilter)), end)
|
|
||||||
))(input)
|
))(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -470,7 +433,7 @@ fn load(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
let (input, _) = end(input)?;
|
let (input, _) = end(input)?;
|
||||||
Ok((input, Some(channel)))
|
Ok((input, Some(channel)))
|
||||||
},
|
},
|
||||||
value(None, end)
|
value(None, end),
|
||||||
))(input)?;
|
))(input)?;
|
||||||
|
|
||||||
let result = Ok(Command::Load { channel });
|
let result = Ok(Command::Load { channel });
|
||||||
|
|
@ -486,7 +449,7 @@ fn save(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
let (input, _) = end(input)?;
|
let (input, _) = end(input)?;
|
||||||
Ok((input, Some(channel)))
|
Ok((input, Some(channel)))
|
||||||
},
|
},
|
||||||
value(None, end)
|
value(None, end),
|
||||||
))(input)?;
|
))(input)?;
|
||||||
|
|
||||||
let result = Ok(Command::Save { channel });
|
let result = Ok(Command::Save { channel });
|
||||||
|
|
@ -548,12 +511,17 @@ fn fan(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
},
|
},
|
||||||
|input| {
|
|input| {
|
||||||
let (input, value) = unsigned(input)?;
|
let (input, value) = unsigned(input)?;
|
||||||
Ok((input, Ok(Command::FanSet { fan_pwm: value.unwrap_or(0)})))
|
Ok((
|
||||||
|
input,
|
||||||
|
Ok(Command::FanSet {
|
||||||
|
fan_pwm: value.unwrap_or(0),
|
||||||
|
}),
|
||||||
|
))
|
||||||
},
|
},
|
||||||
))(input)?;
|
))(input)?;
|
||||||
Ok((input, result))
|
Ok((input, result))
|
||||||
},
|
},
|
||||||
value(Ok(Command::ShowFan), end)
|
value(Ok(Command::ShowFan), end),
|
||||||
))(input)
|
))(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -573,8 +541,15 @@ fn fan_curve(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
let (input, k_b) = float(input)?;
|
let (input, k_b) = float(input)?;
|
||||||
let (input, _) = whitespace(input)?;
|
let (input, _) = whitespace(input)?;
|
||||||
let (input, k_c) = float(input)?;
|
let (input, k_c) = float(input)?;
|
||||||
if k_a.is_ok() && k_b.is_ok() && k_c.is_ok() {
|
if let (Ok(k_a), Ok(k_b), Ok(k_c)) = (k_a, k_b, k_c) {
|
||||||
Ok((input, Ok(Command::FanCurve { k_a: k_a.unwrap() as f32, k_b: k_b.unwrap() as f32, k_c: k_c.unwrap() as f32 })))
|
Ok((
|
||||||
|
input,
|
||||||
|
Ok(Command::FanCurve {
|
||||||
|
k_a: k_a as f32,
|
||||||
|
k_b: k_b as f32,
|
||||||
|
k_c: k_c as f32,
|
||||||
|
}),
|
||||||
|
))
|
||||||
} else {
|
} else {
|
||||||
Err(nom::Err::Incomplete(Needed::Size(3)))
|
Err(nom::Err::Incomplete(Needed::Size(3)))
|
||||||
}
|
}
|
||||||
|
|
@ -582,12 +557,13 @@ fn fan_curve(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
))(input)?;
|
))(input)?;
|
||||||
Ok((input, result))
|
Ok((input, result))
|
||||||
},
|
},
|
||||||
value(Err(Error::Incomplete), end)
|
value(Err(Error::Incomplete), end),
|
||||||
))(input)
|
))(input)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn command(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
fn command(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
alt((value(Ok(Command::Quit), tag("quit")),
|
alt((
|
||||||
|
value(Ok(Command::Quit), tag("quit")),
|
||||||
load,
|
load,
|
||||||
save,
|
save,
|
||||||
value(Ok(Command::Reset), tag("reset")),
|
value(Ok(Command::Reset), tag("reset")),
|
||||||
|
|
@ -608,12 +584,9 @@ fn command(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
||||||
impl Command {
|
impl Command {
|
||||||
pub fn parse(input: &[u8]) -> Result<Self, Error> {
|
pub fn parse(input: &[u8]) -> Result<Self, Error> {
|
||||||
match command(input) {
|
match command(input) {
|
||||||
Ok((input_remain, result)) if input_remain.len() == 0 =>
|
Ok((input_remain, result)) if input_remain.is_empty() => result,
|
||||||
result,
|
Ok((input_remain, _)) => Err(Error::UnexpectedInput(input_remain[0])),
|
||||||
Ok((input_remain, _)) =>
|
Err(e) => Err(e.into()),
|
||||||
Err(Error::UnexpectedInput(input_remain[0])),
|
|
||||||
Err(e) =>
|
|
||||||
Err(e.into()),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -661,21 +634,27 @@ mod test {
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_ipv4() {
|
fn parse_ipv4() {
|
||||||
let command = Command::parse(b"ipv4 192.168.1.26/24");
|
let command = Command::parse(b"ipv4 192.168.1.26/24");
|
||||||
assert_eq!(command, Ok(Command::Ipv4(Ipv4Config {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::Ipv4(Ipv4Config {
|
||||||
address: [192, 168, 1, 26],
|
address: [192, 168, 1, 26],
|
||||||
mask_len: 24,
|
mask_len: 24,
|
||||||
gateway: None,
|
gateway: None,
|
||||||
})));
|
}))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_ipv4_and_gateway() {
|
fn parse_ipv4_and_gateway() {
|
||||||
let command = Command::parse(b"ipv4 10.42.0.126/8 10.1.0.1");
|
let command = Command::parse(b"ipv4 10.42.0.126/8 10.1.0.1");
|
||||||
assert_eq!(command, Ok(Command::Ipv4(Ipv4Config {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::Ipv4(Ipv4Config {
|
||||||
address: [10, 42, 0, 126],
|
address: [10, 42, 0, 126],
|
||||||
mask_len: 8,
|
mask_len: 8,
|
||||||
gateway: Some([10, 1, 0, 1]),
|
gateway: Some([10, 1, 0, 1]),
|
||||||
})));
|
}))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
@ -687,58 +666,71 @@ mod test {
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_pwm_i_set() {
|
fn parse_pwm_i_set() {
|
||||||
let command = Command::parse(b"pwm 1 i_set 16383");
|
let command = Command::parse(b"pwm 1 i_set 16383");
|
||||||
assert_eq!(command, Ok(Command::Pwm {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::Pwm {
|
||||||
channel: 1,
|
channel: 1,
|
||||||
pin: PwmPin::ISet,
|
pin: PwmPin::ISet,
|
||||||
value: 16383.0,
|
value: 16383.0,
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_pwm_polarity() {
|
fn parse_pwm_polarity() {
|
||||||
let command = Command::parse(b"pwm 0 polarity reversed");
|
let command = Command::parse(b"pwm 0 polarity reversed");
|
||||||
assert_eq!(command, Ok(Command::PwmPolarity {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::PwmPolarity {
|
||||||
channel: 0,
|
channel: 0,
|
||||||
polarity: Polarity::Reversed,
|
polarity: Polarity::Reversed,
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_pwm_pid() {
|
fn parse_pwm_pid() {
|
||||||
let command = Command::parse(b"pwm 0 pid");
|
let command = Command::parse(b"pwm 0 pid");
|
||||||
assert_eq!(command, Ok(Command::PwmPid {
|
assert_eq!(command, Ok(Command::PwmPid { channel: 0 }));
|
||||||
channel: 0,
|
|
||||||
}));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_pwm_max_i_pos() {
|
fn parse_pwm_max_i_pos() {
|
||||||
let command = Command::parse(b"pwm 0 max_i_pos 7");
|
let command = Command::parse(b"pwm 0 max_i_pos 7");
|
||||||
assert_eq!(command, Ok(Command::Pwm {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::Pwm {
|
||||||
channel: 0,
|
channel: 0,
|
||||||
pin: PwmPin::MaxIPos,
|
pin: PwmPin::MaxIPos,
|
||||||
value: 7.0,
|
value: 7.0,
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_pwm_max_i_neg() {
|
fn parse_pwm_max_i_neg() {
|
||||||
let command = Command::parse(b"pwm 0 max_i_neg 128");
|
let command = Command::parse(b"pwm 0 max_i_neg 128");
|
||||||
assert_eq!(command, Ok(Command::Pwm {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::Pwm {
|
||||||
channel: 0,
|
channel: 0,
|
||||||
pin: PwmPin::MaxINeg,
|
pin: PwmPin::MaxINeg,
|
||||||
value: 128.0,
|
value: 128.0,
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_pwm_max_v() {
|
fn parse_pwm_max_v() {
|
||||||
let command = Command::parse(b"pwm 0 max_v 32768");
|
let command = Command::parse(b"pwm 0 max_v 32768");
|
||||||
assert_eq!(command, Ok(Command::Pwm {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::Pwm {
|
||||||
channel: 0,
|
channel: 0,
|
||||||
pin: PwmPin::MaxV,
|
pin: PwmPin::MaxV,
|
||||||
value: 32768.0,
|
value: 32768.0,
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
@ -750,11 +742,14 @@ mod test {
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_pid_target() {
|
fn parse_pid_target() {
|
||||||
let command = Command::parse(b"pid 0 target 36.5");
|
let command = Command::parse(b"pid 0 target 36.5");
|
||||||
assert_eq!(command, Ok(Command::Pid {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::Pid {
|
||||||
channel: 0,
|
channel: 0,
|
||||||
parameter: PidParameter::Target,
|
parameter: PidParameter::Target,
|
||||||
value: 36.5,
|
value: 36.5,
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
@ -766,11 +761,14 @@ mod test {
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_steinhart_hart_set() {
|
fn parse_steinhart_hart_set() {
|
||||||
let command = Command::parse(b"s-h 1 t0 23.05");
|
let command = Command::parse(b"s-h 1 t0 23.05");
|
||||||
assert_eq!(command, Ok(Command::SteinhartHart {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::SteinhartHart {
|
||||||
channel: 1,
|
channel: 1,
|
||||||
parameter: ShParameter::T0,
|
parameter: ShParameter::T0,
|
||||||
value: 23.05,
|
value: 23.05,
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
@ -782,37 +780,49 @@ mod test {
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_postfilter_off() {
|
fn parse_postfilter_off() {
|
||||||
let command = Command::parse(b"postfilter 1 off");
|
let command = Command::parse(b"postfilter 1 off");
|
||||||
assert_eq!(command, Ok(Command::PostFilter {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::PostFilter {
|
||||||
channel: 1,
|
channel: 1,
|
||||||
rate: None,
|
rate: None,
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_postfilter_rate() {
|
fn parse_postfilter_rate() {
|
||||||
let command = Command::parse(b"postfilter 0 rate 21");
|
let command = Command::parse(b"postfilter 0 rate 21");
|
||||||
assert_eq!(command, Ok(Command::PostFilter {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::PostFilter {
|
||||||
channel: 0,
|
channel: 0,
|
||||||
rate: Some(21.0),
|
rate: Some(21.0),
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_center_point() {
|
fn parse_center_point() {
|
||||||
let command = Command::parse(b"center 0 1.5");
|
let command = Command::parse(b"center 0 1.5");
|
||||||
assert_eq!(command, Ok(Command::CenterPoint {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::CenterPoint {
|
||||||
channel: 0,
|
channel: 0,
|
||||||
center: CenterPoint::Override(1.5),
|
center: CenterPoint::Override(1.5),
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_center_point_vref() {
|
fn parse_center_point_vref() {
|
||||||
let command = Command::parse(b"center 1 vref");
|
let command = Command::parse(b"center 1 vref");
|
||||||
assert_eq!(command, Ok(Command::CenterPoint {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::CenterPoint {
|
||||||
channel: 1,
|
channel: 1,
|
||||||
center: CenterPoint::Vref,
|
center: CenterPoint::VRef,
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
@ -824,7 +834,7 @@ mod test {
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_fan_set() {
|
fn parse_fan_set() {
|
||||||
let command = Command::parse(b"fan 42");
|
let command = Command::parse(b"fan 42");
|
||||||
assert_eq!(command, Ok(Command::FanSet {fan_pwm: 42}));
|
assert_eq!(command, Ok(Command::FanSet { fan_pwm: 42 }));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
@ -836,11 +846,14 @@ mod test {
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_fcurve_set() {
|
fn parse_fcurve_set() {
|
||||||
let command = Command::parse(b"fcurve 1.2 3.4 5.6");
|
let command = Command::parse(b"fcurve 1.2 3.4 5.6");
|
||||||
assert_eq!(command, Ok(Command::FanCurve {
|
assert_eq!(
|
||||||
|
command,
|
||||||
|
Ok(Command::FanCurve {
|
||||||
k_a: 1.2,
|
k_a: 1.2,
|
||||||
k_b: 3.4,
|
k_b: 3.4,
|
||||||
k_c: 5.6
|
k_c: 5.6
|
||||||
}));
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,15 @@
|
||||||
use num_traits::Zero;
|
|
||||||
use serde::{Serialize, Deserialize};
|
|
||||||
use uom::si::{
|
|
||||||
electric_potential::volt,
|
|
||||||
electric_current::ampere,
|
|
||||||
f64::{ElectricCurrent, ElectricPotential},
|
|
||||||
};
|
|
||||||
use crate::{
|
use crate::{
|
||||||
ad7172::PostFilter,
|
ad7172::PostFilter,
|
||||||
channels::Channels,
|
channels::Channels,
|
||||||
command_parser::{CenterPoint, Polarity},
|
command_parser::{CenterPoint, Polarity},
|
||||||
pid,
|
pid, steinhart_hart,
|
||||||
steinhart_hart,
|
};
|
||||||
|
use num_traits::Zero;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use uom::si::{
|
||||||
|
electric_current::ampere,
|
||||||
|
electric_potential::volt,
|
||||||
|
f64::{ElectricCurrent, ElectricPotential},
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||||
|
|
@ -31,7 +30,9 @@ impl ChannelConfig {
|
||||||
pub fn new(channels: &mut Channels, channel: usize) -> Self {
|
pub fn new(channels: &mut Channels, channel: usize) -> Self {
|
||||||
let pwm = PwmLimits::new(channels, channel);
|
let pwm = PwmLimits::new(channels, channel);
|
||||||
|
|
||||||
let adc_postfilter = channels.adc.get_postfilter(channel as u8)
|
let adc_postfilter = channels
|
||||||
|
.adc
|
||||||
|
.get_postfilter(channel as u8)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.unwrap_or(PostFilter::Invalid);
|
.unwrap_or(PostFilter::Invalid);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ unsafe fn __pre_init() {
|
||||||
rcc.apb2enr.modify(|_, w| w.syscfgen().set_bit());
|
rcc.apb2enr.modify(|_, w| w.syscfgen().set_bit());
|
||||||
|
|
||||||
// Bypass BOOT pins and remap bootloader to 0x00000000
|
// Bypass BOOT pins and remap bootloader to 0x00000000
|
||||||
let syscfg = &*SYSCFG::ptr() ;
|
let syscfg = &*SYSCFG::ptr();
|
||||||
syscfg.memrm.write(|w| w.mem_mode().bits(0b01));
|
syscfg.memrm.write(|w| w.mem_mode().bits(0b01));
|
||||||
|
|
||||||
// Impose instruction and memory barriers
|
// Impose instruction and memory barriers
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,17 @@
|
||||||
|
use crate::{channels::MAX_TEC_I, command_handler::JsonBuffer, hw_rev::HWSettings};
|
||||||
use num_traits::Float;
|
use num_traits::Float;
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use stm32f4xx_hal::{
|
use stm32f4xx_hal::{
|
||||||
pwm::{self, PwmChannels},
|
|
||||||
pac::TIM8,
|
pac::TIM8,
|
||||||
|
pwm::{self, PwmChannels},
|
||||||
};
|
};
|
||||||
use uom::si::{
|
use uom::si::{electric_current::ampere, f64::ElectricCurrent};
|
||||||
f64::ElectricCurrent,
|
|
||||||
electric_current::ampere,
|
|
||||||
};
|
|
||||||
use crate::{
|
|
||||||
hw_rev::HWSettings,
|
|
||||||
command_handler::JsonBuffer,
|
|
||||||
channels::MAX_TEC_I,
|
|
||||||
};
|
|
||||||
|
|
||||||
pub type FanPin = PwmChannels<TIM8, pwm::C4>;
|
pub type FanPin = PwmChannels<TIM8, pwm::C4>;
|
||||||
|
|
||||||
const MAX_USER_FAN_PWM: f32 = 100.0;
|
const MAX_USER_FAN_PWM: f32 = 100.0;
|
||||||
const MIN_USER_FAN_PWM: f32 = 1.0;
|
const MIN_USER_FAN_PWM: f32 = 1.0;
|
||||||
|
|
||||||
|
|
||||||
pub struct FanCtrl {
|
pub struct FanCtrl {
|
||||||
fan: Option<FanPin>,
|
fan: Option<FanPin>,
|
||||||
fan_auto: bool,
|
fan_auto: bool,
|
||||||
|
|
@ -56,7 +48,9 @@ impl FanCtrl {
|
||||||
if self.fan_auto && self.hw_settings.fan_available {
|
if self.fan_auto && self.hw_settings.fan_available {
|
||||||
let scaled_current = self.abs_max_tec_i / MAX_TEC_I.get::<ampere>() as f32;
|
let scaled_current = self.abs_max_tec_i / MAX_TEC_I.get::<ampere>() as f32;
|
||||||
// do not limit upper bound, as it will be limited in the set_pwm()
|
// do not limit upper bound, as it will be limited in the set_pwm()
|
||||||
let pwm = (MAX_USER_FAN_PWM * (scaled_current * (scaled_current * self.k_a + self.k_b) + self.k_c)) as u32;
|
let pwm = (MAX_USER_FAN_PWM
|
||||||
|
* (scaled_current * (scaled_current * self.k_a + self.k_b) + self.k_c))
|
||||||
|
as u32;
|
||||||
self.set_pwm(pwm);
|
self.set_pwm(pwm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -89,9 +83,11 @@ impl FanCtrl {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn restore_defaults(&mut self) {
|
pub fn restore_defaults(&mut self) {
|
||||||
self.set_curve(self.hw_settings.fan_k_a,
|
self.set_curve(
|
||||||
|
self.hw_settings.fan_k_a,
|
||||||
self.hw_settings.fan_k_b,
|
self.hw_settings.fan_k_b,
|
||||||
self.hw_settings.fan_k_c);
|
self.hw_settings.fan_k_c,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_pwm(&mut self, fan_pwm: u32) -> f32 {
|
pub fn set_pwm(&mut self, fan_pwm: u32) -> f32 {
|
||||||
|
|
@ -99,8 +95,14 @@ impl FanCtrl {
|
||||||
return 0f32;
|
return 0f32;
|
||||||
}
|
}
|
||||||
let fan = self.fan.as_mut().unwrap();
|
let fan = self.fan.as_mut().unwrap();
|
||||||
let fan_pwm = fan_pwm.min(MAX_USER_FAN_PWM as u32).max(MIN_USER_FAN_PWM as u32);
|
let fan_pwm = fan_pwm.clamp(MIN_USER_FAN_PWM as u32, MAX_USER_FAN_PWM as u32);
|
||||||
let duty = scale_number(fan_pwm as f32, self.hw_settings.min_fan_pwm, self.hw_settings.max_fan_pwm, MIN_USER_FAN_PWM, MAX_USER_FAN_PWM);
|
let duty = scale_number(
|
||||||
|
fan_pwm as f32,
|
||||||
|
self.hw_settings.min_fan_pwm,
|
||||||
|
self.hw_settings.max_fan_pwm,
|
||||||
|
MIN_USER_FAN_PWM,
|
||||||
|
MAX_USER_FAN_PWM,
|
||||||
|
);
|
||||||
let max = fan.get_max_duty();
|
let max = fan.get_max_duty();
|
||||||
let value = ((duty * (max as f32)) as u16).min(max);
|
let value = ((duty * (max as f32)) as u16).min(max);
|
||||||
fan.set_duty(value);
|
fan.set_duty(value);
|
||||||
|
|
@ -119,8 +121,17 @@ impl FanCtrl {
|
||||||
if let Some(fan) = &self.fan {
|
if let Some(fan) = &self.fan {
|
||||||
let duty = fan.get_duty();
|
let duty = fan.get_duty();
|
||||||
let max = fan.get_max_duty();
|
let max = fan.get_max_duty();
|
||||||
scale_number(duty as f32 / (max as f32), MIN_USER_FAN_PWM, MAX_USER_FAN_PWM, self.hw_settings.min_fan_pwm, self.hw_settings.max_fan_pwm).round() as u32
|
scale_number(
|
||||||
} else { 0 }
|
duty as f32 / (max as f32),
|
||||||
|
MIN_USER_FAN_PWM,
|
||||||
|
MAX_USER_FAN_PWM,
|
||||||
|
self.hw_settings.min_fan_pwm,
|
||||||
|
self.hw_settings.max_fan_pwm,
|
||||||
|
)
|
||||||
|
.round() as u32
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn enable_pwm(&mut self) -> bool {
|
fn enable_pwm(&mut self) -> bool {
|
||||||
|
|
@ -136,7 +147,6 @@ impl FanCtrl {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
fn scale_number(unscaled: f32, to_min: f32, to_max: f32, from_min: f32, from_max: f32) -> f32 {
|
fn scale_number(unscaled: f32, to_min: f32, to_max: f32, from_min: f32, from_max: f32) -> f32 {
|
||||||
(to_max - to_min) * (unscaled - from_min) / (from_max - from_min) + to_min
|
(to_max - to_min) * (unscaled - from_min) / (from_max - from_min) + to_min
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
use log::{info, error};
|
use log::{error, info};
|
||||||
|
use sfkv::{Store, StoreBackend};
|
||||||
use stm32f4xx_hal::{
|
use stm32f4xx_hal::{
|
||||||
flash::{Error, FlashExt},
|
flash::{Error, FlashExt},
|
||||||
stm32::FLASH,
|
stm32::FLASH,
|
||||||
};
|
};
|
||||||
use sfkv::{Store, StoreBackend};
|
|
||||||
|
|
||||||
/// 16 KiB
|
/// 16 KiB
|
||||||
pub const FLASH_SECTOR_SIZE: usize = 0x4000;
|
pub const FLASH_SECTOR_SIZE: usize = 0x4000;
|
||||||
|
|
@ -21,9 +21,7 @@ pub struct FlashBackend {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_offset() -> usize {
|
fn get_offset() -> usize {
|
||||||
unsafe {
|
unsafe { (&_config_start as *const usize as usize) - (&_flash_start as *const usize as usize) }
|
||||||
(&_config_start as *const usize as usize) - (&_flash_start as *const usize as usize)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl StoreBackend for FlashBackend {
|
impl StoreBackend for FlashBackend {
|
||||||
|
|
@ -40,7 +38,8 @@ impl StoreBackend for FlashBackend {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn program(&mut self, offset: usize, payload: &[u8]) -> Result<(), Self::Error> {
|
fn program(&mut self, offset: usize, payload: &[u8]) -> Result<(), Self::Error> {
|
||||||
self.flash.unlocked()
|
self.flash
|
||||||
|
.unlocked()
|
||||||
.program(get_offset() + offset, payload.iter())
|
.program(get_offset() + offset, payload.iter())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -60,7 +59,8 @@ pub fn store(flash: FLASH) -> FlashStore {
|
||||||
Ok(_) => {}
|
Ok(_) => {}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("corrupt store, erasing. error: {:?}", e);
|
error!("corrupt store, erasing. error: {:?}", e);
|
||||||
let _ = store.erase()
|
let _ = store
|
||||||
|
.erase()
|
||||||
.map_err(|e| error!("flash erase failed: {:?}", e));
|
.map_err(|e| error!("flash erase failed: {:?}", e));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
|
|
||||||
use crate::{
|
use crate::{command_handler::JsonBuffer, pins::HWRevPins};
|
||||||
pins::HWRevPins,
|
|
||||||
command_handler::JsonBuffer,
|
|
||||||
};
|
|
||||||
|
|
||||||
#[derive(Serialize, Copy, Clone)]
|
#[derive(Serialize, Copy, Clone)]
|
||||||
pub struct HWRev {
|
pub struct HWRev {
|
||||||
|
|
@ -31,13 +28,17 @@ struct HWSummary<'a> {
|
||||||
|
|
||||||
impl HWRev {
|
impl HWRev {
|
||||||
pub fn detect_hw_rev(hwrev_pins: &HWRevPins) -> Self {
|
pub fn detect_hw_rev(hwrev_pins: &HWRevPins) -> Self {
|
||||||
let (h0, h1, h2, h3) = (hwrev_pins.hwrev0.is_high(), hwrev_pins.hwrev1.is_high(),
|
let (h0, h1, h2, h3) = (
|
||||||
hwrev_pins.hwrev2.is_high(), hwrev_pins.hwrev3.is_high());
|
hwrev_pins.hwrev0.is_high(),
|
||||||
|
hwrev_pins.hwrev1.is_high(),
|
||||||
|
hwrev_pins.hwrev2.is_high(),
|
||||||
|
hwrev_pins.hwrev3.is_high(),
|
||||||
|
);
|
||||||
match (h0, h1, h2, h3) {
|
match (h0, h1, h2, h3) {
|
||||||
(true, true, true, false) => HWRev { major: 1, minor: 0 },
|
(true, true, true, false) => HWRev { major: 1, minor: 0 },
|
||||||
(true, false, false, false) => HWRev { major: 2, minor: 0 },
|
(true, false, false, false) => HWRev { major: 2, minor: 0 },
|
||||||
(false, true, false, false) => HWRev { major: 2, minor: 2 },
|
(false, true, false, false) => HWRev { major: 2, minor: 2 },
|
||||||
(_, _, _, _) => HWRev { major: 0, minor: 0 }
|
(_, _, _, _) => HWRev { major: 0, minor: 0 },
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -70,13 +71,16 @@ impl HWRev {
|
||||||
fan_pwm_freq_hz: 0,
|
fan_pwm_freq_hz: 0,
|
||||||
fan_available: false,
|
fan_available: false,
|
||||||
fan_pwm_recommended: false,
|
fan_pwm_recommended: false,
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn summary(&self) -> Result<JsonBuffer, serde_json_core::ser::Error> {
|
pub fn summary(&self) -> Result<JsonBuffer, serde_json_core::ser::Error> {
|
||||||
let settings = self.settings();
|
let settings = self.settings();
|
||||||
let summary = HWSummary { rev: self, settings: &settings };
|
let summary = HWSummary {
|
||||||
|
rev: self,
|
||||||
|
settings: &settings,
|
||||||
|
};
|
||||||
serde_json_core::to_vec(&summary)
|
serde_json_core::to_vec(&summary)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -10,17 +10,15 @@ pub fn init_log() {
|
||||||
|
|
||||||
#[cfg(feature = "semihosting")]
|
#[cfg(feature = "semihosting")]
|
||||||
pub fn init_log() {
|
pub fn init_log() {
|
||||||
|
use cortex_m_log::log::{init, Logger};
|
||||||
|
use cortex_m_log::printer::semihosting::{hio::HStdout, InterruptOk};
|
||||||
use log::LevelFilter;
|
use log::LevelFilter;
|
||||||
use cortex_m_log::log::{Logger, init};
|
|
||||||
use cortex_m_log::printer::semihosting::{InterruptOk, hio::HStdout};
|
|
||||||
static mut LOGGER: Option<Logger<InterruptOk<HStdout>>> = None;
|
static mut LOGGER: Option<Logger<InterruptOk<HStdout>>> = None;
|
||||||
let logger = Logger {
|
let logger = Logger {
|
||||||
inner: InterruptOk::<_>::stdout().expect("semihosting stdout"),
|
inner: InterruptOk::<_>::stdout().expect("semihosting stdout"),
|
||||||
level: LevelFilter::Info,
|
level: LevelFilter::Info,
|
||||||
};
|
};
|
||||||
let logger = unsafe {
|
let logger = unsafe { LOGGER.get_or_insert(logger) };
|
||||||
LOGGER.get_or_insert(logger)
|
|
||||||
};
|
|
||||||
|
|
||||||
init(logger).expect("set logger");
|
init(logger).expect("set logger");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use stm32f4xx_hal::{
|
use stm32f4xx_hal::{
|
||||||
gpio::{
|
gpio::{
|
||||||
gpiod::{PD9, PD10, PD11},
|
gpiod::{PD10, PD11, PD9},
|
||||||
Output, PushPull,
|
Output, PushPull,
|
||||||
},
|
},
|
||||||
hal::digital::v2::OutputPin,
|
hal::digital::v2::OutputPin,
|
||||||
|
|
|
||||||
115
src/main.rs
115
src/main.rs
|
|
@ -8,30 +8,26 @@ use panic_halt as _;
|
||||||
#[cfg(all(feature = "semihosting", not(test)))]
|
#[cfg(all(feature = "semihosting", not(test)))]
|
||||||
use panic_semihosting as _;
|
use panic_semihosting as _;
|
||||||
|
|
||||||
use log::{error, info, warn};
|
|
||||||
use cortex_m::asm::wfi;
|
use cortex_m::asm::wfi;
|
||||||
use cortex_m_rt::entry;
|
use cortex_m_rt::entry;
|
||||||
|
use log::{error, info, warn};
|
||||||
|
use smoltcp::{socket::TcpSocket, time::Instant, wire::EthernetAddress};
|
||||||
use stm32f4xx_hal::{
|
use stm32f4xx_hal::{
|
||||||
hal::watchdog::{WatchdogEnable, Watchdog},
|
hal::watchdog::{Watchdog, WatchdogEnable},
|
||||||
rcc::RccExt,
|
rcc::RccExt,
|
||||||
stm32::{CorePeripherals, Peripherals, SCB},
|
stm32::{CorePeripherals, Peripherals, SCB},
|
||||||
time::{U32Ext, MegaHertz},
|
time::{MegaHertz, U32Ext},
|
||||||
watchdog::IndependentWatchdog,
|
watchdog::IndependentWatchdog,
|
||||||
};
|
};
|
||||||
use smoltcp::{
|
|
||||||
time::Instant,
|
|
||||||
socket::TcpSocket,
|
|
||||||
wire::EthernetAddress,
|
|
||||||
};
|
|
||||||
|
|
||||||
mod init_log;
|
mod init_log;
|
||||||
use init_log::init_log;
|
use init_log::init_log;
|
||||||
mod usb;
|
|
||||||
mod leds;
|
mod leds;
|
||||||
mod pins;
|
mod pins;
|
||||||
|
mod usb;
|
||||||
use pins::Pins;
|
use pins::Pins;
|
||||||
mod ad7172;
|
|
||||||
mod ad5680;
|
mod ad5680;
|
||||||
|
mod ad7172;
|
||||||
mod net;
|
mod net;
|
||||||
mod server;
|
mod server;
|
||||||
use server::Server;
|
use server::Server;
|
||||||
|
|
@ -39,18 +35,18 @@ mod session;
|
||||||
use session::{Session, SessionInput};
|
use session::{Session, SessionInput};
|
||||||
mod command_parser;
|
mod command_parser;
|
||||||
use command_parser::Ipv4Config;
|
use command_parser::Ipv4Config;
|
||||||
mod timer;
|
mod channels;
|
||||||
mod pid;
|
mod pid;
|
||||||
mod steinhart_hart;
|
mod steinhart_hart;
|
||||||
mod channels;
|
mod timer;
|
||||||
use channels::{CHANNELS, Channels};
|
use channels::{Channels, CHANNELS};
|
||||||
mod channel;
|
mod channel;
|
||||||
mod channel_state;
|
mod channel_state;
|
||||||
mod config;
|
mod config;
|
||||||
use config::ChannelConfig;
|
use config::ChannelConfig;
|
||||||
mod flash_store;
|
|
||||||
mod dfu;
|
|
||||||
mod command_handler;
|
mod command_handler;
|
||||||
|
mod dfu;
|
||||||
|
mod flash_store;
|
||||||
use command_handler::Handler;
|
use command_handler::Handler;
|
||||||
mod fan_ctrl;
|
mod fan_ctrl;
|
||||||
use fan_ctrl::FanCtrl;
|
use fan_ctrl::FanCtrl;
|
||||||
|
|
@ -73,19 +69,19 @@ fn send_line(socket: &mut TcpSocket, data: &[u8]) -> bool {
|
||||||
// instead of sending incomplete line
|
// instead of sending incomplete line
|
||||||
warn!(
|
warn!(
|
||||||
"TCP socket has only {}/{} needed {}",
|
"TCP socket has only {}/{} needed {}",
|
||||||
send_free + 1, socket.send_capacity(), data.len(),
|
send_free + 1,
|
||||||
|
socket.send_capacity(),
|
||||||
|
data.len(),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
match socket.send_slice(&data) {
|
match socket.send_slice(data) {
|
||||||
Ok(sent) if sent == data.len() => {
|
Ok(sent) if sent == data.len() => {
|
||||||
let _ = socket.send_slice(b"\n");
|
let _ = socket.send_slice(b"\n");
|
||||||
// success
|
// success
|
||||||
return true
|
return true;
|
||||||
}
|
}
|
||||||
Ok(sent) =>
|
Ok(sent) => warn!("sent only {}/{} bytes", sent, data.len()),
|
||||||
warn!("sent only {}/{} bytes", sent, data.len()),
|
Err(e) => error!("error sending line: {:?}", e),
|
||||||
Err(e) =>
|
|
||||||
error!("error sending line: {:?}", e),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// not success
|
// not success
|
||||||
|
|
@ -104,7 +100,9 @@ fn main() -> ! {
|
||||||
cp.SCB.enable_dcache(&mut cp.CPUID);
|
cp.SCB.enable_dcache(&mut cp.CPUID);
|
||||||
|
|
||||||
let dp = Peripherals::take().unwrap();
|
let dp = Peripherals::take().unwrap();
|
||||||
let clocks = dp.RCC.constrain()
|
let clocks = dp
|
||||||
|
.RCC
|
||||||
|
.constrain()
|
||||||
.cfgr
|
.cfgr
|
||||||
.use_hse(HSE)
|
.use_hse(HSE)
|
||||||
.sysclk(168.mhz())
|
.sysclk(168.mhz())
|
||||||
|
|
@ -120,14 +118,15 @@ fn main() -> ! {
|
||||||
timer::setup(cp.SYST, clocks);
|
timer::setup(cp.SYST, clocks);
|
||||||
|
|
||||||
let (pins, mut leds, mut eeprom, eth_pins, usb, fan, hwrev, hw_settings) = Pins::setup(
|
let (pins, mut leds, mut eeprom, eth_pins, usb, fan, hwrev, hw_settings) = Pins::setup(
|
||||||
clocks, dp.TIM1, dp.TIM3, dp.TIM8,
|
clocks,
|
||||||
|
(dp.TIM1, dp.TIM3, dp.TIM8),
|
||||||
|
(
|
||||||
dp.GPIOA, dp.GPIOB, dp.GPIOC, dp.GPIOD, dp.GPIOE, dp.GPIOF, dp.GPIOG,
|
dp.GPIOA, dp.GPIOB, dp.GPIOC, dp.GPIOD, dp.GPIOE, dp.GPIOF, dp.GPIOG,
|
||||||
|
),
|
||||||
dp.I2C1,
|
dp.I2C1,
|
||||||
dp.SPI2, dp.SPI4, dp.SPI5,
|
(dp.SPI2, dp.SPI4, dp.SPI5),
|
||||||
dp.ADC1,
|
dp.ADC1,
|
||||||
dp.OTG_FS_GLOBAL,
|
(dp.OTG_FS_GLOBAL, dp.OTG_FS_DEVICE, dp.OTG_FS_PWRCLK),
|
||||||
dp.OTG_FS_DEVICE,
|
|
||||||
dp.OTG_FS_PWRCLK,
|
|
||||||
);
|
);
|
||||||
|
|
||||||
leds.r1.on();
|
leds.r1.on();
|
||||||
|
|
@ -139,14 +138,11 @@ fn main() -> ! {
|
||||||
let mut store = flash_store::store(dp.FLASH);
|
let mut store = flash_store::store(dp.FLASH);
|
||||||
|
|
||||||
let mut channels = Channels::new(pins);
|
let mut channels = Channels::new(pins);
|
||||||
for c in 0..CHANNELS {
|
for (c, key) in CHANNEL_CONFIG_KEY.iter().enumerate().take(CHANNELS) {
|
||||||
match store.read_value::<ChannelConfig>(CHANNEL_CONFIG_KEY[c]) {
|
match store.read_value::<ChannelConfig>(key) {
|
||||||
Ok(Some(config)) =>
|
Ok(Some(config)) => config.apply(&mut channels, c),
|
||||||
config.apply(&mut channels, c),
|
Ok(None) => error!("flash config not found for channel {}", c),
|
||||||
Ok(None) =>
|
Err(e) => error!("unable to load config {} from flash: {:?}", c, e),
|
||||||
error!("flash config not found for channel {}", c),
|
|
||||||
Err(e) =>
|
|
||||||
error!("unable to load config {} from flash: {:?}", c, e),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -159,11 +155,9 @@ fn main() -> ! {
|
||||||
gateway: None,
|
gateway: None,
|
||||||
};
|
};
|
||||||
match store.read_value("ipv4") {
|
match store.read_value("ipv4") {
|
||||||
Ok(Some(config)) =>
|
Ok(Some(config)) => ipv4_config = config,
|
||||||
ipv4_config = config,
|
|
||||||
Ok(None) => {}
|
Ok(None) => {}
|
||||||
Err(e) =>
|
Err(e) => error!("cannot read ipv4 config: {:?}", e),
|
||||||
error!("cannot read ipv4 config: {:?}", e),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EEPROM ships with a read-only EUI-48 identifier
|
// EEPROM ships with a read-only EUI-48 identifier
|
||||||
|
|
@ -172,7 +166,14 @@ fn main() -> ! {
|
||||||
let hwaddr = EthernetAddress(eui48);
|
let hwaddr = EthernetAddress(eui48);
|
||||||
info!("EEPROM MAC address: {}", hwaddr);
|
info!("EEPROM MAC address: {}", hwaddr);
|
||||||
|
|
||||||
net::run(clocks, dp.ETHERNET_MAC, dp.ETHERNET_DMA, eth_pins, hwaddr, ipv4_config.clone(), |iface| {
|
net::run(
|
||||||
|
clocks,
|
||||||
|
dp.ETHERNET_MAC,
|
||||||
|
dp.ETHERNET_DMA,
|
||||||
|
eth_pins,
|
||||||
|
hwaddr,
|
||||||
|
ipv4_config.clone(),
|
||||||
|
|iface| {
|
||||||
Server::<Session>::run(iface, |server| {
|
Server::<Session>::run(iface, |server| {
|
||||||
leds.r1.off();
|
leds.r1.off();
|
||||||
let mut should_reset = false;
|
let mut should_reset = false;
|
||||||
|
|
@ -192,15 +193,14 @@ fn main() -> ! {
|
||||||
|
|
||||||
let instant = Instant::from_millis(i64::from(timer::now()));
|
let instant = Instant::from_millis(i64::from(timer::now()));
|
||||||
cortex_m::interrupt::free(net::clear_pending);
|
cortex_m::interrupt::free(net::clear_pending);
|
||||||
server.poll(instant)
|
server.poll(instant).unwrap_or_else(|e| {
|
||||||
.unwrap_or_else(|e| {
|
|
||||||
warn!("poll: {:?}", e);
|
warn!("poll: {:?}", e);
|
||||||
});
|
});
|
||||||
|
|
||||||
if ! should_reset {
|
if !should_reset {
|
||||||
// TCP protocol handling
|
// TCP protocol handling
|
||||||
server.for_each(|mut socket, session| {
|
server.for_each(|mut socket, session| {
|
||||||
if ! socket.is_active() {
|
if !socket.is_active() {
|
||||||
let _ = socket.listen(TCP_PORT);
|
let _ = socket.listen(TCP_PORT);
|
||||||
session.reset();
|
session.reset();
|
||||||
} else if socket.may_send() && !socket.may_recv() {
|
} else if socket.may_send() && !socket.may_recv() {
|
||||||
|
|
@ -213,20 +213,27 @@ fn main() -> ! {
|
||||||
// Do nothing and feed more data to the line reader in the next loop cycle.
|
// Do nothing and feed more data to the line reader in the next loop cycle.
|
||||||
Ok(SessionInput::Nothing) => {}
|
Ok(SessionInput::Nothing) => {}
|
||||||
Ok(SessionInput::Command(command)) => {
|
Ok(SessionInput::Command(command)) => {
|
||||||
match Handler::handle_command(command, &mut socket, &mut channels, &mut store, &mut ipv4_config, &mut fan_ctrl, hwrev) {
|
match Handler::handle_command(
|
||||||
|
command,
|
||||||
|
&mut socket,
|
||||||
|
&mut channels,
|
||||||
|
&mut store,
|
||||||
|
&mut ipv4_config,
|
||||||
|
&mut fan_ctrl,
|
||||||
|
hwrev,
|
||||||
|
) {
|
||||||
Ok(Handler::NewIPV4(ip)) => new_ipv4_config = Some(ip),
|
Ok(Handler::NewIPV4(ip)) => new_ipv4_config = Some(ip),
|
||||||
Ok(Handler::Handled) => {},
|
Ok(Handler::Handled) => {}
|
||||||
Ok(Handler::CloseSocket) => socket.close(),
|
Ok(Handler::CloseSocket) => socket.close(),
|
||||||
Ok(Handler::Reset) => should_reset = true,
|
Ok(Handler::Reset) => should_reset = true,
|
||||||
Err(_) => {},
|
Err(_) => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(SessionInput::Error(e)) => {
|
Ok(SessionInput::Error(e)) => {
|
||||||
error!("session input: {:?}", e);
|
error!("session input: {:?}", e);
|
||||||
send_line(&mut socket, b"{ \"error\": \"invalid input\" }");
|
send_line(&mut socket, b"{ \"error\": \"invalid input\" }");
|
||||||
}
|
}
|
||||||
Err(_) =>
|
Err(_) => socket.close(),
|
||||||
socket.close(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -247,11 +254,10 @@ fn main() -> ! {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply new IPv4 address/gateway
|
// Apply new IPv4 address/gateway
|
||||||
new_ipv4_config.take()
|
if let Some(config) = new_ipv4_config.take() {
|
||||||
.map(|config| {
|
|
||||||
server.set_ipv4_config(config.clone());
|
server.set_ipv4_config(config.clone());
|
||||||
ipv4_config = config;
|
ipv4_config = config;
|
||||||
});
|
};
|
||||||
|
|
||||||
// Update watchdog
|
// Update watchdog
|
||||||
wd.feed();
|
wd.feed();
|
||||||
|
|
@ -267,7 +273,8 @@ fn main() -> ! {
|
||||||
leds.g4.on();
|
leds.g4.on();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
},
|
||||||
|
);
|
||||||
|
|
||||||
unreachable!()
|
unreachable!()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
52
src/net.rs
52
src/net.rs
|
|
@ -1,20 +1,17 @@
|
||||||
//! As there is only one peripheral, supporting data structures are
|
//! As there is only one peripheral, supporting data structures are
|
||||||
//! declared once and globally.
|
//! declared once and globally.
|
||||||
|
|
||||||
use core::cell::RefCell;
|
|
||||||
use cortex_m::interrupt::{CriticalSection, Mutex};
|
|
||||||
use stm32f4xx_hal::{
|
|
||||||
rcc::Clocks,
|
|
||||||
pac::{interrupt, Peripherals, ETHERNET_MAC, ETHERNET_DMA},
|
|
||||||
};
|
|
||||||
use smoltcp::wire::{EthernetAddress, Ipv4Address, Ipv4Cidr};
|
|
||||||
use smoltcp::iface::{
|
|
||||||
EthernetInterfaceBuilder, EthernetInterface,
|
|
||||||
NeighborCache, Routes,
|
|
||||||
};
|
|
||||||
use stm32_eth::{Eth, RingEntry, RxDescriptor, TxDescriptor};
|
|
||||||
use crate::command_parser::Ipv4Config;
|
use crate::command_parser::Ipv4Config;
|
||||||
use crate::pins::EthernetPins;
|
use crate::pins::EthernetPins;
|
||||||
|
use core::cell::RefCell;
|
||||||
|
use cortex_m::interrupt::{CriticalSection, Mutex};
|
||||||
|
use smoltcp::iface::{EthernetInterface, EthernetInterfaceBuilder, NeighborCache, Routes};
|
||||||
|
use smoltcp::wire::{EthernetAddress, Ipv4Address, Ipv4Cidr};
|
||||||
|
use stm32_eth::{Eth, RingEntry, RxDescriptor, TxDescriptor};
|
||||||
|
use stm32f4xx_hal::{
|
||||||
|
pac::{interrupt, Peripherals, ETHERNET_DMA, ETHERNET_MAC},
|
||||||
|
rcc::Clocks,
|
||||||
|
};
|
||||||
|
|
||||||
/// Not on the stack so that stack can be placed in CCMRAM (which the
|
/// Not on the stack so that stack can be placed in CCMRAM (which the
|
||||||
/// ethernet peripheral cannot access)
|
/// ethernet peripheral cannot access)
|
||||||
|
|
@ -30,27 +27,27 @@ static NET_PENDING: Mutex<RefCell<bool>> = Mutex::new(RefCell::new(false));
|
||||||
/// Run callback `f` with ethernet driver and TCP/IP stack
|
/// Run callback `f` with ethernet driver and TCP/IP stack
|
||||||
pub fn run<F>(
|
pub fn run<F>(
|
||||||
clocks: Clocks,
|
clocks: Clocks,
|
||||||
ethernet_mac: ETHERNET_MAC, ethernet_dma: ETHERNET_DMA,
|
ethernet_mac: ETHERNET_MAC,
|
||||||
|
ethernet_dma: ETHERNET_DMA,
|
||||||
eth_pins: EthernetPins,
|
eth_pins: EthernetPins,
|
||||||
ethernet_addr: EthernetAddress,
|
ethernet_addr: EthernetAddress,
|
||||||
ipv4_config: Ipv4Config,
|
ipv4_config: Ipv4Config,
|
||||||
f: F
|
f: F,
|
||||||
) where
|
) where
|
||||||
F: FnOnce(EthernetInterface<&mut stm32_eth::Eth<'static, 'static>>),
|
F: FnOnce(EthernetInterface<&mut stm32_eth::Eth<'static, 'static>>),
|
||||||
{
|
{
|
||||||
let rx_ring = unsafe {
|
let rx_ring = unsafe { RX_RING.get_or_insert(Default::default()) };
|
||||||
RX_RING.get_or_insert(Default::default())
|
let tx_ring = unsafe { TX_RING.get_or_insert(Default::default()) };
|
||||||
};
|
|
||||||
let tx_ring = unsafe {
|
|
||||||
TX_RING.get_or_insert(Default::default())
|
|
||||||
};
|
|
||||||
// Ethernet driver
|
// Ethernet driver
|
||||||
let mut eth_dev = Eth::new(
|
let mut eth_dev = Eth::new(
|
||||||
ethernet_mac, ethernet_dma,
|
ethernet_mac,
|
||||||
&mut rx_ring[..], &mut tx_ring[..],
|
ethernet_dma,
|
||||||
|
&mut rx_ring[..],
|
||||||
|
&mut tx_ring[..],
|
||||||
clocks,
|
clocks,
|
||||||
eth_pins,
|
eth_pins,
|
||||||
).unwrap();
|
)
|
||||||
|
.unwrap();
|
||||||
eth_dev.enable_interrupt();
|
eth_dev.enable_interrupt();
|
||||||
|
|
||||||
// IP stack
|
// IP stack
|
||||||
|
|
@ -76,8 +73,7 @@ pub fn run<F>(
|
||||||
#[interrupt]
|
#[interrupt]
|
||||||
fn ETH() {
|
fn ETH() {
|
||||||
cortex_m::interrupt::free(|cs| {
|
cortex_m::interrupt::free(|cs| {
|
||||||
*NET_PENDING.borrow(cs)
|
*NET_PENDING.borrow(cs).borrow_mut() = true;
|
||||||
.borrow_mut() = true;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let p = unsafe { Peripherals::steal() };
|
let p = unsafe { Peripherals::steal() };
|
||||||
|
|
@ -86,15 +82,13 @@ fn ETH() {
|
||||||
|
|
||||||
/// Has an interrupt occurred since last call to `clear_pending()`?
|
/// Has an interrupt occurred since last call to `clear_pending()`?
|
||||||
pub fn is_pending(cs: &CriticalSection) -> bool {
|
pub fn is_pending(cs: &CriticalSection) -> bool {
|
||||||
*NET_PENDING.borrow(cs)
|
*NET_PENDING.borrow(cs).borrow()
|
||||||
.borrow()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Clear the interrupt pending flag before polling the interface for
|
/// Clear the interrupt pending flag before polling the interface for
|
||||||
/// data.
|
/// data.
|
||||||
pub fn clear_pending(cs: &CriticalSection) {
|
pub fn clear_pending(cs: &CriticalSection) {
|
||||||
*NET_PENDING.borrow(cs)
|
*NET_PENDING.borrow(cs).borrow_mut() = false;
|
||||||
.borrow_mut() = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// utility for destructuring into smoltcp types
|
/// utility for destructuring into smoltcp types
|
||||||
|
|
|
||||||
25
src/pid.rs
25
src/pid.rs
|
|
@ -1,4 +1,4 @@
|
||||||
use serde::{Serialize, Deserialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||||
pub struct Parameters {
|
pub struct Parameters {
|
||||||
|
|
@ -29,22 +29,22 @@ impl Default for Parameters {
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct Controller {
|
pub struct Controller {
|
||||||
pub parameters: Parameters,
|
pub parameters: Parameters,
|
||||||
pub target : f64,
|
pub target: f64,
|
||||||
u1 : f64,
|
u1: f64,
|
||||||
x1 : f64,
|
x1: f64,
|
||||||
x2 : f64,
|
x2: f64,
|
||||||
pub y1 : f64,
|
pub y1: f64,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Controller {
|
impl Controller {
|
||||||
pub const fn new(parameters: Parameters) -> Controller {
|
pub const fn new(parameters: Parameters) -> Controller {
|
||||||
Controller {
|
Controller {
|
||||||
parameters: parameters,
|
parameters,
|
||||||
target : 0.0,
|
target: 0.0,
|
||||||
u1 : 0.0,
|
u1: 0.0,
|
||||||
x1 : 0.0,
|
x1: 0.0,
|
||||||
x2 : 0.0,
|
x2: 0.0,
|
||||||
y1 : 0.0,
|
y1: 0.0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -56,7 +56,6 @@ impl Controller {
|
||||||
// + x2 * kd
|
// + x2 * kd
|
||||||
// y0 = clip(y0', ymin, ymax)
|
// y0 = clip(y0', ymin, ymax)
|
||||||
pub fn update(&mut self, input: f64) -> f64 {
|
pub fn update(&mut self, input: f64) -> f64 {
|
||||||
|
|
||||||
let mut output: f64 = self.y1 - self.target * f64::from(self.parameters.ki)
|
let mut output: f64 = self.y1 - self.target * f64::from(self.parameters.ki)
|
||||||
+ input * f64::from(self.parameters.kp + self.parameters.ki + self.parameters.kd)
|
+ input * f64::from(self.parameters.kp + self.parameters.ki + self.parameters.kd)
|
||||||
- self.x1 * f64::from(self.parameters.kp + 2.0 * self.parameters.kd)
|
- self.x1 * f64::from(self.parameters.kp + 2.0 * self.parameters.kd)
|
||||||
|
|
|
||||||
209
src/pins.rs
209
src/pins.rs
|
|
@ -1,49 +1,41 @@
|
||||||
|
use crate::{
|
||||||
|
channel::{Channel0, Channel1},
|
||||||
|
fan_ctrl::FanPin,
|
||||||
|
hw_rev::{HWRev, HWSettings},
|
||||||
|
leds::Leds,
|
||||||
|
};
|
||||||
|
use eeprom24x::{self, Eeprom24x};
|
||||||
|
use stm32_eth::EthPins;
|
||||||
use stm32f4xx_hal::{
|
use stm32f4xx_hal::{
|
||||||
adc::Adc,
|
adc::Adc,
|
||||||
gpio::{
|
gpio::{
|
||||||
AF5, Alternate, AlternateOD, Analog, Floating, Input,
|
gpioa::*, gpiob::*, gpioc::*, gpioe::*, gpiof::*, gpiog::*, Alternate, AlternateOD, Analog,
|
||||||
gpioa::*,
|
Floating, GpioExt, Input, Output, PushPull, AF5,
|
||||||
gpiob::*,
|
|
||||||
gpioc::*,
|
|
||||||
gpioe::*,
|
|
||||||
gpiof::*,
|
|
||||||
gpiog::*,
|
|
||||||
GpioExt,
|
|
||||||
Output, PushPull,
|
|
||||||
},
|
},
|
||||||
hal::{self, blocking::spi::Transfer, digital::v2::OutputPin},
|
hal::{self, blocking::spi::Transfer, digital::v2::OutputPin},
|
||||||
i2c::I2c,
|
i2c::I2c,
|
||||||
otg_fs::USB,
|
otg_fs::USB,
|
||||||
rcc::Clocks,
|
|
||||||
pwm::{self, PwmChannels},
|
|
||||||
spi::{Spi, NoMiso, TransferModeNormal},
|
|
||||||
pac::{
|
pac::{
|
||||||
ADC1,
|
ADC1, GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, GPIOF, GPIOG, I2C1, OTG_FS_DEVICE, OTG_FS_GLOBAL,
|
||||||
GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, GPIOF, GPIOG,
|
OTG_FS_PWRCLK, SPI2, SPI4, SPI5, TIM1, TIM3, TIM8,
|
||||||
I2C1,
|
|
||||||
OTG_FS_GLOBAL, OTG_FS_DEVICE, OTG_FS_PWRCLK,
|
|
||||||
SPI2, SPI4, SPI5,
|
|
||||||
TIM1, TIM3, TIM8
|
|
||||||
},
|
},
|
||||||
timer::Timer,
|
pwm::{self, PwmChannels},
|
||||||
|
rcc::Clocks,
|
||||||
|
spi::{NoMiso, Spi, TransferModeNormal},
|
||||||
time::U32Ext,
|
time::U32Ext,
|
||||||
};
|
timer::Timer,
|
||||||
use eeprom24x::{self, Eeprom24x};
|
|
||||||
use stm32_eth::EthPins;
|
|
||||||
use crate::{
|
|
||||||
channel::{Channel0, Channel1},
|
|
||||||
leds::Leds,
|
|
||||||
fan_ctrl::FanPin,
|
|
||||||
hw_rev::{HWRev, HWSettings},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
pub type Eeprom = Eeprom24x<
|
pub type Eeprom = Eeprom24x<
|
||||||
I2c<I2C1, (
|
I2c<
|
||||||
|
I2C1,
|
||||||
|
(
|
||||||
PB8<AlternateOD<{ stm32f4xx_hal::gpio::AF4 }>>,
|
PB8<AlternateOD<{ stm32f4xx_hal::gpio::AF4 }>>,
|
||||||
PB9<AlternateOD<{ stm32f4xx_hal::gpio::AF4 }>>
|
PB9<AlternateOD<{ stm32f4xx_hal::gpio::AF4 }>>,
|
||||||
)>,
|
),
|
||||||
|
>,
|
||||||
eeprom24x::page_size::B8,
|
eeprom24x::page_size::B8,
|
||||||
eeprom24x::addr_size::OneByte
|
eeprom24x::addr_size::OneByte,
|
||||||
>;
|
>;
|
||||||
|
|
||||||
pub type EthernetPins = EthPins<
|
pub type EthernetPins = EthPins<
|
||||||
|
|
@ -54,7 +46,7 @@ pub type EthernetPins = EthPins<
|
||||||
PB13<Input<Floating>>,
|
PB13<Input<Floating>>,
|
||||||
PC4<Input<Floating>>,
|
PC4<Input<Floating>>,
|
||||||
PC5<Input<Floating>>,
|
PC5<Input<Floating>>,
|
||||||
>;
|
>;
|
||||||
|
|
||||||
pub trait ChannelPins {
|
pub trait ChannelPins {
|
||||||
type DacSpi: Transfer<u8>;
|
type DacSpi: Transfer<u8>;
|
||||||
|
|
@ -97,7 +89,15 @@ impl ChannelPins for Channel1 {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// SPI peripheral used for communication with the ADC
|
/// SPI peripheral used for communication with the ADC
|
||||||
pub type AdcSpi = Spi<SPI2, (PB10<Alternate<AF5>>, PB14<Alternate<AF5>>, PB15<Alternate<AF5>>), TransferModeNormal>;
|
pub type AdcSpi = Spi<
|
||||||
|
SPI2,
|
||||||
|
(
|
||||||
|
PB10<Alternate<AF5>>,
|
||||||
|
PB14<Alternate<AF5>>,
|
||||||
|
PB15<Alternate<AF5>>,
|
||||||
|
),
|
||||||
|
TransferModeNormal,
|
||||||
|
>;
|
||||||
pub type AdcNss = PB12<Output<PushPull>>;
|
pub type AdcNss = PB12<Output<PushPull>>;
|
||||||
type Dac0Spi = Spi<SPI4, (PE2<Alternate<AF5>>, NoMiso, PE6<Alternate<AF5>>), TransferModeNormal>;
|
type Dac0Spi = Spi<SPI4, (PE2<Alternate<AF5>>, NoMiso, PE6<Alternate<AF5>>), TransferModeNormal>;
|
||||||
type Dac1Spi = Spi<SPI5, (PF7<Alternate<AF5>>, NoMiso, PF9<Alternate<AF5>>), TransferModeNormal>;
|
type Dac1Spi = Spi<SPI5, (PF7<Alternate<AF5>>, NoMiso, PF9<Alternate<AF5>>), TransferModeNormal>;
|
||||||
|
|
@ -133,13 +133,34 @@ impl Pins {
|
||||||
/// Setup GPIO pins and configure MCU peripherals
|
/// Setup GPIO pins and configure MCU peripherals
|
||||||
pub fn setup(
|
pub fn setup(
|
||||||
clocks: Clocks,
|
clocks: Clocks,
|
||||||
tim1: TIM1, tim3: TIM3, tim8: TIM8,
|
(tim1, tim3, tim8): (TIM1, TIM3, TIM8),
|
||||||
gpioa: GPIOA, gpiob: GPIOB, gpioc: GPIOC, gpiod: GPIOD, gpioe: GPIOE, gpiof: GPIOF, gpiog: GPIOG,
|
(gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, gpiog): (
|
||||||
|
GPIOA,
|
||||||
|
GPIOB,
|
||||||
|
GPIOC,
|
||||||
|
GPIOD,
|
||||||
|
GPIOE,
|
||||||
|
GPIOF,
|
||||||
|
GPIOG,
|
||||||
|
),
|
||||||
i2c1: I2C1,
|
i2c1: I2C1,
|
||||||
spi2: SPI2, spi4: SPI4, spi5: SPI5,
|
(spi2, spi4, spi5): (SPI2, SPI4, SPI5),
|
||||||
adc1: ADC1,
|
adc1: ADC1,
|
||||||
otg_fs_global: OTG_FS_GLOBAL, otg_fs_device: OTG_FS_DEVICE, otg_fs_pwrclk: OTG_FS_PWRCLK,
|
(otg_fs_global, otg_fs_device, otg_fs_pwrclk): (
|
||||||
) -> (Self, Leds, Eeprom, EthernetPins, USB, Option<FanPin>, HWRev, HWSettings) {
|
OTG_FS_GLOBAL,
|
||||||
|
OTG_FS_DEVICE,
|
||||||
|
OTG_FS_PWRCLK,
|
||||||
|
),
|
||||||
|
) -> (
|
||||||
|
Self,
|
||||||
|
Leds,
|
||||||
|
Eeprom,
|
||||||
|
EthernetPins,
|
||||||
|
USB,
|
||||||
|
Option<FanPin>,
|
||||||
|
HWRev,
|
||||||
|
HWSettings,
|
||||||
|
) {
|
||||||
let gpioa = gpioa.split();
|
let gpioa = gpioa.split();
|
||||||
let gpiob = gpiob.split();
|
let gpiob = gpiob.split();
|
||||||
let gpioc = gpioc.split();
|
let gpioc = gpioc.split();
|
||||||
|
|
@ -154,23 +175,29 @@ impl Pins {
|
||||||
let pins_adc = Adc::adc1(adc1, true, Default::default());
|
let pins_adc = Adc::adc1(adc1, true, Default::default());
|
||||||
|
|
||||||
let pwm = PwmPins::setup(
|
let pwm = PwmPins::setup(
|
||||||
clocks, tim1, tim3,
|
clocks,
|
||||||
gpioc.pc6, gpioc.pc7,
|
(tim1, tim3),
|
||||||
gpioe.pe9, gpioe.pe11,
|
(gpioc.pc6, gpioc.pc7),
|
||||||
gpioe.pe13, gpioe.pe14
|
(gpioe.pe9, gpioe.pe11),
|
||||||
|
(gpioe.pe13, gpioe.pe14),
|
||||||
);
|
);
|
||||||
|
|
||||||
let hwrev = HWRev::detect_hw_rev(&HWRevPins {hwrev0: gpiod.pd0, hwrev1: gpiod.pd1,
|
let hwrev = HWRev::detect_hw_rev(&HWRevPins {
|
||||||
hwrev2: gpiod.pd2, hwrev3: gpiod.pd3});
|
hwrev0: gpiod.pd0,
|
||||||
|
hwrev1: gpiod.pd1,
|
||||||
|
hwrev2: gpiod.pd2,
|
||||||
|
hwrev3: gpiod.pd3,
|
||||||
|
});
|
||||||
let hw_settings = hwrev.settings();
|
let hw_settings = hwrev.settings();
|
||||||
|
|
||||||
let (dac0_spi, dac0_sync) = Self::setup_dac0(
|
let (dac0_spi, dac0_sync) = Self::setup_dac0(clocks, spi4, gpioe.pe2, gpioe.pe4, gpioe.pe6);
|
||||||
clocks, spi4,
|
|
||||||
gpioe.pe2, gpioe.pe4, gpioe.pe6
|
|
||||||
);
|
|
||||||
let mut shdn0 = gpioe.pe10.into_push_pull_output();
|
let mut shdn0 = gpioe.pe10.into_push_pull_output();
|
||||||
let _ = shdn0.set_low();
|
shdn0.set_low();
|
||||||
let vref0_pin = if hwrev.major > 2 {Channel0VRef::Analog(gpioa.pa0.into_analog())} else {Channel0VRef::Disabled(gpioa.pa0)};
|
let vref0_pin = if hwrev.major > 2 {
|
||||||
|
Channel0VRef::Analog(gpioa.pa0.into_analog())
|
||||||
|
} else {
|
||||||
|
Channel0VRef::Disabled(gpioa.pa0)
|
||||||
|
};
|
||||||
let itec0_pin = gpioa.pa6.into_analog();
|
let itec0_pin = gpioa.pa6.into_analog();
|
||||||
let dac_feedback0_pin = gpioa.pa4.into_analog();
|
let dac_feedback0_pin = gpioa.pa4.into_analog();
|
||||||
let tec_u_meas0_pin = gpioc.pc2.into_analog();
|
let tec_u_meas0_pin = gpioc.pc2.into_analog();
|
||||||
|
|
@ -184,13 +211,14 @@ impl Pins {
|
||||||
tec_u_meas_pin: tec_u_meas0_pin,
|
tec_u_meas_pin: tec_u_meas0_pin,
|
||||||
};
|
};
|
||||||
|
|
||||||
let (dac1_spi, dac1_sync) = Self::setup_dac1(
|
let (dac1_spi, dac1_sync) = Self::setup_dac1(clocks, spi5, gpiof.pf7, gpiof.pf6, gpiof.pf9);
|
||||||
clocks, spi5,
|
|
||||||
gpiof.pf7, gpiof.pf6, gpiof.pf9
|
|
||||||
);
|
|
||||||
let mut shdn1 = gpioe.pe15.into_push_pull_output();
|
let mut shdn1 = gpioe.pe15.into_push_pull_output();
|
||||||
let _ = shdn1.set_low();
|
shdn1.set_low();
|
||||||
let vref1_pin = if hwrev.major > 2 {Channel1VRef::Analog(gpioa.pa3.into_analog())} else {Channel1VRef::Disabled(gpioa.pa3)};
|
let vref1_pin = if hwrev.major > 2 {
|
||||||
|
Channel1VRef::Analog(gpioa.pa3.into_analog())
|
||||||
|
} else {
|
||||||
|
Channel1VRef::Disabled(gpioa.pa3)
|
||||||
|
};
|
||||||
let itec1_pin = gpiob.pb0.into_analog();
|
let itec1_pin = gpiob.pb0.into_analog();
|
||||||
let dac_feedback1_pin = gpioa.pa5.into_analog();
|
let dac_feedback1_pin = gpioa.pa5.into_analog();
|
||||||
let tec_u_meas1_pin = gpioc.pc3.into_analog();
|
let tec_u_meas1_pin = gpioc.pc3.into_analog();
|
||||||
|
|
@ -205,14 +233,19 @@ impl Pins {
|
||||||
};
|
};
|
||||||
|
|
||||||
let pins = Pins {
|
let pins = Pins {
|
||||||
adc_spi, adc_nss,
|
adc_spi,
|
||||||
|
adc_nss,
|
||||||
pins_adc,
|
pins_adc,
|
||||||
pwm,
|
pwm,
|
||||||
channel0,
|
channel0,
|
||||||
channel1,
|
channel1,
|
||||||
};
|
};
|
||||||
|
|
||||||
let leds = Leds::new(gpiod.pd9, gpiod.pd10.into_push_pull_output(), gpiod.pd11.into_push_pull_output());
|
let leds = Leds::new(
|
||||||
|
gpiod.pd9,
|
||||||
|
gpiod.pd10.into_push_pull_output(),
|
||||||
|
gpiod.pd11.into_push_pull_output(),
|
||||||
|
);
|
||||||
|
|
||||||
let eeprom_scl = gpiob.pb8.into_alternate().set_open_drain();
|
let eeprom_scl = gpiob.pb8.into_alternate().set_open_drain();
|
||||||
let eeprom_sda = gpiob.pb9.into_alternate().set_open_drain();
|
let eeprom_sda = gpiob.pb9.into_alternate().set_open_drain();
|
||||||
|
|
@ -239,8 +272,13 @@ impl Pins {
|
||||||
};
|
};
|
||||||
|
|
||||||
let fan = if hw_settings.fan_available {
|
let fan = if hw_settings.fan_available {
|
||||||
Some(Timer::new(tim8, &clocks).pwm(gpioc.pc9.into_alternate(), hw_settings.fan_pwm_freq_hz.hz()))
|
Some(
|
||||||
} else { None };
|
Timer::new(tim8, &clocks)
|
||||||
|
.pwm(gpioc.pc9.into_alternate(), hw_settings.fan_pwm_freq_hz.hz()),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
(pins, leds, eeprom, eth_pins, usb, fan, hwrev, hw_settings)
|
(pins, leds, eeprom, eth_pins, usb, fan, hwrev, hw_settings)
|
||||||
}
|
}
|
||||||
|
|
@ -252,8 +290,7 @@ impl Pins {
|
||||||
sck: PB10<M1>,
|
sck: PB10<M1>,
|
||||||
miso: PB14<M2>,
|
miso: PB14<M2>,
|
||||||
mosi: PB15<M3>,
|
mosi: PB15<M3>,
|
||||||
) -> AdcSpi
|
) -> AdcSpi {
|
||||||
{
|
|
||||||
let sck = sck.into_alternate();
|
let sck = sck.into_alternate();
|
||||||
let miso = miso.into_alternate();
|
let miso = miso.into_alternate();
|
||||||
let mosi = mosi.into_alternate();
|
let mosi = mosi.into_alternate();
|
||||||
|
|
@ -262,13 +299,16 @@ impl Pins {
|
||||||
(sck, miso, mosi),
|
(sck, miso, mosi),
|
||||||
crate::ad7172::SPI_MODE,
|
crate::ad7172::SPI_MODE,
|
||||||
crate::ad7172::SPI_CLOCK,
|
crate::ad7172::SPI_CLOCK,
|
||||||
clocks
|
clocks,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn setup_dac0<M1, M2, M3>(
|
fn setup_dac0<M1, M2, M3>(
|
||||||
clocks: Clocks, spi4: SPI4,
|
clocks: Clocks,
|
||||||
sclk: PE2<M1>, sync: PE4<M2>, sdin: PE6<M3>
|
spi4: SPI4,
|
||||||
|
sclk: PE2<M1>,
|
||||||
|
sync: PE4<M2>,
|
||||||
|
sdin: PE6<M3>,
|
||||||
) -> (Dac0Spi, <Channel0 as ChannelPins>::DacSync) {
|
) -> (Dac0Spi, <Channel0 as ChannelPins>::DacSync) {
|
||||||
let sclk = sclk.into_alternate();
|
let sclk = sclk.into_alternate();
|
||||||
let sdin = sdin.into_alternate();
|
let sdin = sdin.into_alternate();
|
||||||
|
|
@ -277,7 +317,7 @@ impl Pins {
|
||||||
(sclk, NoMiso {}, sdin),
|
(sclk, NoMiso {}, sdin),
|
||||||
crate::ad5680::SPI_MODE,
|
crate::ad5680::SPI_MODE,
|
||||||
crate::ad5680::SPI_CLOCK,
|
crate::ad5680::SPI_CLOCK,
|
||||||
clocks
|
clocks,
|
||||||
);
|
);
|
||||||
let sync = sync.into_push_pull_output();
|
let sync = sync.into_push_pull_output();
|
||||||
|
|
||||||
|
|
@ -285,8 +325,11 @@ impl Pins {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn setup_dac1<M1, M2, M3>(
|
fn setup_dac1<M1, M2, M3>(
|
||||||
clocks: Clocks, spi5: SPI5,
|
clocks: Clocks,
|
||||||
sclk: PF7<M1>, sync: PF6<M2>, sdin: PF9<M3>
|
spi5: SPI5,
|
||||||
|
sclk: PF7<M1>,
|
||||||
|
sync: PF6<M2>,
|
||||||
|
sdin: PF9<M3>,
|
||||||
) -> (Dac1Spi, <Channel1 as ChannelPins>::DacSync) {
|
) -> (Dac1Spi, <Channel1 as ChannelPins>::DacSync) {
|
||||||
let sclk = sclk.into_alternate();
|
let sclk = sclk.into_alternate();
|
||||||
let sdin = sdin.into_alternate();
|
let sdin = sdin.into_alternate();
|
||||||
|
|
@ -295,7 +338,7 @@ impl Pins {
|
||||||
(sclk, NoMiso {}, sdin),
|
(sclk, NoMiso {}, sdin),
|
||||||
crate::ad5680::SPI_MODE,
|
crate::ad5680::SPI_MODE,
|
||||||
crate::ad5680::SPI_CLOCK,
|
crate::ad5680::SPI_CLOCK,
|
||||||
clocks
|
clocks,
|
||||||
);
|
);
|
||||||
let sync = sync.into_push_pull_output();
|
let sync = sync.into_push_pull_output();
|
||||||
|
|
||||||
|
|
@ -315,25 +358,18 @@ pub struct PwmPins {
|
||||||
impl PwmPins {
|
impl PwmPins {
|
||||||
fn setup<M1, M2, M3, M4, M5, M6>(
|
fn setup<M1, M2, M3, M4, M5, M6>(
|
||||||
clocks: Clocks,
|
clocks: Clocks,
|
||||||
tim1: TIM1,
|
(tim1, tim3): (TIM1, TIM3),
|
||||||
tim3: TIM3,
|
(max_v0, max_v1): (PC6<M1>, PC7<M2>),
|
||||||
max_v0: PC6<M1>,
|
(max_i_pos0, max_i_pos1): (PE9<M3>, PE11<M4>),
|
||||||
max_v1: PC7<M2>,
|
(max_i_neg0, max_i_neg1): (PE13<M5>, PE14<M6>),
|
||||||
max_i_pos0: PE9<M3>,
|
|
||||||
max_i_pos1: PE11<M4>,
|
|
||||||
max_i_neg0: PE13<M5>,
|
|
||||||
max_i_neg1: PE14<M6>,
|
|
||||||
) -> PwmPins {
|
) -> PwmPins {
|
||||||
let freq = 20u32.khz();
|
let freq = 20u32.khz();
|
||||||
|
|
||||||
fn init_pwm_pin<P: hal::PwmPin<Duty=u16>>(pin: &mut P) {
|
fn init_pwm_pin<P: hal::PwmPin<Duty = u16>>(pin: &mut P) {
|
||||||
pin.set_duty(0);
|
pin.set_duty(0);
|
||||||
pin.enable();
|
pin.enable();
|
||||||
}
|
}
|
||||||
let channels = (
|
let channels = (max_v0.into_alternate(), max_v1.into_alternate());
|
||||||
max_v0.into_alternate(),
|
|
||||||
max_v1.into_alternate(),
|
|
||||||
);
|
|
||||||
//let (mut max_v0, mut max_v1) = pwm::tim3(tim3, channels, clocks, freq);
|
//let (mut max_v0, mut max_v1) = pwm::tim3(tim3, channels, clocks, freq);
|
||||||
let (mut max_v0, mut max_v1) = Timer::new(tim3, &clocks).pwm(channels, freq);
|
let (mut max_v0, mut max_v1) = Timer::new(tim3, &clocks).pwm(channels, freq);
|
||||||
init_pwm_pin(&mut max_v0);
|
init_pwm_pin(&mut max_v0);
|
||||||
|
|
@ -353,9 +389,12 @@ impl PwmPins {
|
||||||
init_pwm_pin(&mut max_i_neg1);
|
init_pwm_pin(&mut max_i_neg1);
|
||||||
|
|
||||||
PwmPins {
|
PwmPins {
|
||||||
max_v0, max_v1,
|
max_v0,
|
||||||
max_i_pos0, max_i_pos1,
|
max_v1,
|
||||||
max_i_neg0, max_i_neg1,
|
max_i_pos0,
|
||||||
|
max_i_pos1,
|
||||||
|
max_i_neg0,
|
||||||
|
max_i_neg1,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,29 @@
|
||||||
|
use crate::command_parser::Ipv4Config;
|
||||||
|
use crate::net::split_ipv4_config;
|
||||||
use smoltcp::{
|
use smoltcp::{
|
||||||
iface::EthernetInterface,
|
iface::EthernetInterface,
|
||||||
socket::{SocketSet, SocketHandle, TcpSocket, TcpSocketBuffer, SocketRef},
|
socket::{SocketHandle, SocketRef, SocketSet, TcpSocket, TcpSocketBuffer},
|
||||||
time::Instant,
|
time::Instant,
|
||||||
wire::{IpAddress, IpCidr, Ipv4Address, Ipv4Cidr},
|
wire::{IpAddress, IpCidr, Ipv4Address, Ipv4Cidr},
|
||||||
};
|
};
|
||||||
use crate::command_parser::Ipv4Config;
|
|
||||||
use crate::net::split_ipv4_config;
|
|
||||||
|
|
||||||
pub struct SocketState<S> {
|
pub struct SocketState<S> {
|
||||||
handle: SocketHandle,
|
handle: SocketHandle,
|
||||||
state: S,
|
state: S,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, S: Default> SocketState<S>{
|
impl<'a, S: Default> SocketState<S> {
|
||||||
fn new(sockets: &mut SocketSet<'a>, tcp_rx_storage: &'a mut [u8; TCP_RX_BUFFER_SIZE], tcp_tx_storage: &'a mut [u8; TCP_TX_BUFFER_SIZE]) -> SocketState<S> {
|
fn new(
|
||||||
|
sockets: &mut SocketSet<'a>,
|
||||||
|
tcp_rx_storage: &'a mut [u8; TCP_RX_BUFFER_SIZE],
|
||||||
|
tcp_tx_storage: &'a mut [u8; TCP_TX_BUFFER_SIZE],
|
||||||
|
) -> SocketState<S> {
|
||||||
let tcp_rx_buffer = TcpSocketBuffer::new(&mut tcp_rx_storage[..]);
|
let tcp_rx_buffer = TcpSocketBuffer::new(&mut tcp_rx_storage[..]);
|
||||||
let tcp_tx_buffer = TcpSocketBuffer::new(&mut tcp_tx_storage[..]);
|
let tcp_tx_buffer = TcpSocketBuffer::new(&mut tcp_tx_storage[..]);
|
||||||
let tcp_socket = TcpSocket::new(tcp_rx_buffer, tcp_tx_buffer);
|
let tcp_socket = TcpSocket::new(tcp_rx_buffer, tcp_tx_buffer);
|
||||||
SocketState::<S> {
|
SocketState::<S> {
|
||||||
handle: sockets.add(tcp_socket),
|
handle: sockets.add(tcp_socket),
|
||||||
state: S::default()
|
state: S::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -50,7 +54,7 @@ impl<'a, 'b, S: Default> Server<'a, 'b, S> {
|
||||||
($rx_storage:ident, $tx_storage:ident) => {
|
($rx_storage:ident, $tx_storage:ident) => {
|
||||||
let mut $rx_storage = [0; TCP_RX_BUFFER_SIZE];
|
let mut $rx_storage = [0; TCP_RX_BUFFER_SIZE];
|
||||||
let mut $tx_storage = [0; TCP_TX_BUFFER_SIZE];
|
let mut $tx_storage = [0; TCP_TX_BUFFER_SIZE];
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
create_rtx_storage!(tcp_rx_storage0, tcp_tx_storage0);
|
create_rtx_storage!(tcp_rx_storage0, tcp_tx_storage0);
|
||||||
|
|
@ -99,15 +103,10 @@ impl<'a, 'b, S: Default> Server<'a, 'b, S> {
|
||||||
fn set_ipv4_address(&mut self, ipv4_address: Ipv4Cidr) {
|
fn set_ipv4_address(&mut self, ipv4_address: Ipv4Cidr) {
|
||||||
self.net.update_ip_addrs(|addrs| {
|
self.net.update_ip_addrs(|addrs| {
|
||||||
for addr in addrs.iter_mut() {
|
for addr in addrs.iter_mut() {
|
||||||
match addr {
|
if let IpCidr::Ipv4(_) = addr {
|
||||||
IpCidr::Ipv4(_) => {
|
|
||||||
*addr = IpCidr::Ipv4(ipv4_address);
|
*addr = IpCidr::Ipv4(ipv4_address);
|
||||||
// done
|
// done
|
||||||
break
|
break;
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
// skip
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -116,8 +115,7 @@ impl<'a, 'b, S: Default> Server<'a, 'b, S> {
|
||||||
fn set_gateway(&mut self, gateway: Option<Ipv4Address>) {
|
fn set_gateway(&mut self, gateway: Option<Ipv4Address>) {
|
||||||
let routes = self.net.routes_mut();
|
let routes = self.net.routes_mut();
|
||||||
match gateway {
|
match gateway {
|
||||||
None =>
|
None => routes.update(|routes_storage| {
|
||||||
routes.update(|routes_storage| {
|
|
||||||
routes_storage.remove(&IpCidr::new(IpAddress::v4(0, 0, 0, 0), 0));
|
routes_storage.remove(&IpCidr::new(IpAddress::v4(0, 0, 0, 0), 0));
|
||||||
}),
|
}),
|
||||||
Some(gateway) => {
|
Some(gateway) => {
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,8 @@ pub enum SessionInput {
|
||||||
|
|
||||||
impl From<Result<Command, ParserError>> for SessionInput {
|
impl From<Result<Command, ParserError>> for SessionInput {
|
||||||
fn from(input: Result<Command, ParserError>) -> Self {
|
fn from(input: Result<Command, ParserError>) -> Self {
|
||||||
input.map(SessionInput::Command)
|
input
|
||||||
|
.map(SessionInput::Command)
|
||||||
.unwrap_or_else(SessionInput::Error)
|
.unwrap_or_else(SessionInput::Error)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -76,13 +77,10 @@ impl Session {
|
||||||
for (i, b) in buf.iter().enumerate() {
|
for (i, b) in buf.iter().enumerate() {
|
||||||
buf_bytes = i + 1;
|
buf_bytes = i + 1;
|
||||||
let line = self.reader.feed(*b);
|
let line = self.reader.feed(*b);
|
||||||
match line {
|
if let Some(line) = line {
|
||||||
Some(line) => {
|
let command = Command::parse(line);
|
||||||
let command = Command::parse(&line);
|
|
||||||
return (buf_bytes, command.into());
|
return (buf_bytes, command.into());
|
||||||
}
|
}
|
||||||
None => {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
(buf_bytes, SessionInput::Nothing)
|
(buf_bytes, SessionInput::Nothing)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,11 @@
|
||||||
use num_traits::float::Float;
|
use num_traits::float::Float;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
use uom::si::{
|
use uom::si::{
|
||||||
f64::{
|
|
||||||
ElectricalResistance,
|
|
||||||
ThermodynamicTemperature,
|
|
||||||
},
|
|
||||||
electrical_resistance::ohm,
|
electrical_resistance::ohm,
|
||||||
|
f64::{ElectricalResistance, ThermodynamicTemperature},
|
||||||
ratio::ratio,
|
ratio::ratio,
|
||||||
thermodynamic_temperature::{degree_celsius, kelvin},
|
thermodynamic_temperature::{degree_celsius, kelvin},
|
||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
/// Steinhart-Hart equation parameters
|
/// Steinhart-Hart equation parameters
|
||||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||||
|
|
|
||||||
14
src/timer.rs
14
src/timer.rs
|
|
@ -4,9 +4,9 @@ use cortex_m::interrupt::Mutex;
|
||||||
use cortex_m_rt::exception;
|
use cortex_m_rt::exception;
|
||||||
use stm32f4xx_hal::{
|
use stm32f4xx_hal::{
|
||||||
rcc::Clocks,
|
rcc::Clocks,
|
||||||
time::U32Ext,
|
|
||||||
timer::{Timer, Event as TimerEvent},
|
|
||||||
stm32::SYST,
|
stm32::SYST,
|
||||||
|
time::U32Ext,
|
||||||
|
timer::{Event as TimerEvent, Timer},
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Rate in Hz
|
/// Rate in Hz
|
||||||
|
|
@ -18,7 +18,6 @@ static TIMER_MS: Mutex<RefCell<u32>> = Mutex::new(RefCell::new(0));
|
||||||
|
|
||||||
/// Setup SysTick exception
|
/// Setup SysTick exception
|
||||||
pub fn setup(syst: SYST, clocks: Clocks) {
|
pub fn setup(syst: SYST, clocks: Clocks) {
|
||||||
|
|
||||||
let timer = Timer::syst(syst, &clocks);
|
let timer = Timer::syst(syst, &clocks);
|
||||||
let mut countdown = timer.start_count_down(TIMER_RATE.hz());
|
let mut countdown = timer.start_count_down(TIMER_RATE.hz());
|
||||||
countdown.listen(TimerEvent::TimeOut);
|
countdown.listen(TimerEvent::TimeOut);
|
||||||
|
|
@ -28,18 +27,13 @@ pub fn setup(syst: SYST, clocks: Clocks) {
|
||||||
#[exception]
|
#[exception]
|
||||||
fn SysTick() {
|
fn SysTick() {
|
||||||
cortex_m::interrupt::free(|cs| {
|
cortex_m::interrupt::free(|cs| {
|
||||||
*TIMER_MS.borrow(cs)
|
*TIMER_MS.borrow(cs).borrow_mut() += TIMER_DELTA;
|
||||||
.borrow_mut() += TIMER_DELTA;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Obtain current time in milliseconds
|
/// Obtain current time in milliseconds
|
||||||
pub fn now() -> u32 {
|
pub fn now() -> u32 {
|
||||||
cortex_m::interrupt::free(|cs| {
|
cortex_m::interrupt::free(|cs| *TIMER_MS.borrow(cs).borrow().deref())
|
||||||
*TIMER_MS.borrow(cs)
|
|
||||||
.borrow()
|
|
||||||
.deref()
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// block for at least `amount` milliseconds
|
/// block for at least `amount` milliseconds
|
||||||
|
|
|
||||||
18
src/usb.rs
18
src/usb.rs
|
|
@ -1,15 +1,18 @@
|
||||||
use core::{fmt::{self, Write}, mem::MaybeUninit};
|
use core::{
|
||||||
|
fmt::{self, Write},
|
||||||
|
mem::MaybeUninit,
|
||||||
|
};
|
||||||
use cortex_m::interrupt::free;
|
use cortex_m::interrupt::free;
|
||||||
|
use log::{Log, Metadata, Record};
|
||||||
use stm32f4xx_hal::{
|
use stm32f4xx_hal::{
|
||||||
otg_fs::{USB, UsbBus as Bus},
|
otg_fs::{UsbBus as Bus, USB},
|
||||||
stm32::{interrupt, Interrupt, NVIC},
|
stm32::{interrupt, Interrupt, NVIC},
|
||||||
};
|
};
|
||||||
use usb_device::{
|
use usb_device::{
|
||||||
class_prelude::{UsbBusAllocator},
|
class_prelude::UsbBusAllocator,
|
||||||
prelude::{UsbDevice, UsbDeviceBuilder, UsbVidPid},
|
prelude::{UsbDevice, UsbDeviceBuilder, UsbVidPid},
|
||||||
};
|
};
|
||||||
use usbd_serial::SerialPort;
|
use usbd_serial::SerialPort;
|
||||||
use log::{Record, Log, Metadata};
|
|
||||||
|
|
||||||
static mut EP_MEMORY: [u32; 1024] = [0; 1024];
|
static mut EP_MEMORY: [u32; 1024] = [0; 1024];
|
||||||
|
|
||||||
|
|
@ -36,8 +39,8 @@ impl State {
|
||||||
.device_class(usbd_serial::USB_CLASS_CDC)
|
.device_class(usbd_serial::USB_CLASS_CDC)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
free(|_| {
|
free(|_| unsafe {
|
||||||
unsafe { STATE = Some(State { serial, dev }); }
|
STATE = Some(State { serial, dev });
|
||||||
});
|
});
|
||||||
|
|
||||||
unsafe {
|
unsafe {
|
||||||
|
|
@ -94,8 +97,7 @@ impl Write for SerialOutput {
|
||||||
fn write_str(&mut self, s: &str) -> core::result::Result<(), core::fmt::Error> {
|
fn write_str(&mut self, s: &str) -> core::result::Result<(), core::fmt::Error> {
|
||||||
if let Some(ref mut state) = State::get() {
|
if let Some(ref mut state) = State::get() {
|
||||||
for chunk in s.as_bytes().chunks(16) {
|
for chunk in s.as_bytes().chunks(16) {
|
||||||
free(|_| state.serial.write(chunk))
|
free(|_| state.serial.write(chunk)).map_err(|_| fmt::Error)?;
|
||||||
.map_err(|_| fmt::Error)?;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue