user-defined primed switch delay

SK21 · Feb 9, 2024 · 2f40ad5 · 2f40ad5
1 parent fbc163c
commit 2f40ad5
Show file tree

Hide file tree

Showing 20 changed files with 198 additions and 67 deletions.
diff --git a/RateAppSource/RateController/Classes/clsSectionControl.cs b/RateAppSource/RateController/Classes/clsSectionControl.cs
@@ -158,7 +158,7 @@ void SetPriming()
         {
             if (MasterOnSB)
             {
-                if (((DateTime.Now - OnFirstPressed).TotalSeconds > 2) && mf.SwitchBox.SwitchIsOn(SwIDs.MasterOn)) 
+                if (((DateTime.Now - OnFirstPressed).TotalSeconds > mf.PrimedDelay) && mf.SwitchBox.SwitchIsOn(SwIDs.MasterOn)) 
                 {
                     // priming mode
                     TimedOn = true;

diff --git a/RateAppSource/RateController/Classes/clsTools.cs b/RateAppSource/RateController/Classes/clsTools.cs
@@ -39,7 +39,7 @@ public class clsTools
         private string cPropertiesApp;
         private string cPropertiesFile;
         private string cSettingsDir;
-        private string cVersionDate = "05-Feb-2024";
+        private string cVersionDate = "09-Feb-2024";
         private FormStart mf;
 
         public clsTools(FormStart CallingForm)

diff --git a/RateAppSource/RateController/FormStart.cs b/RateAppSource/RateController/FormStart.cs
@@ -60,6 +60,9 @@ public partial class FormStart : Form
         public clsVirtualSwitchBox vSwitchBox;
         public string WiFiIP;
         public clsZones Zones;
+        private int cPrimedDelay = 2;
+
+
         private int cDefaultProduct = 0;
         private byte cPressureToShowID;
         private bool cShowPressure;
@@ -341,6 +344,7 @@ public void LoadSettings()
             if (byte.TryParse(Tls.LoadProperty("PressureID"), out byte ID)) cPressureToShowID = ID;
             if (bool.TryParse(Tls.LoadProperty("ShowQuantityRemaining"), out bool QR)) ShowQuantityRemaining = QR;
             if (bool.TryParse(Tls.LoadProperty("ShowCoverageRemaining"), out bool CR)) ShowCoverageRemaining = CR;
+            if (int.TryParse(Tls.LoadProperty("PrimedDelay"), out int PD)) cPrimedDelay = PD;
 
             if (double.TryParse(Tls.LoadProperty("SimSpeed"), out double Spd))
             {
@@ -769,6 +773,14 @@ private void FormatDisplay()
                 Tls.WriteErrorLog("FormStart/FormatDisplay: " + ex.Message);
             }
         }
+        public int PrimedDelay
+        {
+            get { return cPrimedDelay; }
+            set
+            {
+                if (value >= 0 && value < 9) { cPrimedDelay = value; }
+            }
+        }
 
         private void FormRateControl_FormClosed(object sender, FormClosedEventArgs e)
         {
@@ -786,6 +798,7 @@ private void FormRateControl_FormClosed(object sender, FormClosedEventArgs e)
                 Tls.SaveProperty("ShowQuantityRemaining", ShowQuantityRemaining.ToString());
                 Tls.SaveProperty("ShowCoverageRemaining", ShowCoverageRemaining.ToString());
                 Tls.SaveProperty("PrimedTime", cPrimedTime.ToString());
+                Tls.SaveProperty("PrimedDelay",cPrimedDelay.ToString());
                 UDPaog.Close();
                 UDPmodules.Close();
 

diff --git a/RateAppSource/RateController/frmPrimedStart.Designer.cs b/RateAppSource/RateController/frmPrimedStart.Designer.cs
diff --git a/RateAppSource/RateController/frmPrimedStart.cs b/RateAppSource/RateController/frmPrimedStart.cs
@@ -1,12 +1,7 @@
 using AgOpenGPS;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace RateController
@@ -23,6 +18,49 @@ public frmPrimedStart(FormStart CalledFrom)
             mf = CalledFrom;
         }
 
+        private void btnOK_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (!FormEdited)
+                {
+                    this.Close();
+                }
+                else
+                {
+                    // save data
+
+                    if (double.TryParse(tbSpeed.Text, out double Speed))
+                    {
+                        mf.Tls.SaveProperty("CalSpeed", Speed.ToString());
+                        mf.SimSpeed = Speed;
+                    }
+
+                    if (double.TryParse(tbTime.Text, out double Time))
+                    {
+                        mf.Tls.SaveProperty("PrimedTime", Time.ToString());
+                        mf.PrimedTime = Time;
+                    }
+
+                    if (int.TryParse(tbDelay.Text, out int Delay)) mf.PrimedDelay = Delay;
+
+                    SetButtons(false);
+                }
+            }
+            catch (Exception ex)
+            {
+                mf.Tls.ShowHelp(ex.Message, this.Text, 3000, true);
+            }
+        }
+
+        private void frmPrimedStart_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            if (this.WindowState == FormWindowState.Normal)
+            {
+                mf.Tls.SaveFormData(this);
+            }
+        }
+
         private void frmPrimedStart_Load(object sender, EventArgs e)
         {
             mf.Tls.LoadFormData(this);
@@ -50,86 +88,74 @@ private void frmPrimedStart_Load(object sender, EventArgs e)
                 tbTime.Text = Time.ToString("N0");
             }
 
