wip

Cargo.lock

@@ -203,7 +203,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "chrono",
  "lighter_lib",
@@ -605,7 +605,7 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hemma"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -630,7 +630,7 @@ dependencies = [
 
 [[package]]
 name = "hemma_web"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "chrono",
  "common",

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hemma"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 
 [dependencies]

backend/src/tasks/lights/scripts/daylight.rs

@@ -0,0 +1,60 @@
+use std::{collections::HashMap, sync::Arc};
+
+use common::{BulbPrefs, Param};
+use lighter_lib::BulbId;
+use lighter_manager::manager::BulbManager;
+use std::sync::Mutex;
+
+use crate::util::DeadMansHandle;
+
+use super::LightScript;
+
+pub struct Auto {
+    state: Arc<Mutex<AutoState>>,
+    _task_handle: DeadMansHandle,
+}
+
+struct AutoState {
+    manager: BulbManager,
+    enabled_bulbs: HashMap<BulbId, AutoBulbState>,
+}
+
+#[derive(Default)]
+struct AutoBulbState {}
+
+impl LightScript for Auto {
+    fn get_params(&mut self, bulb: &BulbId) -> BulbPrefs {
+        let state = self.state.lock().unwrap();
+        let enabled = state.enabled_bulbs.contains_key(bulb);
+
+        BulbPrefs {
+            kvs: [("Auto".to_string(), Param::Toggle(enabled))]
+                .into_iter()
+                .collect(),
+        }
+    }
+
+    fn set_param(&mut self, bulb: &BulbId, name: &str, param: Param) {
+        if name != "Auto" {
+            error!("invalid param name");
+            return;
+        }
+
+        let Param::Toggle(enabled) = param else {
+            error!("invalid param kind");
+            return;
+        };
+
+        let mut state = self.state.lock().unwrap();
+        if !enabled {
+            state.enabled_bulbs.remove(bulb);
+        } else {
+            let bulb_state = AutoBulbState::default();
+            state.enabled_bulbs.insert(bulb.clone(), bulb_state);
+        }
+    }
+}
+
+async fn auto_task(state: Arc<Mutex<AutoState>>) {
+    loop {}
+}

backend/src/tasks/lights/scripts/mod.rs

@@ -1,8 +1,10 @@
 use common::{BulbPrefs, Param};
 use lighter_lib::BulbId;
 
+mod daylight;
 mod party;
 mod waker;
+pub use daylight::Daylight;
 pub use party::Party;
 pub use waker::Waker;
 

backend/src/tasks/lights/scripts/party.rs

@@ -37,13 +37,12 @@ impl LightScript for Party {
 
     fn set_param(&mut self, bulb: &BulbId, name: &str, param: Param) {
         if name != "Party" {
-            error!("invalit param name");
+            error!("invalid param name");
             return;
         }
 
-        // TODO: should be toggle
         let Param::Toggle(enabled) = param else {
-            error!("invalit param kind");
+            error!("invalid param kind");
             return;
         };
 

backend/src/tasks/lights/scripts/waker.rs

@@ -27,6 +27,8 @@ impl Waker {
 }
 
 const TIME_FMT: &str = "%H:%M";
+const WAKE_TARGET_BRIGHTNESS: u8 = 75;
+const WAKE_TARGET_TEMPERATURE: u8 = 60;
 
 impl LightScript for Waker {
     fn get_params(&mut self, bulb: &BulbId) -> BulbPrefs {
@@ -116,9 +118,8 @@ async fn wake_task(manager: BulbManager, id: BulbId, day: Weekday, time: NaiveTi
         let r = manager
             .until_interrupted(id.clone(), async {
                 // slowly turn up brightness of bulb
-                for brightness in (1..=75).map(|i| (i as f32) * 0.01) {
+                for brightness in (1..=WAKE_TARGET_BRIGHTNESS).map(|i| (i as f32) * 0.01) {
-                    //sleep(Duration::from_secs(12)).await;
+                    sleep(Duration::from_secs(12)).await;
-                    sleep(Duration::from_millis(500)).await;
 
                     manager
                         .send_command(BulbCommand::SetColor(
@@ -130,6 +131,21 @@ async fn wake_task(manager: BulbManager, id: BulbId, day: Weekday, time: NaiveTi
                         ))
                         .await
                 }
+
+                // slowly turn up temperature of bulb
+                for temperature in (1..=WAKE_TARGET_TEMPERATURE).map(|i| (i as f32) * 0.01) {
+                    sleep(Duration::from_secs(12)).await;
+
+                    manager
+                        .send_command(BulbCommand::SetColor(
+                            BulbSelector::Id(id.clone()),
+                            BulbColor::Kelvin {
+                                t: temperature,
+                                b: WAKE_TARGET_BRIGHTNESS as f32 * 0.01,
+                            },
+                        ))
+                        .await
+                }
             })
             .await;
 

backend/src/util.rs

@@ -1,5 +1,6 @@
 use tokio::task::AbortHandle;
 
+/// A tokio task handle that will abort the task when dropped.
 pub struct DeadMansHandle(pub AbortHandle);
 
 impl From<AbortHandle> for DeadMansHandle {

common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 
 [dependencies]

frontend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hemma_web"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["Joakim Hulthe <joakim@hulthe.net"]
 edition = "2021"