Merge pull request #126 from AndreasReitberger/125-add-missing-proper…

…ties-for-itoolhead Add missing properties
AndreasReitberger · Jun 11, 2024 · 711c2c5 · 711c2c5
2 parents 882dedf + f09f12c
commit 711c2c5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/src/MoonrakerSharpWebApi/Models/Events/KlipperCurrentPrintImageChangedEventArgs.cs b/src/MoonrakerSharpWebApi/Models/Events/KlipperCurrentPrintImageChangedEventArgs.cs
@@ -1,8 +1,10 @@
 using AndreasReitberger.API.Print3dServer.Core.Events;
 using Newtonsoft.Json;
+using System;
 
 namespace AndreasReitberger.API.Moonraker.Models
 {
+    [Obsolete("Use PrintImageChangedEventArgs instead")]
     public class KlipperCurrentPrintImageChangedEventArgs : Print3dBaseEventArgs
     {
         #region Properties

diff --git a/src/MoonrakerSharpWebApi/Models/Events/KlipperJobListChangedEventArgs.cs b/src/MoonrakerSharpWebApi/Models/Events/KlipperJobListChangedEventArgs.cs
@@ -1,9 +1,11 @@
 using AndreasReitberger.API.Print3dServer.Core.Events;
 using Newtonsoft.Json;
+using System;
 using System.Collections.ObjectModel;
 
 namespace AndreasReitberger.API.Moonraker.Models
 {
+    [Obsolete("Use JobListChangedEventArgs instead")]
     public class KlipperJobListChangedEventArgs : Print3dBaseEventArgs
     {
         #region Properties

diff --git a/src/MoonrakerSharpWebApi/Models/Events/KlipperJsonConvertEventArgs.cs b/src/MoonrakerSharpWebApi/Models/Events/KlipperJsonConvertEventArgs.cs
@@ -3,6 +3,7 @@
 
 namespace AndreasReitberger.API.Moonraker.Models
 {
+    [Obsolete("Use JsonConvertEventArgs instead")]
     public class KlipperJsonConvertEventArgs : EventArgs
     {
         #region Properties

diff --git a/src/MoonrakerSharpWebApi/Models/Events/KlipperSessionChangedEventArgs.cs b/src/MoonrakerSharpWebApi/Models/Events/KlipperSessionChangedEventArgs.cs
@@ -1,8 +1,10 @@
 using AndreasReitberger.API.Print3dServer.Core.Events;
 using Newtonsoft.Json;
+using System;
 
 namespace AndreasReitberger.API.Moonraker.Models
 {
+    [Obsolete("Use SessionChangedEventArgs instead")]
     public class KlipperSessionChangedEventArgs : Print3dBaseEventArgs
     {
         #region Properties

diff --git a/src/MoonrakerSharpWebApi/Models/Events/KlipperWebSocketDataEventArgs.cs b/src/MoonrakerSharpWebApi/Models/Events/KlipperWebSocketDataEventArgs.cs
@@ -1,8 +1,10 @@
 using AndreasReitberger.API.Print3dServer.Core.Events;
 using Newtonsoft.Json;
+using System;
 
 namespace AndreasReitberger.API.Moonraker.Models
 {
+    [Obsolete("Use WebsocketEventArgs instead")]
     public class KlipperWebSocketDataEventArgs : Print3dBaseEventArgs
     {
         #region Properties

diff --git a/src/MoonrakerSharpWebApi/Models/PrinterStatus/KlipperStatusExtruder.cs b/src/MoonrakerSharpWebApi/Models/PrinterStatus/KlipperStatusExtruder.cs
@@ -87,7 +87,7 @@ public partial class KlipperStatusExtruder : ObservableObject, IToolhead
         public bool CanUpdateTarget = false;
 
         [JsonIgnore]
-        public KlipperToolState State { get => GetCurrentState(); }
+        public Printer3dToolHeadState State { get => GetCurrentState(); }
 
         [ObservableProperty, JsonIgnore]
         Printer3dHeaterType type = Printer3dHeaterType.Other;
@@ -114,19 +114,19 @@ public partial class KlipperStatusExtruder : ObservableObject, IToolhead
         #endregion
 
         #region Methods
-        KlipperToolState GetCurrentState()
+        public Printer3dToolHeadState GetCurrentState()
         {
             try
             {
                 if (TempSet == null || TempRead == null)
-                    return KlipperToolState.Idle;
+                    return Printer3dToolHeadState.Idle;
                 return TempSet <= 0
-                    ? KlipperToolState.Idle
-                    : TempSet > TempRead && Math.Abs(Convert.ToDouble(TempSet - TempRead)) > 2 ? KlipperToolState.Heating : KlipperToolState.Ready;
+                    ? Printer3dToolHeadState.Idle
+                    : TempSet > TempRead && Math.Abs(Convert.ToDouble(TempSet - TempRead)) > 2 ? Printer3dToolHeadState.Heating : Printer3dToolHeadState.Ready;
             }
             catch (Exception)
             {
-                return KlipperToolState.Error;
+                return Printer3dToolHeadState.Error;
             }
 
         }

diff --git a/src/MoonrakerSharpWebApi/Models/PrinterStatus/KlipperStatusHeaterBed.cs b/src/MoonrakerSharpWebApi/Models/PrinterStatus/KlipperStatusHeaterBed.cs
@@ -29,7 +29,7 @@ public partial class KlipperStatusHeaterBed : ObservableObject, IHeaterComponent
         public bool CanUpdateTarget = false;
 
         [JsonIgnore]
-        public KlipperToolState State { get => GetCurrentState(); }
+        public Printer3dToolHeadState State { get => GetCurrentState(); }
 
         #region JsonIgnore
         [ObservableProperty, JsonIgnore]
@@ -47,20 +47,20 @@ public partial class KlipperStatusHeaterBed : ObservableObject, IHeaterComponent
         #endregion
 
         #region Methods
-        KlipperToolState GetCurrentState()
+        public Printer3dToolHeadState GetCurrentState()
         {
             try
             {
                 if (TempSet == null || TempRead == null)
-                    return KlipperToolState.Idle;
+                    return Printer3dToolHeadState.Idle;
 
                 return TempSet <= 0
-                    ? KlipperToolState.Idle
-                    : TempSet > TempRead && Math.Abs(Convert.ToDouble(TempSet - TempRead)) > 2 ? KlipperToolState.Heating : KlipperToolState.Ready;
+                    ? Printer3dToolHeadState.Idle
+                    : TempSet > TempRead && Math.Abs(Convert.ToDouble(TempSet - TempRead)) > 2 ? Printer3dToolHeadState.Heating : Printer3dToolHeadState.Ready;
             }
             catch (Exception)
             {
-                return KlipperToolState.Error;
+                return Printer3dToolHeadState.Error;
             }
 
         }