octoturge
588ca85842
`cargo check --all-targets` emitted 32 warnings; it now emits none. Almost all of them came from one cause: main.rs declared `mod config/fleet/printer/uplink` while lib.rs declared the same modules, so every file was compiled twice, once per crate. In the binary copy nothing is externally reachable, so every `pub use` re-export and every method that only an example or a test calls was genuinely dead - and the warnings were real about the binary while being wrong about the library's actual public API. main.rs now uses the library crate and keeps only `mod go2rtc`, which nothing else needs. The rest, individually: - `ModuleInfo` was re-exported from bambu_commands but not from printer, so it was unreachable even though `GetVersionResponse.module` is a public field of type `Vec<ModuleInfo>` - a caller could not name the type of a field it can read. Re-exported rather than dropped. - Three stub `publish` impls take a payload they do not use yet; renamed to `_payload`. - One unused import in examples/test_bambu_certs.rs. That leaves the `async_fn_in_trait` lint on GenericPrinter, which is now `allow`ed with the reasoning written down rather than left to fire on every build. The old comment said it "only matters once this is wired into the multi-threaded daemon", which has since happened - so the question got answered instead of deferred: the futures cannot be required to be `Send`, and that is fine because every printer is reached through one Arc<Mutex<Vec<..>>> from the uplink's own task, so they are created and polled in the same place. The note says what to do if a printer ever gets its own task. No behaviour change. Tests still pass and the daemon was re-verified against the live P1P and H2C through the full backend path.
62 lines
2.4 KiB
Rust
62 lines
2.4 KiB
Rust
use super::{GenericPrinter, PrinterBase, PrinterError};
|
|
|
|
pub struct KlipperPrinter {
|
|
base: PrinterBase,
|
|
}
|
|
|
|
impl KlipperPrinter {
|
|
pub fn new(id: &str, name: &str, host: &str) -> Self {
|
|
Self {
|
|
base: PrinterBase { id: id.into(), name: name.into(), host: host.into() },
|
|
}
|
|
}
|
|
}
|
|
|
|
impl GenericPrinter for KlipperPrinter {
|
|
fn base(&self) -> &PrinterBase {
|
|
&self.base
|
|
}
|
|
|
|
/// OVERRIDE: a third, again-different body - Moonraker's real feed is a
|
|
/// WebSocket (see `adapters::moonraker`). This also shows the `Err`
|
|
/// path: an empty `host` fails immediately, same as any other vendor
|
|
/// would if it couldn't reach its printer.
|
|
async fn connect(&mut self) -> Result<(), PrinterError> {
|
|
if self.base.host.is_empty() {
|
|
return Err(PrinterError(format!("{} has no host configured", self.base.name)));
|
|
}
|
|
println!("[{}] connecting over WebSocket (Moonraker)", self.base.name);
|
|
Ok(())
|
|
}
|
|
|
|
async fn publish(&mut self, _payload: String) -> Result<(), PrinterError> {
|
|
// TODO: add publishing via HTTP
|
|
Ok(())
|
|
}
|
|
|
|
/// OVERRIDE: Moonraker's own **hypothetical** native API, not gcode injection - no
|
|
/// percent-to-PWM conversion needed since it already takes a
|
|
/// percentage directly. Real version:
|
|
/// `POST /printer/gcode/script?script=SET_FAN_SPEED SPEED=0.NN`.
|
|
async fn set_fan_speed(&mut self, percent: u8) -> Result<(), PrinterError> {
|
|
println!("[{}] Moonraker: SET_FAN_SPEED SPEED={:.2}", self.base.name, percent as f32 / 100.0);
|
|
Ok(())
|
|
}
|
|
|
|
/// OVERRIDE: real version is a multipart `POST /server/files/upload`
|
|
/// with `data` as the file part - Moonraker stores it on the printer's
|
|
/// virtual SD card, same upload-then-start model as Bambu/PrusaLink.
|
|
async fn upload_project_file(&mut self, file_name: String, data: Vec<u8>) -> Result<(), PrinterError> {
|
|
println!("[{}] POST /server/files/upload {file_name} ({} bytes)", self.base.name, data.len());
|
|
Ok(())
|
|
}
|
|
|
|
/// OVERRIDE: Moonraker's gcode-script endpoint, one line per call - same
|
|
/// idea as `set_fan_speed`'s `SET_FAN_SPEED` call above, just with an
|
|
/// arbitrary line instead of a hardcoded one.
|
|
async fn send_gcode_line(&mut self, gcode_line: String) -> Result<(), PrinterError> {
|
|
println!("[{}] POST /printer/gcode/script?script={gcode_line}", self.base.name);
|
|
Ok(())
|
|
}
|
|
}
|