Change PRM to MoonrakerSocketManager, project update

This commit is contained in:
Madeline Pace
2023-04-05 13:49:05 -04:00
parent d21fd9d331
commit 0f0d0c0628
28 changed files with 107 additions and 17 deletions
View File
View File
View File
Regular → Executable
View File
View File
View File
Regular → Executable
View File
View File
Regular → Executable
View File
Regular → Executable
+1 -1
View File
@@ -13,7 +13,7 @@ struct SoyuzApp: App {
@State var currentIcon = "move.3d"
@ObservedObject static var printerManager = PrinterRequestManager()
@ObservedObject static var printerManager = MoonrakerSocketManager()
var body: some Scene {
// WindowGroup(id: "floating-stats") {
View File
@@ -13,7 +13,7 @@ import Starscream
// MARK: PrinterRequestManager
//@MainActor
class PrinterRequestManager: ObservableObject, WebSocketDelegate {
class MoonrakerSocketManager: ObservableObject, WebSocketDelegate {
let WEBSOCKET_TIMEOUT_INTERVAL: TimeInterval = 60.0
// Websocket JSON-RPC published data
View File
+2 -2
View File
@@ -10,7 +10,7 @@ import Network
// MARK: PrinterConfigView
struct PrinterConfigView: View {
@ObservedObject var printerManager: PrinterRequestManager
@ObservedObject var printerManager: MoonrakerSocketManager
@ObservedObject var bonjourBrowser = BonjourBrowser()
var body: some View {
@@ -54,7 +54,7 @@ struct PrinterConfigView: View {
}
struct PrinterConfigView_Previews: PreviewProvider {
@State static var printerManager = PrinterRequestManager()
@State static var printerManager = MoonrakerSocketManager()
static var previews: some View {
PrinterConfigView(printerManager: printerManager)
+3 -2
View File
@@ -11,11 +11,12 @@ import Network
struct SoyuzMenuBarExtraView: View {
// The threshhold considered a burn-risk, at which point certain UI elements turn red.
// Measured in degrees Celsius
let DANGERTEMP = 40.0
@Environment(\.openWindow) var openWindow
@ObservedObject var printerManager: PrinterRequestManager
@ObservedObject var printerManager: MoonrakerSocketManager
@State var printPercentage: Double = 0
@@ -100,7 +101,7 @@ struct SoyuzMenuBarExtraView: View {
struct KlipperMonMenuBarExtraView_Previews: PreviewProvider {
@State static var currentMenuBarIcon = "move.3d"
@State static var printerManager = PrinterRequestManager()
@State static var printerManager = MoonrakerSocketManager()
static var previews: some View {
SoyuzMenuBarExtraView(printerManager: printerManager, currentMenuBarIcon: $currentMenuBarIcon)