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

When turned on, run validation if no bed or no temp.

Browse source
This commit is contained in:
Lars Brubaker 2021-06-28 10:31:16 -07:00
parent c29d2b5486
commit f2b19dc6ef
4 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -2234,12 +2234,23 @@ namespace MatterHackers.MatterControl
public void Connection_PrintFinished(object sender, string e)
{
if (sender is PrinterConnection printerConnection
&& printerConnection.PrintingMode == PrinterConnection.PrintingModes.Normal)
if (sender is PrinterConnection printerConnection)
{
var printTasks = PrintHistoryData.Instance.GetHistoryItems(10);
var printHistoryEditor = new PrintHistoryEditor(((PrinterConnection)sender).Printer, AppContext.Theme, printerConnection.ActivePrintTask, printTasks);
printHistoryEditor.CollectInfoPrintFinished();
var activePrintTask = printerConnection.ActivePrintTask;
switch (printerConnection.PrintingMode)
{
case PrinterConnection.PrintingModes.Normal:
var printTasks = PrintHistoryData.Instance.GetHistoryItems(10);
var printHistoryEditor = new PrintHistoryEditor(((PrinterConnection)sender).Printer, AppContext.Theme, activePrintTask, printTasks);
printHistoryEditor.CollectInfoPrintFinished();
break;
case PrinterConnection.PrintingModes.Calibration:
break;
case PrinterConnection.PrintingModes.AutoPilot:
break;
}
}
KeepAwakeIfNeeded();

8
MatterControlLib/PrinterCommunication/Io/ValidatePrintLevelingStream.cs
View file

@ -64,6 +64,14 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
: base(printer, internalStream)
{
printer.Connection.CanceleRequested += Connection_PrintCanceled;
if (!printer.Settings.GetValue<bool>(SettingsKey.has_heated_bed)
|| printer.Settings.GetValue<double>(SettingsKey.bed_temperature) == 0)
{
// If we don't have a bed or we are not going to set the temperature
// do not wait for an M190
haveSeenM190 = true;
}
}
private void Connection_PrintCanceled(object sender, EventArgs e)

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit e87474fdd8b17d753557fb84a944ddab6925499d
Subproject commit 515ca31d1a21ddd03bdade5b4790e9e78d706a48

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 43a917481454f3585bc5e223aa4c0e7bf271c3e7
Subproject commit d846713a786d93f9ef4367c6170118bf84de0caa