Bump crossbeam-channel from 0.5.14 to 0.5.15

.gitignore

@@ -64,11 +64,12 @@ __pycache__
 debugToRemoteHost.sh
 hueBridgeLogin
 keys/
-data/
 releaseToRemoteHost.sh
 specs/
 userdb.hm
 
 # Rust #
 #####################
 target/
+src/input/web_api/logins.rs
+database/

Cargo.toml

@@ -1,34 +1,48 @@
-[package]
-name = "HomeAutomation"
-version = "0.1.0"
-authors = ["David Kleingeld <dskleingeld@gmail.com>"]
-edition = "2018"
+[workspace]
+resolver = "2"
+members = ["crates/*"]
+exclude = ["nodes/embassy/bed-lb", "nodes/embassy/bed-sb",
+"nodes/esp32/airbox"]
 
-[dependencies]
-actix-web = { version = "0.7.15", features = ["rust-tls"] }
-actix-web-httpauth = "0.1.0"
-actix = "0.7.5"
-serde = "1.0"
-serde_yaml = "0.8"
-log = "0.4"
+[workspace.dependencies]
+data-server = { path = "crates/data-server" }
+data-store = { path = "crates/data-store" }
+log-store = { path = "crates/log-store" }
+protocol = { path = "crates/protocol" }
+zigbee-bridge = { path = "crates/zigbee-bridge" }
+rpc = { path = "crates/rpc" }
+logger = { path = "crates/logger" }
 
-#sysfs_gpio = { version = "0.5.3", features = ["use_tokio"] }
-sysfs_gpio = { git = "https://github.com/rust-embedded/rust-sysfs-gpio", branch = "master", features = ["use_tokio"] }
+byteseries = { git = "https://github.com/dvdsk/byteseries", rev="a9da72e9585e5f5a8cc3cf543d6ca2561ad7007a" }
 
-tokio = "0.1.15"
-futures = { version = "0.1"}
+serde = { version = "1", features = ["derive"], default-features = false }
+tokio = { version = "1.38", features = ["rt-multi-thread"] }
+tokio-util = { version = "0.7.13", features = ["codec"] }
+itertools = { version = "0.14" }
+bincode = { version = "2.0", default-features = false, features = ["serde", "std"] }
+gethostname = "0.5"
+governor = "0.8"
+color-eyre = "0.6.3"
+tracing = "0.1.40"
+tracing-error = "0.2"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+futures = "0.3.31"
+futures-concurrency = "7.6.2"
+jiff = "0.1"
+clap = { version = "4", features = ["derive"]} 
+rand = "0.9"
+smallvec = { version = "2.0.0-alpha.11" }
+strum = { version = "0.27", features = ["derive"] }
+ron = "0.9"
+thiserror = "2"
+reserve-port = "2.2.0"
 
-#dont forget to run cargo update when these change
-philipshue = { git = "https://github.com/dskleingeld/philipshue", branch = "master" }
-dataserver = { git = "https://github.com/dskleingeld/dataserver", branch = "as_lib" }
+[workspace.package]
+rust-version = "1.82"
+edition = "2021"
+license = "GPLv3"
+authors = ["David Kleingeld & Eva van Houten"]
 
-#for local dev purpose we use below targets
-#dataserver = { path = "../dataserver"}
-#philipshue = { path = "../philipshue"}
-
-linux-embedded-hal = "0.2.2"
-bme280 = "0.1.1"
-
-smallvec = "0.6.6"
-chrono = { version = "0.4.6", features = ["serde"] }
-bytes = "0.4.11"
+[profile.release-with-debug]
+inherits = "release"
+debug = true

crates/brain/.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.aarch64-unknown-linux-musl]
+rustflags = ["-Clinker=rust-lld"]

crates/brain/Cargo.toml

