updates

Signed-off-by: Jess Frazelle <[email protected]>

Author: jessfraz

bambulabs/src/client.rs

@@ -8,7 +8,7 @@ use tokio::sync::Mutex;
 
 use crate::{
     command::Command,
-    message::{Message, Print, PrintCommand},
+    message::{Message, Print, PushStatus},
     parser::parse_message,
     sequence_id::SequenceId,
 };
@@ -87,11 +87,9 @@ impl Client {
 
         if let Some(sequence_id) = message.sequence_id() {
             // If the message is a push status, make the sequence id "status".
-            if let Message::Print(msg) = &message {
-                if msg.command == PrintCommand::PushStatus {
-                    self.responses.insert(SequenceId::status(), message);
-                    return Ok(());
-                }
+            if let Message::Print(Print::PushStatus(_)) = &message {
+                self.responses.insert(SequenceId::status(), message);
+                return Ok(());
             }
             self.responses.insert(sequence_id, message);
             return Ok(());
@@ -107,11 +105,11 @@ impl Client {
     }
 
     /// Get the latest status of the printer.
-    pub fn get_status(&self) -> Result<Option<Print>> {
+    pub fn get_status(&self) -> Result<Option<PushStatus>> {
         let response = self.responses.get(&SequenceId::status());
         if let Some(response) = response {
-            if let Message::Print(print) = response.value() {
-                return Ok(Some(print.clone()));
+            if let Message::Print(Print::PushStatus(status)) = response.value() {
+                return Ok(Some(status.clone()));
             }
         }
 

bambulabs/src/command.rs

@@ -1,6 +1,7 @@
 //! The commands that can be sent to the printer.
 
 use parse_display::{Display, FromStr};
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use crate::{sequence_id::SequenceId, speedprofile::SpeedProfile};
@@ -330,7 +331,7 @@ pub struct Ledctrl {
 }
 
 /// The node for the led.
-#[derive(Debug, Clone, Serialize, Deserialize, Display, FromStr, PartialEq, Eq)]
+#[derive(Debug, Clone, Serialize, Deserialize, Display, FromStr, PartialEq, Eq, JsonSchema)]
 #[display(style = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum LedNode {
@@ -341,7 +342,7 @@ pub enum LedNode {
 }
 
 /// The mode for the led.
-#[derive(Debug, Clone, Serialize, Deserialize, Display, FromStr, PartialEq, Eq)]
+#[derive(Debug, Clone, Serialize, Deserialize, Display, FromStr, PartialEq, Eq, JsonSchema)]
 #[display(style = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum LedMode {
@@ -391,7 +392,7 @@ pub struct GetAccessories {
 }
 
 /// The type of accessory.
-#[derive(Debug, Clone, Serialize, Deserialize, Display, FromStr, PartialEq, Eq)]
+#[derive(Debug, Clone, Serialize, Deserialize, Display, FromStr, PartialEq, Eq, JsonSchema)]
 #[display(style = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum AccessoryType {