Implement power devices

suchmememanyskill · suchmememanyskill · commit f4ece8928c88 · 2025-10-04T16:06:45.000+02:00
diff --git a/moonraker-rs/src/requests/mod.rs b/moonraker-rs/src/requests/mod.rs
@@ -1,5 +1,7 @@
 mod file_management;
 mod printer_administration;
+mod switches_sensors_devices;
 
 pub use file_management::*;
 pub use printer_administration::*;
+pub use switches_sensors_devices::*;
diff --git a/moonraker-rs/src/requests/switches_sensors_devices.rs b/moonraker-rs/src/requests/switches_sensors_devices.rs
@@ -0,0 +1,83 @@
+
+use std::fmt::Display;
+
+use serde::{Deserialize, Serialize};
+use serde_json::{Map, Value};
+
+use crate::{
+    connector::read_deserialize::MoonrakerEventNotifyStatusUpdate, error::Error,
+    moonraker_connection::MoonrakerConnection,
+};
+
+pub trait SwitchesSensorsDevicesRequestHandler {
+    async fn list_power_devices(&self) -> Result<Vec<PowerDevice>, Error>;
+    async fn set_power_device_state(
+        &self,
+        device: &str,
+        state: PowerDeviceAction,
+    ) -> Result<Value, Error>;
+}
+
+impl SwitchesSensorsDevicesRequestHandler for MoonrakerConnection {
+    async fn list_power_devices(&self) -> Result<Vec<PowerDevice>, Error> {
+        let devices : ListPowerDevicesResult = self.send_request("machine.device_power.devices", None).await?;
+
+        Ok(devices.devices)
+    }
+
+    async fn set_power_device_state(
+        &self,
+        device: &str,
+        state: PowerDeviceAction,
+    ) -> Result<Value, Error> {
+        let args = serde_json::json!({
+            "device": device,
+            "action": state,
+        });
+        self.send_request("machine.device_power.post_device", Some(args)).await
+    }
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum PowerDeviceState {
+    On,
+    Off,
+    Init,
+    Error,
+}
+
+impl Display for PowerDeviceState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            PowerDeviceState::On => write!(f, "On"),
+            PowerDeviceState::Off => write!(f, "Off"),
+            PowerDeviceState::Init => write!(f, "Initializing"),
+            PowerDeviceState::Error => write!(f, "Error"),
+        }
+    }
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum PowerDeviceAction
+{
+    On,
+    Off,
+    Toggle,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct PowerDevice {
+    pub device: String,
+    pub status: PowerDeviceState,
+    pub locked_while_printing: bool,
+    #[serde(alias = "type")]
+    pub device_type: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ListPowerDevicesResult 
+{
+    pub devices: Vec<PowerDevice>
+}
diff --git a/src/main.rs b/src/main.rs
@@ -106,6 +106,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     register_execute_quick_action(&ui, &config.quick_actions, &moonraker_connection);
 
+    register_misc_set_power_device(&ui, &moonraker_connection);
+    register_misc_fetch_power_devices(&ui, &moonraker_connection);
+
     tokio::task::block_in_place(|| {
         ui.run().unwrap();
     });
diff --git a/src/ui_functions/misc_fetch_power_devices.rs b/src/ui_functions/misc_fetch_power_devices.rs
@@ -0,0 +1,42 @@
+use std::sync::Arc;
+
+use moonraker_rs::{moonraker_connection::MoonrakerConnection, requests::{PrinterAdministrationRequestHandler, SwitchesSensorsDevicesRequestHandler}};
+use slint::{ComponentHandle, ModelRc, SharedString, VecModel};
+
+use crate::{AppWindow, PowerDevice, PowerDevices, PrinterAdministration};
+
+
+pub fn register_misc_fetch_power_devices(ui : &AppWindow, moonraker_connection : &Arc<MoonrakerConnection>)
+{
+    let moonraker_connection = moonraker_connection.clone();
+    let ui_weak = ui.as_weak();
+    
+    ui.global::<PowerDevices>().on_fetch_power_devices(move || {
+        let moonraker_connection = moonraker_connection.clone();
+        let ui_weak = ui_weak.clone();
+
+        slint::spawn_local(async move {
+            let devices = match moonraker_connection.list_power_devices().await
+            {
+                Ok(d) => d,
+                Err(e) => {
+                    moonraker_connection.send_request_error(format!("Failed to fetch power devices: {}", e));
+                    return;
+                }
+            };
+
+            let ui = ui_weak.upgrade().unwrap();
+
+            let devices: Vec<PowerDevice> = devices.iter().map(|power_device| {
+                PowerDevice {
+                    device: SharedString::from(&power_device.device),
+                    status: SharedString::from(&power_device.status.to_string()),
+                    locked_while_printing: power_device.locked_while_printing,
+                    device_type: SharedString::from(&power_device.device_type),
+                }
+            }).collect();
+
+            ui.global::<PowerDevices>().set_power_devices(ModelRc::new(VecModel::from(devices)));
+        }).unwrap();
+    });
+}
diff --git a/src/ui_functions/misc_set_power_device.rs b/src/ui_functions/misc_set_power_device.rs
@@ -0,0 +1,24 @@
+use std::sync::Arc;
+
+use moonraker_rs::{moonraker_connection::MoonrakerConnection, requests::{PowerDeviceAction, PrinterAdministrationRequestHandler, SwitchesSensorsDevicesRequestHandler}};
+use slint::{ComponentHandle, ModelRc, SharedString, VecModel};
+
+use crate::{AppWindow, PowerDevice, PowerDevices, PrinterAdministration};
+
+
+pub fn register_misc_set_power_device(ui : &AppWindow, moonraker_connection : &Arc<MoonrakerConnection>)
+{
+    let moonraker_connection = moonraker_connection.clone();
+    
+    ui.global::<PowerDevices>().on_set_power_device_state(move |device, state| {
+        let moonraker_connection = moonraker_connection.clone();
+
+        tokio::spawn(async move {
+            if let Err(e) = moonraker_connection.set_power_device_state(&device.to_string(), if state { PowerDeviceAction::On } else { PowerDeviceAction::Off }).await
+            {
+                moonraker_connection.send_request_error(format!("Failed to set power device state for {}: {}", device.to_string(), e));
+                return;
+            }
+        });
+    });
+}
diff --git a/src/ui_functions/mod.rs b/src/ui_functions/mod.rs
@@ -11,6 +11,8 @@ pub mod util_create_temperature_list;
 pub mod settings_set_ui_settings;
 pub mod quick_action_execute;
 pub mod util_time_in_seconds_to_string;
+pub mod misc_set_power_device;
+pub mod misc_fetch_power_devices;
 
 pub use util_format_bytes::*;
 pub use filesystem_fetch_metadata::*;
@@ -24,4 +26,6 @@ pub use printer_execute_gcode_command::*;
 pub use util_create_temperature_list::*;
 pub use settings_set_ui_settings::*;
 pub use quick_action_execute::*;
-pub use util_time_in_seconds_to_string::*;
+pub use util_time_in_seconds_to_string::*;
+pub use misc_set_power_device::*;
+pub use misc_fetch_power_devices::*;
diff --git a/ui/assets/power_device.svg b/ui/assets/power_device.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e3e3e3"><path d="M480-80q-26 0-47-12.5T400-126q-33 0-56.5-23.5T320-206v-142q-59-39-94.5-103T190-590q0-121 84.5-205.5T480-880q121 0 205.5 84.5T770-590q0 77-35.5 140T640-348v142q0 33-23.5 56.5T560-126q-12 21-33 33.5T480-80Zm-80-126h160v-36H400v36Zm0-76h160v-38H400v38Zm-8-118h58v-108l-88-88 42-42 76 76 76-76 42 42-88 88v108h58q54-26 88-76.5T690-590q0-88-61-149t-149-61q-88 0-149 61t-61 149q0 63 34 113.5t88 76.5Zm88-162Zm0-38Z"/></svg>
diff --git a/ui/constants.slint b/ui/constants.slint
@@ -28,6 +28,7 @@ export global Icons {
     out property <image> settings: @image-url("assets/settings.svg");
     out property <image> temperature: @image-url("assets/temperature.svg");
     out property <image> action: @image-url("assets/action.svg");
+    out property <image> power-device: @image-url("assets/power_device.svg");
 }
 
 export global Constants {
diff --git a/ui/pages/quick-actions-page.slint b/ui/pages/quick-actions-page.slint
@@ -1,38 +1,62 @@
 import { Page } from "../components/page.slint";
 import { ScrollView } from "std-widgets.slint";
-import { QuickActions } from "../state.slint";
+import { QuickActions, PowerDevices } from "../state.slint";
 import { Icons, Constants } from "../constants.slint";
-import { Palette, StyleMetrics } from "std-widgets.slint";
+import { Palette, StyleMetrics, Switch } from "std-widgets.slint";
 import { SmallButton } from "../components/small-button.slint";
 import { VerticalScrollable } from "../components/vertical.slint";
 import { HorizontalStretch } from "../components/horizontal.slint";
+import { PowerDevice } from "../types.slint";
 
-component QuickAction inherits Rectangle
+component PowerDevice inherits HorizontalStretch
 {
-    in property <string> quick-action;
-    width: 100%;
+    in property <PowerDevice> power-device;
 
-    HorizontalStretch {
-        Image {
-            source: Icons.action;
-            colorize: Palette.foreground;
-            width: Constants.thumbnail-size;
-            height: Constants.thumbnail-size;
-        }
+    Image {
+        source: Icons.power-device;
+        colorize: Palette.foreground;
+    }
 
-        Text { 
-            text: quick-action; 
-            horizontal-stretch: 1; 
-            vertical-alignment: center; 
-            overflow: elide; 
+    Text { 
+        text: power-device.device; 
+        horizontal-stretch: 1; 
+        vertical-alignment: center; 
+        overflow: elide; 
+    }
+
+    Switch {
+        text: self.checked ? "On" : "Off";
+        vertical-stretch: 1;
+        checked: power-device.status == "On";
+        toggled() => { 
+            PowerDevices.set_power_device_state(power-device.device, self.checked); 
         }
+    }
+}
+
+component QuickAction inherits HorizontalStretch
+{
+    in property <string> quick-action;
+
+    Image {
+        source: Icons.action;
+        colorize: Palette.foreground;
+    }
+
+    Text { 
+        text: quick-action; 
+        horizontal-stretch: 1; 
+        vertical-alignment: center; 
+        overflow: elide; 
+    }
 
-        SmallButton {
-            text: "Run";
-            width: 50px;
-            vertical-stretch: 1;
-            border-radius: Constants.radius-md;
-            clicked => { QuickActions.execute_quick_action(quick-action); }
+    SmallButton {
+        text: "Run";
+        width: 50px;
+        vertical-stretch: 1;
+        border-radius: Constants.radius-md;
+        clicked => { 
+            QuickActions.execute_quick_action(quick-action); 
         }
     }
 }
@@ -41,11 +65,19 @@ export component QuickActionsPage inherits Page
 {
     header: "Quick Actions";
 
-    // TODO: Power devices
-
+    init => {
+        PowerDevices.fetch_power_devices();
+    }
+    
     VerticalScrollable {
+        for power-device in PowerDevices.power_devices: PowerDevice {
+            power-device: power-device;
+            height: Constants.thumbnail-size;
+        }
+
         for quick-action in QuickActions.quick-actions: QuickAction { 
             quick-action: quick-action; 
+            height: Constants.thumbnail-size;
         }
     }
 
@@ -56,4 +88,25 @@ export component QuickActionsPage inherits Page
             horizontal-alignment: center;
         }
     }
+}
+
+component LivePreviewTest {
+    width: 480px - 100px;
+    height: 272px - 40px;
+
+    init => {
+        QuickActions.quick-actions = [
+            "Test1",
+            "Test2"
+        ];
+
+        PowerDevices.power_devices = [
+            { device: "Test device", status: "Off", locked_while_printing: false, device_type: "Simulated" },
+            { device: "Test device 2", status: "On", locked_while_printing: false, device_type: "Simulated" }
+        ]
+    }
+
+    QuickActionsPage {
+
+    }
 }
diff --git a/ui/state.slint b/ui/state.slint
@@ -1,4 +1,4 @@
-import { TemperatureSensor, HeaterFan, Heater, MoonrakerFile } from "types.slint";
+import { TemperatureSensor, HeaterFan, Heater, MoonrakerFile, PowerDevice } from "types.slint";
 import { Palette } from "std-widgets.slint";
 import { Icons } from "constants.slint";
 
@@ -96,4 +96,11 @@ export global ActiveUi
 {
     in-out property <length> width: 480px;
     in-out property <length> height: 272px;
+}
+
+export global PowerDevices
+{
+    in-out property <[PowerDevice]> power_devices: [];
+    callback set_power_device_state(device : string, state: bool);
+    callback fetch_power_devices();
 }
diff --git a/ui/types.slint b/ui/types.slint
@@ -31,4 +31,12 @@ export struct MoonrakerFile
     estimated_time_s: float,
     layer_height_mm: float,
     nozzle_diameter_mm: float,
+}
+
+export struct PowerDevice
+{
+    device: string,
+    status: string,
+    locked_while_printing: bool,
+    device_type: string,
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ export global Icons {`
`28`	`28`	`out property <image> settings: @image-url("assets/settings.svg");`
`29`	`29`	`out property <image> temperature: @image-url("assets/temperature.svg");`
`30`	`30`	`out property <image> action: @image-url("assets/action.svg");`
	`31`	`+ out property <image> power-device: @image-url("assets/power_device.svg");`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`export global Constants {`