+            tbDelay.Text = mf.PrimedDelay.ToString("N0");
+
+            SetDayMode();
+
             Initializing = false;
         }
+
+        private void SetButtons(bool Edited = false)
+        {
+            if (!Initializing)
+            {
+                if (Edited)
+                {
+                    btnCancel.Enabled = true;
+                    btnOK.Image = Properties.Resources.Save;
+                }
+                else
+                {
+                    btnCancel.Enabled = false;
+                    btnOK.Image = Properties.Resources.OK;
+                    btnOK.Enabled = true;
+                }
+                FormEdited = Edited;
+            }
+        }
+
         private void SetDayMode()
         {
             if (Properties.Settings.Default.IsDay)
             {
                 this.BackColor = Properties.Settings.Default.DayColour;
-
                 foreach (Control c in this.Controls)
                 {
-                    c.ForeColor = (Color)c.Tag;
+                    c.ForeColor = Color.Black;
                 }
             }
             else
             {
                 this.BackColor = Properties.Settings.Default.NightColour;
-
                 foreach (Control c in this.Controls)
                 {
                     c.ForeColor = Color.White;
                 }
             }
         }
 
-        private void frmPrimedStart_FormClosed(object sender, FormClosedEventArgs e)
+        private void tbDelay_Enter(object sender, EventArgs e)
         {
-            if (this.WindowState == FormWindowState.Normal)
-            {
-                mf.Tls.SaveFormData(this);
-            }
-        }
-
-        private void btnOK_Click(object sender, EventArgs e)
-        {
-            try
+            double tempD;
+            double.TryParse(tbDelay.Text, out tempD);
+            using (var form = new FormNumeric(0, 8, tempD))
             {
-                if (!FormEdited)
+                var result = form.ShowDialog();
+                if (result == DialogResult.OK)
                 {
-                    this.Close();
-                }
-                else
-                {
-                    // save data
-
-                    if (double.TryParse(tbSpeed.Text, out double Speed))
-                    {
-                        mf.Tls.SaveProperty("CalSpeed", Speed.ToString());
-                        mf.SimSpeed = Speed;
-                    }
-
-                    if (double.TryParse(tbTime.Text, out double Time))
-                    {
-                        mf.Tls.SaveProperty("PrimedTime", Time.ToString());
-                        mf.PrimedTime= Time;
-                    }
-
-                    SetButtons(false);
+                    tbDelay.Text = form.ReturnValue.ToString("N0");
                 }
             }
-            catch (Exception ex)
-            {
-                mf.Tls.ShowHelp(ex.Message, this.Text, 3000, true);
-            }
         }
-        private void SetButtons(bool Edited = false)
+
+        private void tbDelay_Validating(object sender, CancelEventArgs e)
         {
-            if (!Initializing)
+            double tempD;
+            double.TryParse(tbDelay.Text, out tempD);
+            if (tempD < 0 || tempD > 8)
             {
-                if (Edited)
-                {
-                    btnCancel.Enabled = true;
-                    btnOK.Image = Properties.Resources.Save;
-                }
-                else
-                {
-                    btnCancel.Enabled = false;
-                    btnOK.Image = Properties.Resources.OK;
-                    btnOK.Enabled = true;
-                }
-                FormEdited = Edited;
+                System.Media.SystemSounds.Exclamation.Play();
+                e.Cancel = true;
             }
         }
 
@@ -193,4 +219,4 @@ private void tbTime_Validating(object sender, CancelEventArgs e)
             }
         }
     }
-}
+}
diff --git a/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache