nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make it easier to turn on and off working with the test server

Browse source
This commit is contained in:
Lars Brubaker 2020-10-23 16:57:26 -07:00
parent f0697d04da
commit 8be14b44ce
11 changed files with 81 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MatterControlLib/PrinterCommunication/PrinterConnection.cs
View file

@ -576,7 +576,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
ActivePrintTask.PrintEnd = DateTime.Now;
ActivePrintTask.PercentDone = 100;
ActivePrintTask.PrintComplete = true;
ActivePrintTask.Commit();
ActivePrintTask.CommitAndPushToServer();
}
LastPrintedItemName = PrintingItemName;
@ -2143,14 +2143,15 @@ Make sure that your printer is turned on. Some printers will appear to be connec
PrinterId = this.Printer.Settings.ID.GetHashCode(),
PrintName = activePrintItem.PrintItem.Name,
PrinterName = this.Printer.Settings.GetValue(SettingsKey.printer_name),
PrintItemId = activePrintItem.PrintItem.Id,
Guid = Guid.NewGuid().ToString(),
PrintingGCodeFileName = gcodeFileNameForTask,
PrintComplete = false,
QualitySettingsName = this.Printer.Settings.QualityLayer?.Name,
MaterialSettingsName = this.Printer.Settings.MaterialLayer?.Name,
DeviceToken = this.Printer.Settings.GetValue(SettingsKey.device_token),
};
ActivePrintTask.Commit();
ActivePrintTask.CommitAndPushToServer();
Task.Run(() => this.SyncProgressToDB(printingCancellation.Token));
@ -2270,7 +2271,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec
ActivePrintTask.PrintComplete = false;
ActivePrintTask.PrintingGCodeFileName = "";
ActivePrintTask.PrintCanceled = true;
ActivePrintTask.Commit();
ActivePrintTask.CommitAndPushToServer();
}
// no matter what we no longer have a print task
@ -2369,7 +2370,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec
accumulatedStream = new SendProgressStream(new PrintRecoveryStream(gCodeFileSwitcher, Printer, ActivePrintTask.PercentDone), Printer);
// And increment the recovery count
ActivePrintTask.RecoveryCount++;
ActivePrintTask.Commit();
ActivePrintTask.CommitAndPushToServer();
}
else
{
@ -2784,6 +2785,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec
}
public PrintTask CanceledPrintTask { get; private set; }
public PrintTask ActivePrintTask { get; set; }
public ExtrusionMultiplierStream ExtrusionMultiplierStream { get; private set; }