Temperature presets

suchmememanyskill · suchmememanyskill · commit dbc2d6c79546 · 2025-09-23T01:49:22.000+02:00
diff --git a/example_configs/simulator.toml b/example_configs/simulator.toml
@@ -4,4 +4,8 @@ height = 272
 
 [moonraker]
 host = "localhost"
-port = 7125
+port = 7125
+
+[heater_presets]
+extruder = [ 200, 240, 280 ]
+heater_bed = [ 60, 70 ]
diff --git a/moonraker-rs/src/cache.rs b/moonraker-rs/src/cache.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 
 // TODO: Fill cache with configuration for min/max temp
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct Cache {
     pub webhooks: Webhooks,
     pub motion_report: MotionReport,
diff --git a/moonraker-rs/src/moonraker_connection.rs b/moonraker-rs/src/moonraker_connection.rs
@@ -71,10 +71,11 @@ pub struct MoonrakerConnection {
     outbound_event_sender: Sender<Arc<OutboundMessage>>,
     outbound_event_listener: Receiver<Arc<OutboundMessage>>,
     incrementing_id: Mutex<u32>,
+    preconfigured_cache: Option<Cache>,
 }
 
 impl MoonrakerConnection {
-    pub fn new(host: &str, port: u16) -> Self {
+    pub fn new(host: &str, port: u16, preconfigured_cache : Option<Cache>) -> Self {
         let host = format!("{}:{}", host, port);
 
         let req = Request::builder()
@@ -107,6 +108,7 @@ impl MoonrakerConnection {
             outbound_event_sender: outbound_event_sender,
             outbound_event_listener: outbound_event_listener,
             incrementing_id: Mutex::new(1),
+            preconfigured_cache
         }
     }
 
@@ -126,7 +128,7 @@ impl MoonrakerConnection {
                 .expect("Failed to internally send a disconnect event");
             let reader;
             let writer;
-            let cache = Arc::new(Mutex::new(Cache::new()));
+            let cache = Arc::new(Mutex::new(self.preconfigured_cache.clone().unwrap_or_default()));
 
             match self.reconnect().await {
                 Ok((r, w)) => {
diff --git a/moonraker-rs/src/printer_objects/extruder.rs b/moonraker-rs/src/printer_objects/extruder.rs
@@ -1,7 +1,7 @@
 use optional_struct::*;
 use serde::Deserialize;
 
-use crate::printer_objects::TempControl;
+use crate::printer_objects::TemperatureConfiguration;
 
 #[optional_struct]
 #[derive(Debug, Deserialize, Clone)]
@@ -13,7 +13,7 @@ pub struct Extruder {
     pub pressure_advance: f32,
     pub smooth_time: f32,
     pub motion_queue: Option<String>,
-    pub temp_control: TempControl
+    pub configuration: TemperatureConfiguration
 }
 
 impl Default for Extruder {
@@ -26,7 +26,7 @@ impl Default for Extruder {
             pressure_advance: 0.0,
             smooth_time: 0.0,
             motion_queue: None,
-            temp_control: TempControl::default_hotend(),
+            configuration: TemperatureConfiguration::default_hotend(),
         }
     }
 }
@@ -54,8 +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;
+        if let Some(configuration) = extruder.configuration {
+            self.configuration = configuration;
         }
     }
 }
diff --git a/moonraker-rs/src/printer_objects/heater_bed.rs b/moonraker-rs/src/printer_objects/heater_bed.rs
@@ -1,15 +1,15 @@
 use optional_struct::*;
 use serde::Deserialize;
 
-use crate::printer_objects::TempControl;
+use crate::printer_objects::TemperatureConfiguration;
 
 #[optional_struct]
 #[derive(Debug, Deserialize, Clone)]
 pub struct HeaterBed {
     pub temperature: f32,
     pub target: f32,
     pub power: f32,
-    pub temp_control: TempControl,
+    pub configuration: TemperatureConfiguration,
 }
 
 impl Default for HeaterBed {
@@ -18,7 +18,7 @@ impl Default for HeaterBed {
             temperature: 0.0,
             target: 0.0,
             power: 0.0,
-            temp_control: TempControl::default_bed(),
+            configuration: TemperatureConfiguration::default_bed(),
         }
     }
 }
@@ -34,8 +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;
+        if let Some(configuration) = heater_bed.configuration {
+            self.configuration = configuration;
         }
     }
 }
