Get temperature setting kinda working

Author: suchmememanyskill

moonraker-rs/src/cache.rs

@@ -3,6 +3,7 @@ use crate::{
     printer_objects::*,
 };
 
+// TODO: Fill cache with configuration for min/max temp
 #[derive(Debug, Default)]
 pub struct Cache {
     pub webhooks: Webhooks,
@@ -16,7 +17,7 @@ pub struct Cache {
     pub virtual_sdcard: VirtualSdcard,
     pub print_stats: PrintStats,
     pub display_status: DisplayStatus,
-    pub temperature_sensors: Vec<NamedTemperatureSensor>,
+    pub temperature_sensors: Vec<NamedTemperatureSensor>, 
     pub temperature_fans: Vec<NamedTemperatureFan>,
     pub filament_switch_sensors: Vec<NamedFilamentSwitchSensor>,
     pub output_pins: Vec<NamedOutputPin>,

moonraker-rs/src/printer_objects/extruder.rs

@@ -1,8 +1,10 @@
 use optional_struct::*;
 use serde::Deserialize;
 
+use crate::printer_objects::TempControl;
+
 #[optional_struct]
-#[derive(Debug, Deserialize, Default, Clone)]
+#[derive(Debug, Deserialize, Clone)]
 pub struct Extruder {
     pub temperature: f32,
     pub target: f32,
@@ -11,6 +13,22 @@ pub struct Extruder {
     pub pressure_advance: f32,
     pub smooth_time: f32,
     pub motion_queue: Option<String>,
+    pub temp_control: TempControl
+}
+
+impl Default for Extruder {
+    fn default() -> Self {
+        Self {
+            temperature: 0.0,
+            target: 0.0,
+            power: 0.0,
+            can_extrude: false,
+            pressure_advance: 0.0,
+            smooth_time: 0.0,
+            motion_queue: None,
+            temp_control: TempControl::default_hotend(),
+        }
+    }
 }
 
 impl Extruder {
@@ -36,5 +54,8 @@ impl Extruder {
         if let Some(motion_queue) = extruder.motion_queue {
             self.motion_queue = Some(motion_queue);
         }
+        if let Some(temp_control) = extruder.temp_control {
+            self.temp_control = temp_control;
+        }
     }
 }

moonraker-rs/src/printer_objects/heater_bed.rs

@@ -1,12 +1,26 @@
 use optional_struct::*;
 use serde::Deserialize;
 
+use crate::printer_objects::TempControl;
+
 #[optional_struct]
-#[derive(Debug, Deserialize, Default, Clone)]
+#[derive(Debug, Deserialize, Clone)]
 pub struct HeaterBed {
     pub temperature: f32,
     pub target: f32,
     pub power: f32,
+    pub temp_control: TempControl,
+}
+
+impl Default for HeaterBed {
+    fn default() -> Self {
+        Self {
+            temperature: 0.0,
+            target: 0.0,
+            power: 0.0,
+            temp_control: TempControl::default_bed(),
+        }
+    }
 }
 
 impl HeaterBed {
@@ -20,5 +34,8 @@ impl HeaterBed {
         if let Some(power) = heater_bed.power {
             self.power = power;
         }
+        if let Some(temp_control) = heater_bed.temp_control {
+            self.temp_control = temp_control;
+        }
     }
 }

moonraker-rs/src/printer_objects/mod.rs

@@ -15,6 +15,7 @@ pub mod temperature_sensor;
 pub mod toolhead;
 pub mod virtual_sdcard;
 pub mod webhooks;
+pub mod temp_control;
 
 pub use display_status::*;
 pub use exclude_object::*;
@@ -33,3 +34,4 @@ pub use temperature_sensor::*;
 pub use toolhead::*;
 pub use virtual_sdcard::*;
 pub use webhooks::*;
+pub use temp_control::*;

moonraker-rs/src/printer_objects/temp_control.rs

@@ -0,0 +1,33 @@
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize, Clone, PartialEq)]
+pub struct TempControl
+{
+    pub min_temp: i32,
+    pub max_temp: i32,
+    pub step_temp: i32,
+}
+
+impl TempControl {
+    pub fn default_hotend() -> Self {
+        Self {
+            min_temp: 180,
+            max_temp: 300,
+            step_temp: 5,
+        }
+    }
+    pub fn default_bed() -> Self {
+        Self {
+            min_temp: 30,
+            max_temp: 120,
+            step_temp: 5,
+        }
+    }
+    pub fn default_fan() -> Self {
+        Self {
+            min_temp: 30,
+            max_temp: 60,
+            step_temp: 5,
+        }
+    }
+}

moonraker-rs/src/printer_objects/temperature_fan.rs

@@ -1,13 +1,28 @@
 use optional_struct::*;
 use serde::Deserialize;
 
+use crate::printer_objects::TempControl;
+
 #[optional_struct]
-#[derive(Debug, Deserialize, Default, Clone)]
+#[derive(Debug, Deserialize, Clone)]
 pub struct TemperatureFan {
     pub speed: f32,
     pub rpm: Option<f32>,
     pub temperature: f32,
     pub target: f32,
+    pub temp_control: TempControl
+}
+
+impl Default for TemperatureFan {
+    fn default() -> Self {
+        Self {
+            speed: 0.0,
+            rpm: None,
+            temperature: 0.0,
+            target: 0.0,
+            temp_control: TempControl::default_fan(),
+        }
+    }
 }
 
 #[derive(Debug, Deserialize, Default, Clone)]
@@ -36,5 +51,8 @@ impl TemperatureFan {
         if let Some(target) = fan.target {
             self.target = target;
         }
+        if let Some(temp_control) = fan.temp_control {
+            self.temp_control = temp_control;
+        }
     }
 }

