Implement filament retract/extrude and load/unload

Author: suchmememanyskill

Cargo.lock

@@ -14,6 +14,7 @@ serde = "1.0"
 tokio = { version = "1", features = ["full"]}
 moonraker-rs = { path = "./moonraker-rs"}
 image = { version = "0", default-features = false, features = ["png"] }
+optional_struct = "0"
 
 [target.'cfg(unix)'.dependencies]
 evdev = "0"

Cargo.toml

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use crate::config::MoonrakerConfig;
+use crate::config::{MoonrakerConfig, OptionalGcodeCommands};
 use moonraker_rs::printer_objects::TemperatureConfiguration;
 use serde::Deserialize;
 
@@ -11,4 +11,5 @@ pub struct Config {
     pub display: DisplayConfig,
     pub moonraker: Option<MoonrakerConfig>,
     pub heater_presets: Option<HashMap<String, Vec<u32>>>,
+    pub gcode_commands: Option<OptionalGcodeCommands>,
 }

src/config/config.rs

@@ -0,0 +1,23 @@
+use optional_struct::optional_struct;
+use serde::Deserialize;
+
+#[optional_struct]
+#[derive(Deserialize, Debug)]
+pub struct GcodeCommands 
+{
+    pub extruder_extrude: String,
+    pub extruder_retract: String,
+    pub extruder_load_filament: String,
+    pub extruder_unload_filament: String,
+}
+
+impl Default for GcodeCommands {
+    fn default() -> Self {
+        Self {
+            extruder_extrude: "M83\nG1 E25 F300".into(),
+            extruder_retract: "M83\nG1 E-25 F300".into(),
+            extruder_load_filament: "LOAD_FILAMENT".into(),
+            extruder_unload_filament: "UNLOAD_FILAMENT".into(),
+        }
+    }
+}

src/config/gcode_commands.rs

@@ -5,6 +5,7 @@ pub mod display_default;
 #[cfg(unix)]
 pub mod display_fb;
 pub mod moonraker;
+pub mod gcode_commands;
 
 pub use cli::*;
 pub use config::*;
@@ -13,3 +14,4 @@ pub use display_default::*;
 #[cfg(unix)]
 pub use display_fb::*;
 pub use moonraker::*;
+pub use gcode_commands::*;

src/config/mod.rs