diff --git a/moonraker-rs/src/printer_objects/mod.rs b/moonraker-rs/src/printer_objects/mod.rs
@@ -15,7 +15,7 @@ pub mod temperature_sensor;
 pub mod toolhead;
 pub mod virtual_sdcard;
 pub mod webhooks;
-pub mod temp_control;
+pub mod temp_config;
 
 pub use display_status::*;
 pub use exclude_object::*;
@@ -34,4 +34,4 @@ pub use temperature_sensor::*;
 pub use toolhead::*;
 pub use virtual_sdcard::*;
 pub use webhooks::*;
-pub use temp_control::*;
+pub use temp_config::*;
diff --git a/moonraker-rs/src/printer_objects/temp_config.rs b/moonraker-rs/src/printer_objects/temp_config.rs
@@ -0,0 +1,28 @@
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize, Clone, PartialEq)]
+pub struct TemperatureConfiguration
+{
+    pub presets : Vec<u32>
+}
+
+impl TemperatureConfiguration {
+    pub fn default_hotend() -> Self {
+        Self {
+            presets: vec![200, 240, 260],
+        }
+    }
+    pub fn default_bed() -> Self {
+        Self {
+            presets: vec![40, 60, 70],
+        }
+    }
+    pub fn default_fan() -> Self {
+        Self {
+            presets: vec![40, 50, 60],
+        }
+    }
+    pub fn from(presets: Vec<u32>) -> Self {
+        Self { presets }
+    }
+}
diff --git a/moonraker-rs/src/printer_objects/temp_control.rs b/moonraker-rs/src/printer_objects/temp_control.rs
diff --git a/moonraker-rs/src/printer_objects/temperature_fan.rs b/moonraker-rs/src/printer_objects/temperature_fan.rs
@@ -1,7 +1,7 @@
 use optional_struct::*;
 use serde::Deserialize;
 
-use crate::printer_objects::TempControl;
+use crate::printer_objects::TemperatureConfiguration;
 
 #[optional_struct]
 #[derive(Debug, Deserialize, Clone)]
@@ -10,7 +10,7 @@ pub struct TemperatureFan {
     pub rpm: Option<f32>,
     pub temperature: f32,
     pub target: f32,
-    pub temp_control: TempControl
+    pub configuration: TemperatureConfiguration
 }
 
 impl Default for TemperatureFan {
@@ -20,7 +20,7 @@ impl Default for TemperatureFan {
             rpm: None,
             temperature: 0.0,
             target: 0.0,
-            temp_control: TempControl::default_fan(),
+            configuration: TemperatureConfiguration::default_fan(),
         }
     }
 }
@@ -51,8 +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;
+        if let Some(configuration) = fan.configuration {
+            self.configuration = configuration;
         }
     }
 }
diff --git a/src/config/config.rs b/src/config/config.rs
@@ -1,4 +1,7 @@
+use std::collections::HashMap;
+
 use crate::config::MoonrakerConfig;
+use moonraker_rs::printer_objects::TemperatureConfiguration;
 use serde::Deserialize;
 
 use super::DisplayConfig;
@@ -7,4 +10,5 @@ use super::DisplayConfig;
 pub struct Config {
     pub display: DisplayConfig,
     pub moonraker: Option<MoonrakerConfig>,
+    pub heater_presets: Option<HashMap<String, Vec<u32>>>,
 }