@@ -0,0 +1,41 @@
+[package]
+name = "brain"
+version = "0.1.0"
+rust-version.workspace = true
+edition.workspace = true
+license.workspace = true
+authors.workspace = true
+
+[dependencies]
+protocol = { workspace = true, features = ["alloc"] }
+data-server = { workspace = true }
+zigbee-bridge = { workspace = true }
+
+futures.workspace = true
+tokio = { workspace = true, features = ["full"] }
+
+serde.workspace = true
+serde_yaml = "0.9"
+bincode.workspace = true
+
+thiserror.workspace = true
+
+jiff = { workspace = true, features = ["serde"] }
+
+bytes = "1.5"
+byteorder = "1.4"
+
+sled = "0.34"
+
+mpd = "0.1"
+rand.workspace = true
+
+futures-util = "0.3.30"
+tracing = {workspace = true}
+logger.workspace = true
+clap = { workspace = true }
+futures-concurrency = { workspace = true }
+strum.workspace = true
+dbstruct = { git = "https://github.com/dvdsk/dbstruct" }
+color-eyre.workspace = true
+mpdrs = "0.1.0"

crates/brain/deploy.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -e
+
+SERVER="sgc"  # ssh config name or full address
+
+cargo build --target=aarch64-unknown-linux-musl --release
+rsync -vh --progress \
+  ../../target/aarch64-unknown-linux-musl/release/brain \
+  $SERVER:/tmp/
+
+cmds="
+sudo mv /tmp/brain /home/ha/brain
+sudo chown ha:ha /home/ha/brain
+sudo systemctl restart brain
+"
+
+ssh -t $SERVER "$cmds"

crates/brain/profile.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+cargo build --profile=release-with-debug
+echo '1' | sudo tee /proc/sys/kernel/perf_event_paranoid
+
+samply record ../../target/release-with-debug/brain \
+  --data-server 192.168.1.43:1235 \
+  --mpd-ip 192.168.1.43 \
+  --http-port 34326 \
+  --mqtt-ip 192.168.1.43

crates/brain/rust-toolchain.toml

@@ -0,0 +1,5 @@
+[toolchain]
+channel = "stable"
+components = []
+targets = [ "aarch64-unknown-linux-musl" ]
+profile = "minimal"

crates/brain/src/controller/environment/mod.rs

@@ -0,0 +1,26 @@
+/// will store a short history of the last sensor values
+/// useful for debouncing events (someone passing in front
+/// light sensor vs a cloud)
+use protocol::SensorValue;
+
+// struct History<T> {
+//     last_values: Vec<T>,
+// }
+
+pub struct Environment {
+    // light: History<f32>,
+}
+
+impl Environment {
+    pub fn update(&self, _: SensorValue) {}
+}
+
+impl std::default::Default for Environment {
+    fn default() -> Self {
+        Environment {
+            // light: History {
+                // last_values: Vec::new(),
+            // },
+        }
+    }
+}

crates/brain/src/controller/mod.rs

