M-Labs
/
thermostat
9
0
Fork 5
Code Issues 10 Pull Requests 6 Releases Wiki Activity

Move PwmLimits into its own file

This commit is contained in:
atse 2024-08-08 17:39:55 +08:00
parent 9d89104f50
commit c92fea8642
3 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/config.rs
View File

@ -1,15 +1,12 @@
use num_traits::Zero;
use serde::{Serialize, Deserialize};
use uom::si::{
electric_potential::volt,
electric_current::ampere,
f64::{ElectricCurrent, ElectricPotential},
};
use uom::si::f64::ElectricCurrent;
use crate::{
ad7172::PostFilter,
channels::Channels,
command_parser::CenterPoint,
pid,
pwm_limits::PwmLimits,
steinhart_hart,
};
@ -70,29 +67,3 @@ impl ChannelConfig {
let _ = channels.set_i(channel, self.i_set);
}
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
struct PwmLimits {
max_v: f64,
max_i_pos: f64,
max_i_neg: f64,
}
impl PwmLimits {
pub fn new(channels: &mut Channels, channel: usize) -> Self {
let (max_v, _) = channels.get_max_v(channel);
let (max_i_pos, _) = channels.get_max_i_pos(channel);
let (max_i_neg, _) = channels.get_max_i_neg(channel);
PwmLimits {
max_v: max_v.get::<volt>(),
max_i_pos: max_i_pos.get::<ampere>(),
max_i_neg: max_i_neg.get::<ampere>(),
}
}
pub fn apply(&self, channels: &mut Channels, channel: usize) {
channels.set_max_v(channel, ElectricPotential::new::<volt>(self.max_v));
channels.set_max_i_pos(channel, ElectricCurrent::new::<ampere>(self.max_i_pos));
channels.set_max_i_neg(channel, ElectricCurrent::new::<ampere>(self.max_i_neg));
}
}

1
src/main.rs
View File

@ -41,6 +41,7 @@ mod command_parser;
use command_parser::Ipv4Config;
mod timer;
mod pid;
mod pwm_limits;
mod steinhart_hart;
mod channels;
use channels::{CHANNELS, Channels};

33
src/pwm_limits.rs Normal file
View File

@ -0,0 +1,33 @@
use serde::{Serialize, Deserialize};
use uom::si::{
electric_potential::volt,
electric_current::ampere,
f64::{ElectricCurrent, ElectricPotential},
};
use crate::channels::Channels;
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct PwmLimits {
max_v: f64,
max_i_pos: f64,
max_i_neg: f64,
}
impl PwmLimits {
pub fn new(channels: &mut Channels, channel: usize) -> Self {
let max_v = channels.get_max_v(channel).0;
let max_i_pos = channels.get_max_i_pos(channel).0;
let max_i_neg = channels.get_max_i_neg(channel).0;
PwmLimits {
max_v: max_v.get::<volt>(),
max_i_pos: max_i_pos.get::<ampere>(),
max_i_neg: max_i_neg.get::<ampere>(),
}
}
pub fn apply(&self, channels: &mut Channels, channel: usize) {
channels.set_max_v(channel, ElectricPotential::new::<volt>(self.max_v));
channels.set_max_i_pos(channel, ElectricCurrent::new::<ampere>(self.max_i_pos));
channels.set_max_i_neg(channel, ElectricCurrent::new::<ampere>(self.max_i_neg));
}
}