pierre/SolarEnergy
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Can check if relay is online or not

Browse Source
This commit is contained in:
Pierre HUBERT
2025-12-09 14:54:01 +01:00
parent c469d49ff7
commit ff47f86792
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
central_backend/src/energy/energy_actor.rs
View File

@@ -389,7 +389,7 @@ impl Handler<SynchronizeDevice> for EnergyActor {
pub struct ResDevState { pub struct ResDevState {
pub id: DeviceId, pub id: DeviceId,
last_ping: u64, last_ping: u64,
online: bool, pub online: bool,
} }
/// Get the state of devices /// Get the state of devices

22
central_backend/src/server/unsecure_server/unsecure_relay_controller.rs
View File

@@ -64,6 +64,8 @@ pub async fn legacy_state(
pub struct FullRelayState { pub struct FullRelayState {
/// Indicates if the relay (or its parent device) is enabled or not /// Indicates if the relay (or its parent device) is enabled or not
enabled: bool, enabled: bool,
/// Indicate if the device is online or not
online: bool,
/// Indicates if relay is on or off /// Indicates if relay is on or off
is_on: bool, is_on: bool,
/// Relay name /// Relay name
@@ -96,6 +98,8 @@ pub async fn relays_full_state(energy_actor: WebEnergyActor) -> HttpResult {
let cached_consumption = energy_actor.send(energy_actor::GetCurrConsumption).await?; let cached_consumption = energy_actor.send(energy_actor::GetCurrConsumption).await?;
let relays_consumption = energy_actor.send(energy_actor::RelaysConsumption).await?; let relays_consumption = energy_actor.send(energy_actor::RelaysConsumption).await?;
let curr_consumption = consumption::get_curr_consumption().await.ok(); let curr_consumption = consumption::get_curr_consumption().await.ok();
let devices = energy_actor.send(energy_actor::GetDeviceLists).await?;
let devices_state = energy_actor.send(energy_actor::GetDevicesState).await?;
let mut relays = energy_actor.send(energy_actor::GetRelaysList).await?; let mut relays = energy_actor.send(energy_actor::GetRelaysList).await?;
relays.sort_by_key(|r| -(r.priority as i64)); relays.sort_by_key(|r| -(r.priority as i64));
let relays_state = energy_actor.send(energy_actor::GetAllRelaysState).await?; let relays_state = energy_actor.send(energy_actor::GetAllRelaysState).await?;
@@ -107,16 +111,24 @@ pub async fn relays_full_state(energy_actor: WebEnergyActor) -> HttpResult {
relays: relays relays: relays
.into_iter() .into_iter()
.map(|r| { .map(|r| {
let state = relays_state.iter().find(|s| s.id == r.id); let device = devices
.iter()
.find(|d| d.relays.iter().any(|sr| sr.id == r.id))
.expect("All relay shall have an associated device!");
let device_state = devices_state.iter().find(|s| s.id == device.id);
let relay_state = relays_state.iter().find(|s| s.id == r.id);
FullRelayState { FullRelayState {
enabled: r.enabled, enabled: r.enabled && device.enabled,
is_on: state.map(|s| s.on).unwrap_or(false), online: device_state.map(|d| d.online).unwrap_or(false),
is_on: relay_state.map(|s| s.on).unwrap_or(false),
name: r.name, name: r.name,
priority: r.priority, priority: r.priority,
r#for: state.map(|s| s.r#for).unwrap_or(0), r#for: relay_state.map(|s| s.r#for).unwrap_or(0),
total_uptime: 0, total_uptime: 0,
daily_requirement: r.daily_runtime.map(|r| r.min_runtime), daily_requirement: r.daily_runtime.map(|r| r.min_runtime),
relay_forced_state: state.map(|s| s.forced_state.clone()).unwrap_or_default(), relay_forced_state: relay_state
.map(|s| s.forced_state.clone())
.unwrap_or_default(),
} }
}) })
.collect(), .collect(),