Autoreset pin states

IlyaChernov · Sep 20, 2020 · 1a96358 · 1a96358
1 parent 73df8ae
commit 1a96358
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 6 deletions.
diff --git a/grbl.Master.BL/GrblStatus.cs b/grbl.Master.BL/GrblStatus.cs
@@ -20,7 +20,7 @@ public class GrblStatus : IGrblStatus
     {
         private readonly ICommandSender _commandSender;
 
-        //private readonly IGrblStatusModel _grblStatusModel;
+        private readonly IApplicationSettingsService _applicationSettingsService;
 
         private readonly string _decimalSeparator = Thread.CurrentThread.CurrentCulture.NumberFormat.NumberDecimalSeparator;
 
@@ -49,9 +49,10 @@ private string TranslateMessageKey(string key)
             return Model.Resources.Mssages.ResourceManager.GetString(key);
         }
 
-        public GrblStatus(IComService comService, ICommandSender commandSender, IGrblStatusModel grblStatusModel)
+        public GrblStatus(IComService comService, ICommandSender commandSender, IGrblStatusModel grblStatusModel, IApplicationSettingsService applicationSettingsService)
         {
             _commandSender = commandSender;
+            _applicationSettingsService = applicationSettingsService;
             GrblStatusModel = grblStatusModel;
             comService.ConnectionStateChanged += ComServiceConnectionStateChanged;
             _commandSender.ResponseReceived += CommandSenderResponseReceived;
@@ -239,6 +240,7 @@ public GrblStatus(IComService comService, ICommandSender commandSender, IGrblSta
                                                                                                         GrblStatusModel.InputPinState.HoldPin = pinParts[1].Contains('H');
                                                                                                         GrblStatusModel.InputPinState.SoftResetPin = pinParts[1].Contains('R');
                                                                                                         GrblStatusModel.InputPinState.CycleStartPin = pinParts[1].Contains('S');
+                                                                                                        GrblStatusModel.InputPinState.UpdateDateTime = DateTime.Now;
                                                                                                     }
                                                                                                 } },
                                                                    new ResponseProcessor{ TagExpression =  "^Ov:\\d+(,\\d+){2}$", Action =
@@ -499,9 +501,14 @@ private void CommandSenderResponseReceived(object sender, Response e)
                     processor.ProcessActions.SingleOrDefault(x => x.Regex.IsMatch(part)).Action?.Invoke(part);
                 }
             }
+
+            if (DateTime.Now - GrblStatusModel.InputPinState.UpdateDateTime > TimeSpan.FromSeconds(_applicationSettingsService.Settings.PinStateResetTimeout))
+            {
+                GrblStatusModel.InputPinState.Reset();
+            }
         }
 
-        public IGrblStatusModel GrblStatusModel { get; } //=> _grblStatusModel; // { get; set; } = new GrblStatusModel();
+        public IGrblStatusModel GrblStatusModel { get; }
 
         private bool _isRunning;
 