diff --git a/src/event_loop/temperature_devices.rs b/src/event_loop/temperature_devices.rs
@@ -20,33 +20,29 @@ impl TemperatureDevicesHandler for EventLoop {
         printer_event: &PrinterEvent,
     ) -> Result<(), ApplicationError> {
         if let PrinterEvent::Extruder(extruder_event) = printer_event {
-            let extruder = Heater {
-                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,
-            };
-
+            let extruder_event = extruder_event.clone();
+            
             self.ui_weak
                 .upgrade_in_event_loop(Box::new(move |ui: AppWindow| {
-                    ui.global::<TemperatureSensors>().set_extruder(extruder)
+                    ui.global::<TemperatureSensors>().set_extruder(Heater {
+                        name: SharedString::from("extruder"),
+                        target: extruder_event.target as i32,
+                        temperature: extruder_event.temperature as i32,
+                        presets: ModelRc::new(Rc::new(VecModel::from(extruder_event.configuration.presets.iter().map(|f| *f as i32).collect::<Vec<i32>>()))),
+                    })
                 }))?;
         }
 
         if let PrinterEvent::HeaterBed(heater_bed_event) = printer_event {
-            let bed = Heater {
-                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,
-            };
+            let heater_bed_event = heater_bed_event.clone();
 
             self.ui_weak.upgrade_in_event_loop(move |ui: AppWindow| {
-                ui.global::<TemperatureSensors>().set_heated_bed(bed)
+                ui.global::<TemperatureSensors>().set_heated_bed(Heater {
+                    name: SharedString::from("heater_bed"),
+                    target: heater_bed_event.target as i32,
+                    temperature: heater_bed_event.temperature as i32,
+                    presets: ModelRc::new(Rc::new(VecModel::from(heater_bed_event.configuration.presets.iter().map(|f| *f as i32).collect::<Vec<i32>>()))),
+                })
             })?;
         }
 
@@ -84,17 +80,8 @@ impl TemperatureDevicesHandler for EventLoop {
         }
 
         if let PrinterEvent::TemperatureFan(temperature_fan_event) = printer_event {
-            let sensor_event = HeaterFan {
-                heater: Heater {
-                    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,
-            };
+            let temperature_fan_event = temperature_fan_event.clone();
+
 
             self.ui_weak
                 .upgrade_in_event_loop(move |ui| {
@@ -109,6 +96,16 @@ impl TemperatureDevicesHandler for EventLoop {
                         None => vec![],
                     };
 
+                    let sensor_event = HeaterFan {
+                        heater: Heater {
+                            name: SharedString::from(&temperature_fan_event.name),
+                            temperature: temperature_fan_event.fan.temperature as i32,
+                            target: temperature_fan_event.fan.target as i32,
+                            presets: ModelRc::new(Rc::new(VecModel::from(temperature_fan_event.fan.configuration.presets.iter().map(|f| *f as i32).collect::<Vec<i32>>())))
+                        },
+                        speed: temperature_fan_event.fan.speed,
+                    };
+
                     let index = entries
                         .iter()
                         .position(|sensor| sensor.heater.name == sensor_event.heater.name);
diff --git a/src/main.rs b/src/main.rs
@@ -5,9 +5,7 @@ use std::{cmp::Ordering, error::Error, fs, path::PathBuf, process::exit, rc::Rc,
 
 use clap::Parser;
 use moonraker_rs::{
-    connector::websocket_read::{MoonrakerEvent, PrinterEvent},
-    moonraker_connection::WebsocketEvent,
-    requests::{FileManagementRequestHandler, PrinterAdministrationRequestHandler},
+    cache::Cache, connector::{read_deserialize::OptionalPrinterEvent, websocket_read::{MoonrakerEvent, PrinterEvent}}, moonraker_connection::WebsocketEvent, printer_objects::{NamedOptionalTemperatureFan, OptionalExtruder, OptionalHeaterBed, OptionalTemperatureFan, TemperatureConfiguration}, requests::{FileManagementRequestHandler, PrinterAdministrationRequestHandler}
 };
 use slint::{Image, Model, ModelRc, Rgba8Pixel, SharedPixelBuffer, SharedString, VecModel};
 use tokio::sync::Mutex;
@@ -34,11 +32,37 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let config_str = fs::read_to_string(&config_path).unwrap();
     let config = toml::from_str::<config::Config>(&config_str).unwrap();
     let moonraker_config = config.moonraker.unwrap_or(MoonrakerConfig::default());
+    let mut cache = Cache::default();
+
+    if let Some(heater_presets) = config.heater_presets {
+        for (name, preset) in heater_presets {
+            if name == "extruder" {
+                cache.complete_event(OptionalPrinterEvent::Extruder(OptionalExtruder {
+                    configuration: Some(TemperatureConfiguration::from(preset)),
+                    ..Default::default()
+                }));
+            } else if name == "heater_bed" {
+                cache.complete_event(OptionalPrinterEvent::HeaterBed(OptionalHeaterBed {
+                    configuration: Some(TemperatureConfiguration::from(preset)),
+                    ..Default::default()
+                }));
+            } else {
+                cache.complete_event(OptionalPrinterEvent::TemperatureFan(NamedOptionalTemperatureFan {
+                    name: name,
+                    fan: OptionalTemperatureFan {
+                        configuration: Some(TemperatureConfiguration::from(preset)),
+                        ..Default::default()
+                    }
+                }));
+            }
+        }
+    }
 
     let moonraker_connection = Arc::new(
         moonraker_rs::moonraker_connection::MoonrakerConnection::new(
             &moonraker_config.host,
             moonraker_config.port,
+            Some(cache),
         ),
     );
     let ui = init_display(&config.display)?;
diff --git a/ui/assets/backspace.svg b/ui/assets/backspace.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="m456-320 104-104 104 104 56-56-104-104 104-104-56-56-104 104-104-104-56 56 104 104-104 104 56 56Zm-96 160q-19 0-36-8.5T296-192L80-480l216-288q11-15 28-23.5t36-8.5h440q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H360ZM180-480l180 240h440v-480H360L180-480Zm400 0Z"/></svg>
diff --git a/ui/assets/check.svg b/ui/assets/check.svg
diff --git a/ui/assets/close.svg b/ui/assets/close.svg
diff --git a/ui/main.slint b/ui/main.slint
diff --git a/ui/state.slint b/ui/state.slint
diff --git a/ui/virtual_keyboard.slint b/ui/virtual_keyboard.slint

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`use optional_struct::*;`
`2`	`2`	`use serde::Deserialize;`
`3`	`3`
`4`		`-use crate::printer_objects::TempControl;`
	`4`	`+use crate::printer_objects::TemperatureConfiguration;`
`5`	`5`
`6`	`6`	`#[optional_struct]`
`7`	`7`	`#[derive(Debug, Deserialize, Clone)]`
`@@ -13,7 +13,7 @@ pub struct Extruder {`
`13`	`13`	`pub pressure_advance: f32,`
`14`	`14`	`pub smooth_time: f32,`
`15`	`15`	`pub motion_queue: Option<String>,`
`16`		`- pub temp_control: TempControl`
	`16`	`+ pub configuration: TemperatureConfiguration`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`impl Default for Extruder {`
`@@ -26,7 +26,7 @@ impl Default for Extruder {`
`26`	`26`	`pressure_advance: 0.0,`
`27`	`27`	`smooth_time: 0.0,`
`28`	`28`	`motion_queue: None,`
`29`		`- temp_control: TempControl::default_hotend(),`
	`29`	`+ configuration: TemperatureConfiguration::default_hotend(),`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
`@@ -54,8 +54,8 @@ impl Extruder {`
`54`	`54`	`if let Some(motion_queue) = extruder.motion_queue {`
`55`	`55`	`self.motion_queue = Some(motion_queue);`
`56`	`56`	`}`
`57`		`- if let Some(temp_control) = extruder.temp_control {`
`58`		`- self.temp_control = temp_control;`
	`57`	`+ if let Some(configuration) = extruder.configuration {`
	`58`	`+ self.configuration = configuration;`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`use optional_struct::*;`
`2`	`2`	`use serde::Deserialize;`
`3`	`3`
`4`		`-use crate::printer_objects::TempControl;`
	`4`	`+use crate::printer_objects::TemperatureConfiguration;`
`5`	`5`
`6`	`6`	`#[optional_struct]`
`7`	`7`	`#[derive(Debug, Deserialize, Clone)]`
`8`	`8`	`pub struct HeaterBed {`
`9`	`9`	`pub temperature: f32,`
`10`	`10`	`pub target: f32,`
`11`	`11`	`pub power: f32,`
`12`		`- pub temp_control: TempControl,`
	`12`	`+ pub configuration: TemperatureConfiguration,`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`impl Default for HeaterBed {`
`@@ -18,7 +18,7 @@ impl Default for HeaterBed {`
`18`	`18`	`temperature: 0.0,`
`19`	`19`	`target: 0.0,`
`20`	`20`	`power: 0.0,`
`21`		`- temp_control: TempControl::default_bed(),`
	`21`	`+ configuration: TemperatureConfiguration::default_bed(),`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`
`@@ -34,8 +34,8 @@ impl HeaterBed {`
`34`	`34`	`if let Some(power) = heater_bed.power {`
`35`	`35`	`self.power = power;`
`36`	`36`	`}`
`37`		`- if let Some(temp_control) = heater_bed.temp_control {`
`38`		`- self.temp_control = temp_control;`
	`37`	`+ if let Some(configuration) = heater_bed.configuration {`
	`38`	`+ self.configuration = configuration;`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`