System commands queue optimization

File processing stops on reset
IlyaChernov · Sep 25, 2020 · 1666fef · 1666fef
1 parent a74177f
commit 1666fef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/grbl.Master.Service/CommandSender.cs b/grbl.Master.Service/CommandSender.cs
@@ -123,7 +123,10 @@ public void Send(string command, string onResult = null)
                     {
                         lock (_lockObject)
                         {
-                            SystemCommands.Add(command);
+                            if (SystemCommands.CommandList.Count(x => x.Data == cmd.Data) < 3)
+                            {
+                                SystemCommands.Add(command);
+                            }
                         }
 
                         break;

diff --git a/grbl.Master.UI/ViewModels/MasterViewModel.cs b/grbl.Master.UI/ViewModels/MasterViewModel.cs
@@ -528,9 +528,9 @@ public void FileOpen()
         {
             var openFileDialog = new OpenFileDialog
             {
-                Filter =
-                                             "G-Code files (*.nc;*.g;*.gcode)|*.nc;*.g;*.gcode|All text files (*.*)|*.*"
+                Filter = "G-Code files (*.nc;*.g;*.gcode)|*.nc;*.g;*.gcode|All text files (*.*)|*.*"
             };
+
             if (openFileDialog.ShowDialog() == true && File.Exists(openFileDialog.FileName))
             {
                 _gCodeFileService.Load(openFileDialog.FileName);
@@ -584,6 +584,7 @@ public void ReloadFile()
 
         public void ResetGrbl()
         {
+            this._commandSender.FileCommands.StopProcessing();
             RealtimeIntCommand(24);
             _commandSender.PurgeQueues();
         }