@@ -519,7 +526,6 @@ public void StartRequesting(TimeSpan positionsInterval, TimeSpan gStateInterval,
         public void InitialRequest()
         {
             _commandSender.Send("$$");
-            // _commandSender.Send("$#");
         }
 
         public void StopRequesting()

diff --git a/grbl.Master.Model/ApplicationSettings.cs b/grbl.Master.Model/ApplicationSettings.cs
@@ -10,6 +10,8 @@ public class ApplicationSettings : NotifyPropertyChanged
         public ObservableCollection<double> FeedRates { get; set; } = new ObservableCollection<double> { 5, 10, 50, 100, 500, 1000 };
         public double SliderLinearity { get; set; }
 
+        public int PinStateResetTimeout { get; set; }
+
         public double FeedRate { get; set; }
 
         public ObservableCollection<Macros> Macroses { get; set; } = new ObservableCollection<Macros>();

diff --git a/grbl.Master.Model/InputPinState.cs b/grbl.Master.Model/InputPinState.cs
@@ -1,7 +1,11 @@
 namespace grbl.Master.Model
 {
+    using System;
+
     public class InputPinState : NotifyPropertyChanged
     {
+        public DateTime UpdateDateTime { get; set; }
+
         public bool XLimitPin { get; set; }
 
         public bool YLimitPin { get; set; }
@@ -17,5 +21,11 @@ public class InputPinState : NotifyPropertyChanged
         public bool SoftResetPin { get; set; }
 
         public bool CycleStartPin { get; set; }
+
+        public void Reset()
+        {
+            XLimitPin = YLimitPin = ZLimitPin = ProbePin = DoorPin = HoldPin = SoftResetPin = CycleStartPin = false;
+            UpdateDateTime = DateTime.Now;
+        }
     }
 }
diff --git a/grbl.Master.Model/Properties/Settings.Designer.cs b/grbl.Master.Model/Properties/Settings.Designer.cs
diff --git a/grbl.Master.Model/Properties/Settings.settings b/grbl.Master.Model/Properties/Settings.settings
@@ -26,5 +26,8 @@
     <Setting Name="SliderLinearity" Type="System.Double" Scope="User">
       <Value Profile="(Default)">1</Value>
     </Setting>
+    <Setting Name="PinStateResetTimeout" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">1</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/grbl.Master.Model/app.config b/grbl.Master.Model/app.config
@@ -51,6 +51,9 @@
       <setting name="SliderLinearity" serializeAs="String">
         <value>1</value>
       </setting>
+      <setting name="PinStateResetTimeout" serializeAs="String">
+        <value>1</value>
+      </setting>
     </grbl.Master.Model.Properties.Settings>
   </userSettings>
 </configuration>
diff --git a/grbl.Master.Service/ApplicationSettingsService.cs b/grbl.Master.Service/ApplicationSettingsService.cs
@@ -44,6 +44,8 @@ public void Save()
 
             Model.Properties.Settings.Default.SliderLinearity = Settings.SliderLinearity;
 
+            Model.Properties.Settings.Default.PinStateResetTimeout = Settings.PinStateResetTimeout;
+
             Model.Properties.Settings.Default.Save();
             Model.Properties.Settings.Default.Reload();
         }
@@ -118,6 +120,8 @@ public void Load()
             Settings.FeedRate = Model.Properties.Settings.Default.JoggingSpeed;
 
             Settings.SliderLinearity = Model.Properties.Settings.Default.SliderLinearity;
+
+            Settings.PinStateResetTimeout = Model.Properties.Settings.Default.PinStateResetTimeout;
         }
     }
 }
diff --git a/grbl.Master.UI/ViewModels/MasterViewModel.cs b/grbl.Master.UI/ViewModels/MasterViewModel.cs
@@ -155,6 +155,18 @@ public double SliderLinearity
             }
         }
 
+        public int PinStateResetTimeout
+        {
+            get => _applicationSettingsService.Settings.PinStateResetTimeout;
+
+            set
+            {
+                _applicationSettingsService.Settings.PinStateResetTimeout = value;
+                NotifyOfPropertyChange(() => PinStateResetTimeout);
+                _applicationSettingsService.Save();
+            }
+        }
+
 
         public ObservableCollection<Macros> Macroses => _applicationSettingsService.Settings.Macroses;
 

diff --git a/grbl.Master.UI/Views/MasterView.xaml b/grbl.Master.UI/Views/MasterView.xaml
@@ -1454,10 +1454,10 @@
                                          Text="{Binding FeedRates, Converter={StaticResource ListDoubleToString}, UpdateSourceTrigger=LostFocus}"
                                          TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" />
                             </GroupBox>
-                            <GroupBox Width="200" Margin="2" Padding="2">
+                            <GroupBox Width="240" Margin="2" Padding="2" Header="User Interface">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="100" />
+                                        <ColumnDefinition Width="160" />
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
@@ -1470,6 +1470,9 @@
                                     <Label Content="Linearity power:" />
                                     <xctk:IntegerUpDown Grid.Row="0" Grid.Column="1" Minimum="1"
                                                         Value="{Binding SliderLinearity}" />
+                                    <Label Grid.Row="1" Grid.Column="0" Content="Pin state reset timeout (sec):" />
+                                    <xctk:IntegerUpDown Grid.Row="1" Grid.Column="1" Minimum="1"
+                                                        Value="{Binding PinStateResetTimeout}" />
                                 </Grid>
                             </GroupBox>
                         </WrapPanel>