From 98093f15d202159874863fc22f89cb6ba477eccf Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 29 Jun 2021 11:24:19 -0700 Subject: [PATCH] Adding volume to server data --- MatterControlLib/DataStorage/Models.cs | 1 + MatterControlLib/PrinterCommunication/PrinterConnection.cs | 5 +++++ Submodules/MatterSlice | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/MatterControlLib/DataStorage/Models.cs b/MatterControlLib/DataStorage/Models.cs index 0b25d9979..d601a4e8b 100644 --- a/MatterControlLib/DataStorage/Models.cs +++ b/MatterControlLib/DataStorage/Models.cs @@ -367,6 +367,7 @@ namespace MatterHackers.MatterControl.DataStorage public string Note { get; set; } public string DeviceToken { get; set; } + public double VolumeMm3 { get; internal set; } public void CommitAndPushToServer() { diff --git a/MatterControlLib/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs index af4bba800..0015f1311 100644 --- a/MatterControlLib/PrinterCommunication/PrinterConnection.cs +++ b/MatterControlLib/PrinterCommunication/PrinterConnection.cs @@ -2194,6 +2194,11 @@ Make sure that your printer is turned on. Some printers will appear to be connec DeviceToken = this.Printer.Settings.GetValue(SettingsKey.device_token), }; + if(gCodeFileSwitcher?.GCodeFile is GCodeMemoryFile memoryFile) + { + ActivePrintTask.VolumeMm3 = memoryFile.GetFilamentCubicMm(Printer.Settings.GetValue(SettingsKey.filament_diameter)); + } + ActivePrintTask.CommitAndPushToServer(); Task.Run(() => this.SyncProgressToDB(printingCancellation.Token)); diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 515ca31d1..ce51db3c0 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 515ca31d1a21ddd03bdade5b4790e9e78d706a48 +Subproject commit ce51db3c0ca8ce040aeca47d8c79dac0727fe53d