@@ -0,0 +1,149 @@
+mod rooms;
+
+use crate::system::System;
+pub use protocol::Reading;
+use serde::{Deserialize, Serialize};
+use tokio::sync::broadcast;
+use tokio::task::JoinSet;
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub enum Event {
+    Sensor(Reading),
+    WakeupLB,
+    WakeupSB,
+    StateChangeSB(rooms::small_bedroom::State),
+}
+
+#[derive(Clone)]
+pub(crate) struct RestrictedSystem {
+    allowed_lights: Vec<&'static str>,
+    allowed_radiators: Vec<&'static str>,
+    system: System,
+}
+
+impl RestrictedSystem {
+    async fn one_lamp_ct(
+        &mut self,
+        name: &'static str,
+        kelvin: usize,
+        bri: f64,
+    ) {
+        if self.allowed_lights.contains(&name) {
+            self.system.zigbee.set_color_temp(name, kelvin);
+            self.system.zigbee.set_brightness(name, bri);
+        }
+    }
+
+    async fn one_lamp_on(&mut self, name: &'static str) {
+        if self.allowed_lights.contains(&name) {
+            self.system.zigbee.set_on(name);
+        }
+    }
+
+    async fn one_lamp_off(&mut self, name: &'static str) {
+        if self.allowed_lights.contains(&name) {
+            self.system.zigbee.set_off(name);
+        }
+    }
+
+    async fn all_lamps_ct(&mut self, kelvin: usize, bri: f64) {
+        for name in &self.allowed_lights {
+            self.system.zigbee.set_color_temp(name, kelvin);
+            self.system.zigbee.set_brightness(name, bri);
+        }
+    }
+
+    async fn all_lamps_off(&mut self) {
+        for name in &self.allowed_lights {
+            self.system.zigbee.set_off(name);
+        }
+    }
+
+    async fn all_lamps_on(&mut self) {
+        for name in &self.allowed_lights {
+            self.system.zigbee.set_on(name);
+        }
+    }
+
+    async fn all_lamps_but_one_off(&mut self, leave_this_on: &str) {
+        for name in &self.allowed_lights {
+            if *name != leave_this_on {
+                self.system.zigbee.set_off(name);
+            }
+        }
+    }
+
+    async fn all_lamps_but_one_on(&mut self, leave_this_off: &str) {
+        for name in &self.allowed_lights {
+            if *name != leave_this_off {
+                self.system.zigbee.set_on(name);
+            }
+        }
+    }
+
+    async fn set_radiators_setpoint(&mut self, temperature: f64) {
+        for name in &self.allowed_radiators {
+            self.system.zigbee.set_radiator_setpoint(name, temperature);
+        }
+    }
+}
+
+pub fn start(
+    subscribed: [broadcast::Receiver<Event>; 4],
+    sender: broadcast::Sender<Event>,
+    system: System,
+) -> JoinSet<()> {
+    tracing::info!("starting");
+    let mut tasks = JoinSet::new();
+    let [rx1, rx2, rx3, rx4] = subscribed;
+
+    let restricted = RestrictedSystem {
+        system: system.clone(),
+        allowed_lights: vec![
+            "large_bedroom:cabinet",
+            "large_bedroom:ceiling",
+            "large_bedroom:desk",
+            "large_bedroom:wardrobe",
+            "large_bedroom:bed",
+        ],
+        allowed_radiators: vec!["large_bedroom:radiator"],
+    };
+    tasks.spawn(rooms::large_bedroom::run(rx1, sender.clone(), restricted));
+
+    let restricted = RestrictedSystem {
+        system: system.clone(),
+        allowed_lights: vec![
+            "small_bedroom:ceiling",
+            "small_bedroom:bureau",
+            "small_bedroom:piano",
+        ],
+        allowed_radiators: vec!["small_bedroom:radiator"],
+    };
+    tasks.spawn(rooms::small_bedroom::run(rx2, sender.clone(), restricted));
+
+    let restricted = RestrictedSystem {
+        system: system.clone(),
+        allowed_lights: vec![
+            "kitchen:ceiling",
+            "kitchen:hood_left",
+            "kitchen:hood_right",
+            "kitchen:fridge",
+            "kitchen:hallway",
+        ],
+        allowed_radiators: vec![],
+    };
+    tasks.spawn(rooms::kitchen::run(rx3, sender.clone(), restricted));
+
+    let restricted = RestrictedSystem {
+        system: system.clone(),
+        allowed_lights: vec![
+            "hallway:ceiling",
+            "bathroom:ceiling",
+            "toilet:ceiling",
+        ],
+        allowed_radiators: vec![],
+    };
+    tasks.spawn(rooms::entrance::run(rx4, sender, restricted));
+
+    tasks
+}

crates/brain/src/controller/rooms.rs

@@ -0,0 +1,4 @@
+pub mod large_bedroom;
+pub mod small_bedroom;
+pub mod kitchen;
+pub mod entrance;