max/easee-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Continue implementing regulator

Browse Source
This commit is contained in:
Maxime Augier 2024-08-21 21:51:28 +02:00
parent e74f49277f
commit d4a6816532
1 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/control.rs
View File

@ -10,39 +10,47 @@ use easee::api::{self, ChargerOpMode, Circuit, Context, SetCurrent, Triphase};
use easee::observation::{self, Event, ObservationError};
use tracing::{error, info, warn};
use crate::config::{self, Config};
use crate::mattermost::{self, Channel};
use crate::prom::PromClient;
use crate::config::{self, Config};
use observation::{Observation,PilotMode};
use observation::{Observation, PilotMode};
struct Charger {
inner: api::Charger,
owners: Vec<String>,
current: Option<(f64, f64, f64)>
current: Option<(f64, f64, f64)>,
}
impl Charger {
pub fn from_api(inner: api::Charger, configs: &[config::Charger]) -> Self {
let owners = configs.iter()
let owners = configs
.iter()
.find(|c| c.id == inner.id)
.map(|c| &c.owners)
.cloned()
.unwrap_or_default();
Charger { inner, owners, current: None }
Charger {
inner,
owners,
current: None,
}
}
}
pub fn start(mut ctx: Context, config: Config, mut chargers: Vec<api::Charger>) -> Result<Infallible> {
pub fn start(
mut ctx: Context,
config: Config,
mut chargers: Vec<api::Charger>,
) -> Result<Infallible> {
let mattermost = mattermost::Context::new(config.mattermost.base, &config.mattermost.token)?;
let mut stream = observation::Stream::from_context(&mut ctx)?;
let chargers: HashMap<String, Charger> = chargers.into_iter()
let chargers: HashMap<String, Charger> = chargers
.into_iter()
.filter_map(|c| {
stream.subscribe(&c.id)
stream
.subscribe(&c.id)
.map_err(|e| error!("Cannot subscribe {}: {e}", &c.id))
.ok()?;
let name = c.name.clone();
@ -62,15 +70,17 @@ pub fn start(mut ctx: Context, config: Config, mut chargers: Vec<api::Charger>)
mattermost.send_to_channel(&channel, "Easee Controller started")?;
if let Some(reg) = config.regulator {
let circuit = ctx.sites_details()?
.into_iter().find(|s| s.site.id == reg.site_id)
let circuit = ctx
.sites_details()?
.into_iter()
.find(|s| s.site.id == reg.site_id)
.ok_or(anyhow!("Invalid site id {}", reg.site_id))?
.circuits.into_iter()
.circuits
.into_iter()
.find(|c| c.id == reg.circuit_id)
.ok_or(anyhow!("Invalid circuit id {}", reg.circuit_id))?;
let controller = Controller {
let controller = Controller {
bias: Triphase::from(reg.power_bias_watts),
ctx,
prom: PromClient::new(config.prometheus.base),
@ -166,21 +176,24 @@ impl Controller {
loop {
let export_power = self.prom.current_power()?;
let available_power = export_power - self.bias;
let available_current = available_power * (1.0/voltage);
let available_current = available_power * (1.0 / voltage);
integrated = available_current * 0.3 + integrated * (1.0 - 0.3);
let differentiated = available_current - prev_available_current;
prev_available_current = available_current;
let delta = available_current * self.p
+ differentiated * self.d
+ integrated * self.i;
let delta = available_current * self.p + differentiated * self.d + integrated * self.i;
current = current + delta;
self.circuit.set_dynamic_current(&mut self.ctx, SetCurrent { time_to_live, current })?;
self.circuit.set_dynamic_current(
&mut self.ctx,
SetCurrent {
time_to_live,
current,
},
)?;
thread::sleep(self.delay);
}
}
}
}
}