@@ -10,7 +10,7 @@ use moonraker_rs::{
 use slint::{Image, Model, ModelRc, Rgba8Pixel, SharedPixelBuffer, SharedString, VecModel};
 use tokio::sync::Mutex;
 
-use crate::{config::MoonrakerConfig, event_loop::EventLoop, hardware::init_display, ui_functions::{register_filesystem_download_thumbnails, register_filesystem_list_files, register_printer_emergency_stop, register_printer_firmware_restart, register_printer_restart, register_temperature_set_new_target_temperature, register_util_format_bytes, register_util_image_exists, register_util_prettify_name}};
+use crate::{config::{MoonrakerConfig, OptionalGcodeCommands}, event_loop::EventLoop, hardware::init_display, ui_functions::{register_extruder_extrude, register_extruder_load_filament, register_extruder_retract, register_extruder_unload_filament, register_filesystem_download_thumbnails, register_filesystem_list_files, register_printer_emergency_stop, register_printer_firmware_restart, register_printer_restart, register_temperature_set_new_target_temperature, register_util_format_bytes, register_util_image_exists, register_util_prettify_name}};
 
 mod application_error;
 mod config;
@@ -95,6 +95,12 @@ async fn main() -> Result<(), Box<dyn Error>> {
     register_printer_firmware_restart(&ui, &moonraker_connection);
     register_printer_restart(&ui, &moonraker_connection);
 
+    let gcode_command_config = &config.gcode_commands.unwrap_or(OptionalGcodeCommands::default());
+    register_extruder_extrude(&ui, &moonraker_connection, gcode_command_config);
+    register_extruder_retract(&ui, &moonraker_connection, gcode_command_config);
+    register_extruder_load_filament(&ui, &moonraker_connection, gcode_command_config);
+    register_extruder_unload_filament(&ui, &moonraker_connection, gcode_command_config);
+
     tokio::task::block_in_place(|| {
         ui.run().unwrap();
     });

src/main.rs

@@ -7,6 +7,7 @@ pub mod temperature_set_new_target_temperature;
 pub mod printer_emergency_stop;
 pub mod printer_restart;
 pub mod printer_firmware_restart;
+pub mod printer_execute_gcode_command;
 
 pub use util_format_bytes::*;
 pub use filesystem_download_thumbnail::*;
@@ -16,4 +17,5 @@ pub use util_prettify_name::*;
 pub use temperature_set_new_target_temperature::*;
 pub use printer_emergency_stop::*;
 pub use printer_restart::*;
-pub use printer_firmware_restart::*;
+pub use printer_firmware_restart::*;
+pub use printer_execute_gcode_command::*;

src/ui_functions/mod.rs

@@ -0,0 +1,64 @@
+use std::sync::Arc;
+
+use moonraker_rs::{moonraker_connection::{MoonrakerConnection}, requests::PrinterAdministrationRequestHandler};
+use slint::ComponentHandle;
+
+use crate::{config::OptionalGcodeCommands, config::GcodeCommands as GcodeCommandsConfig, AppWindow, GcodeCommands};
+
+
+pub fn run_command(moonraker_connection : &Arc<MoonrakerConnection>, command : &str)
+{
+    let command = command.to_string();
+    let moonraker_connection = Arc::clone(moonraker_connection);
+    // TODO: For other callbacks that don't use the slint main thread, maybe don't run them on the slint event loop?
+    tokio::spawn(async move {
+        if let Err(e) = moonraker_connection.run_gcode_script(&command).await
+        {
+            moonraker_connection.send_request_error(format!("Failed to send G-code command '{}': {}", command, e));
+        }
+    });
+}
+
+pub fn register_extruder_extrude(ui: &AppWindow, moonraker_connection : &Arc<MoonrakerConnection>, gcode_command_config : &OptionalGcodeCommands)
+{
+    let command = gcode_command_config.extruder_extrude.clone().unwrap_or(GcodeCommandsConfig::default().extruder_extrude);
+    let moonraker_connection = Arc::clone(moonraker_connection);
+
+    ui.global::<GcodeCommands>().set_extruder_extrude_available(!command.is_empty());
+    ui.global::<GcodeCommands>().on_extruder_extrude(move || {
+        run_command(&moonraker_connection, &command);
+    });
+}
+
+pub fn register_extruder_retract(ui: &AppWindow, moonraker_connection : &Arc<MoonrakerConnection>, gcode_command_config : &OptionalGcodeCommands)
+{
+    let command = gcode_command_config.extruder_retract.clone().unwrap_or(GcodeCommandsConfig::default().extruder_retract);
+    let moonraker_connection = Arc::clone(moonraker_connection);
+
+    ui.global::<GcodeCommands>().set_extruder_retract_available(!command.is_empty());
+    ui.global::<GcodeCommands>().on_extruder_retract(move || {
+        run_command(&moonraker_connection, &command);
+    });
+}
+
+pub fn register_extruder_load_filament(ui: &AppWindow, moonraker_connection : &Arc<MoonrakerConnection>, gcode_command_config : &OptionalGcodeCommands)
+{
+    let command = gcode_command_config.extruder_load_filament.clone().unwrap_or(GcodeCommandsConfig::default().extruder_load_filament);
+    let moonraker_connection = Arc::clone(moonraker_connection);
+
+    ui.global::<GcodeCommands>().set_extruder_load_filament_available(!command.is_empty());
+    ui.global::<GcodeCommands>().on_extruder_load_filament(move || {
+        run_command(&moonraker_connection, &command);
+    });
+}
+
+pub fn register_extruder_unload_filament(ui: &AppWindow, moonraker_connection : &Arc<MoonrakerConnection>, gcode_command_config : &OptionalGcodeCommands)
+{
+    let command = gcode_command_config.extruder_unload_filament.clone().unwrap_or(GcodeCommandsConfig::default().extruder_unload_filament);
+    let moonraker_connection = Arc::clone(moonraker_connection);
+
+    ui.global::<GcodeCommands>().set_extruder_unload_filament_available(!command.is_empty());
+    ui.global::<GcodeCommands>().on_extruder_unload_filament(move || {
+        run_command(&moonraker_connection, &command);
+    });
+}