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

Cleaned up the new macro command syntax

Browse source
This commit is contained in:
Lars Brubaker 2017-02-06 12:19:37 -08:00
parent 53b7576b17
commit 117c09b9f1
6 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PrinterCommunication/Io/QueuedCommandsStream.cs
View file

@ -160,7 +160,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
}
if (TryGetAfterString(lineToSend, "repeat_gcode", out value))
{
foreach(string line in value.Split('\n'))
foreach(string line in value.Split('|'))
{
commandsToRepeat.Add(line);
}
@ -184,7 +184,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
break;
case "show_message":
waitingForUserInput = macroData.waitOk;
waitingForUserInput = macroData.waitOk | macroData.expireTime > 0;
UiThread.RunOnIdle(() => RunningMacroPage.Show(macroData));
break;