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

Put in a reset connection button after the user clicks cancel.

Browse source 
Put in a RebootBoard function in Printer Communication
This commit is contained in:
Lars Brubaker 2015-02-04 14:24:36 -08:00
parent f6e243672a
commit 1df8b5c516
3 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

43
ActionBar/PrintActionRow.cs
View file

@ -34,6 +34,7 @@ namespace MatterHackers.MatterControl.ActionBar
TooltipButton resumeButton;
TooltipButton cancelButton;
TooltipButton resetConnectionButton;
TooltipButton reprintButton;
TooltipButton doneWithCurrentPartButton;
@ -89,6 +90,10 @@ namespace MatterHackers.MatterControl.ActionBar
string cancelButtonMessage = LocalizedString.Get("Stop the current print");
cancelButton = makeButton(cancelButtonText, cancelButtonMessage);
string resetConnectionButtonText = "Reset Connection".Localize();
string resetConnectionButtonMessage = "Reboots the firmware on the controller".Localize();
resetConnectionButton = makeButton(resetConnectionButtonText, resetConnectionButtonMessage);
string resumeButtonText = LocalizedString.Get("Resume");
string resumeButtonMessage = LocalizedString.Get ("Resume the current print");
resumeButton = makeButton(resumeButtonText, resumeButtonMessage);
@ -122,7 +127,10 @@ namespace MatterHackers.MatterControl.ActionBar
this.AddChild(cancelButton);
allPrintButtons.Add(cancelButton);
this.AddChild(cancelConnectButton);
this.AddChild(resetConnectionButton);
allPrintButtons.Add(resetConnectionButton);
this.AddChild(cancelConnectButton);
allPrintButtons.Add(cancelConnectButton);
this.AddChild(reprintButton);
@ -147,7 +155,8 @@ namespace MatterHackers.MatterControl.ActionBar
pauseButton.Click += new EventHandler(onPauseButton_Click);
cancelButton.Click += (sender, e) => { UiThread.RunOnIdle(CancelButton_Click); };
cancelConnectButton.Click += (sender, e) => { UiThread.RunOnIdle(CancelConnectionButton_Click); };
resetConnectionButton.Click += (sender, e) => { UiThread.RunOnIdle(ResetConnectionButton_Click); };
cancelConnectButton.Click += (sender, e) => { UiThread.RunOnIdle(CancelConnectionButton_Click); };
reprintButton.Click += new EventHandler(onReprintButton_Click);
doneWithCurrentPartButton.Click += new EventHandler(onDoneWithCurrentPartButton_Click);
ActiveTheme.Instance.ThemeChanged.RegisterEvent(ThemeChanged, ref unregisterEvents);
@ -233,10 +242,15 @@ namespace MatterHackers.MatterControl.ActionBar
else
{
CancelPrinting();
}
}
}
}
void onConfirmCancelPrint(bool messageBoxResponse)
void ResetConnectionButton_Click(object state)
{
PrinterConnectionAndCommunication.Instance.RebootBoard();
}
void onConfirmCancelPrint(bool messageBoxResponse)
{
if (messageBoxResponse)
{
@ -257,7 +271,8 @@ namespace MatterHackers.MatterControl.ActionBar
}
PrinterConnectionAndCommunication.Instance.Stop();
timeSincePrintStarted.Reset();
}
UiThread.RunOnIdle((state2) => { SetButtonStates(); });
}
void onDoneWithCurrentPartButton_Click(object sender, EventArgs mouseEvent)
{
@ -360,8 +375,20 @@ namespace MatterHackers.MatterControl.ActionBar
case PrinterConnectionAndCommunication.CommunicationStates.PrintingFromSd:
case PrinterConnectionAndCommunication.CommunicationStates.PrintingToSd:
case PrinterConnectionAndCommunication.CommunicationStates.Printing:
this.activePrintButtons.Add(pauseButton);
this.activePrintButtons.Add(cancelButton);
if (!timeSincePrintStarted.IsRunning)
{
timeSincePrintStarted.Restart();
}
if (!PrinterConnectionAndCommunication.Instance.PrintWasCanceled)
{
this.activePrintButtons.Add(pauseButton);
this.activePrintButtons.Add(cancelButton);
}
else
{
this.activePrintButtons.Add(resetConnectionButton);
}
EnableActiveButtons();
break;

4
CustomWidgets/ExportPrintItemWindow.cs
View file

@ -279,7 +279,7 @@ namespace MatterHackers.MatterControl
// read the last few k of the file nad see if it says "filament used". We use this marker to tell if the file finished writing
if (originalIsGCode)
{
PrinterConnectionAndCommunication.Instance.StartPrint2(gcodePathAndFileName);
PrinterConnectionAndCommunication.Instance.StartPrint(gcodePathAndFileName);
return;
}
else
@ -294,7 +294,7 @@ namespace MatterHackers.MatterControl
if (fileEnd.Contains("filament used"))
{
System.Threading.Thread.Sleep(10000);
PrinterConnectionAndCommunication.Instance.StartPrint2(gcodePathAndFileName);
PrinterConnectionAndCommunication.Instance.StartPrint(gcodePathAndFileName);
return;
}
}

6
StaticData/Translations/Master.txt
View file

@ -3104,3 +3104,9 @@ Translated:Inserting Text
English:Saving Parts:
Translated:Saving Parts:
English:Reset Connection
Translated:Reset Connection
English:Reboots the firmware on the controller
Translated:Reboots the firmware on the controller