moonraker-rs/src/requests/printer_administration.rs

@@ -12,6 +12,7 @@ pub trait PrinterAdministrationRequestHandler {
         &self,
         objects: Vec<String>,
     ) -> Result<PrinterObjectsSubscribeResult, Error>;
+    async fn run_gcode_script(&self, script: &str) -> Result<String, Error>;
 }
 
 impl PrinterAdministrationRequestHandler for MoonrakerConnection {
@@ -35,6 +36,11 @@ impl PrinterAdministrationRequestHandler for MoonrakerConnection {
         self.send_request("printer.objects.subscribe", Some(args))
             .await
     }
+    
+    async fn run_gcode_script(&self, script: &str) -> Result<String, Error> {
+        let args = serde_json::json!({ "script": script });
+        self.send_request("printer.gcode.script", Some(args)).await
+    }
 }
 
 #[derive(Debug, Deserialize)]

src/event_loop/temperature_devices.rs

@@ -24,6 +24,9 @@ impl TemperatureDevicesHandler for EventLoop {
                 name: SharedString::from("extruder"),
                 target: extruder_event.target as i32,
                 temperature: extruder_event.temperature as i32,
+                min_temp: extruder_event.temp_control.min_temp,
+                max_temp: extruder_event.temp_control.max_temp,
+                step: extruder_event.temp_control.step_temp,
             };
 
             self.ui_weak
@@ -34,9 +37,12 @@ impl TemperatureDevicesHandler for EventLoop {
 
         if let PrinterEvent::HeaterBed(heater_bed_event) = printer_event {
             let bed = Heater {
-                name: SharedString::from("heated_bed"),
+                name: SharedString::from("heater_bed"),
                 target: heater_bed_event.target as i32,
                 temperature: heater_bed_event.temperature as i32,
+                min_temp: heater_bed_event.temp_control.min_temp,
+                max_temp: heater_bed_event.temp_control.max_temp,
+                step: heater_bed_event.temp_control.step_temp,
             };
 
             self.ui_weak.upgrade_in_event_loop(move |ui: AppWindow| {
@@ -83,6 +89,9 @@ impl TemperatureDevicesHandler for EventLoop {
                     name: SharedString::from(&temperature_fan_event.name),
                     temperature: temperature_fan_event.fan.temperature as i32,
                     target: temperature_fan_event.fan.target as i32,
+                    min_temp: temperature_fan_event.fan.temp_control.min_temp,
+                    max_temp: temperature_fan_event.fan.temp_control.max_temp,
+                    step: temperature_fan_event.fan.temp_control.step_temp,
                 },
                 speed: temperature_fan_event.fan.speed,
             };

src/main.rs

@@ -7,7 +7,7 @@ use clap::Parser;
 use moonraker_rs::{
     connector::websocket_read::{MoonrakerEvent, PrinterEvent},
     moonraker_connection::WebsocketEvent,
-    requests::FileManagementRequestHandler,
+    requests::{FileManagementRequestHandler, PrinterAdministrationRequestHandler},
 };
 use slint::{Image, Model, ModelRc, Rgba8Pixel, SharedPixelBuffer, SharedString, VecModel};
 use tokio::sync::Mutex;
@@ -49,6 +49,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     let moonraker_connection_clone = moonraker_connection.clone();
     let moonraker_connection_clone_2 = moonraker_connection.clone();
+    let moonraker_connection_clone_3 = moonraker_connection.clone();
 
     let mut receiver = moonraker_connection.get_listener();
 
@@ -193,6 +194,19 @@ async fn main() -> Result<(), Box<dyn Error>> {
         SharedString::from(format!("{:.2} {}", value, units[idx]))
     });
 
+    ui.global::<TemperatureSensors>().on_set_new_target_temperature(move |heater_name, target| {
+        println!("Set new target temperature for {}: {}", heater_name, target);
+        let moonraker_connection = moonraker_connection_clone_3.clone();
+        slint::spawn_local(async move {
+            let heater_name = heater_name.to_string();
+            // TODO: Double check if this works with temperature_fan's
+            let moonraker_connection = moonraker_connection.clone();
+            let command = format!("SET_HEATER_TEMPERATURE HEATER={} TARGET={}", heater_name, target);
+            moonraker_connection.run_gcode_script(&command).await.expect("Failed to set heater temperature");
+        })
+        .unwrap();
+    });
+
     tokio::task::block_in_place(|| {
         ui.run().unwrap();
     });