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

Merge branch '1.7' of https://github.com/MatterHackers/MatterControl into 1.7

Browse source
This commit is contained in:
Lars Brubaker 2017-03-09 11:16:19 -08:00
commit a871dd08e8
7 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterControls/TerminalWindow/TerminalWidget.cs
View file

@ -85,7 +85,7 @@ namespace MatterHackers.MatterControl
{
if (filterOutput.Checked)
{
textScrollWidget.SetLineStartFilter(new string[] { "<-wait", "<-ok", "->M105", "<-T" });
textScrollWidget.SetLineStartFilter(new string[] { "<-wait", "<-ok", "<-T" });
}
else
{

1
PrinterControls/TerminalWindow/TextScrollWidget.cs
View file

@ -107,6 +107,7 @@ namespace MatterHackers.MatterControl
foreach (string startFilter in StartLineStringFilters)
{
if (line == null
|| line.Contains("M105")
|| line.Length < 3
|| line.StartsWith(startFilter))
{