Release 1.0.9.18

Fix Late Bind warning in _timerCB Add more keymappings Implement use of Grbl's info on buffer size
gerritv · Oct 6, 2018 · 07874bb · 07874bb · 1Metalguru · Oct 9, 2018
1 parent 80366b2
commit 07874bb
Show file tree

Hide file tree

Showing 12 changed files with 3,399 additions and 6,382 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,8 @@
 This file documents changes made:
-V1.0.9.17	- 2017 Nov 13
+V1.0.9.18	- 2018 Oct 6
+			- Implement using buffer size from Grbl for display
+			- Implement additional key mappings
+			- Fix Late Bind warni9.17	- 2017 Nov 13
 			- Fix to allow entry of '-' in Work position text boxes, Issue #111
 V1.0.9.16	- 2017 Nov 10
 			- Fix crash on invalid tool number< Issue #128

diff --git a/Grbl-Panel/App.config b/Grbl-Panel/App.config
@@ -94,9 +94,6 @@
             <setting name="JoggingFRDefault" serializeAs="String">
                 <value>F2</value>
             </setting>
-            <setting name="StartupDelay" serializeAs="String">
-                <value>1.5</value>
-            </setting>
             <setting name="DefaultFileExt" serializeAs="String">
                 <value>txt</value>
             </setting>
@@ -127,6 +124,9 @@
             <setting name="TruncationDigits" serializeAs="String">
                 <value>0</value>
             </setting>
+            <setting name="StartDelay" serializeAs="String">
+                <value>1.5</value>
+            </setting>
         </GrblPanel.My.MySettings>
     </userSettings>
 </configuration>
diff --git a/Grbl-Panel/CHANGES.txt b/Grbl-Panel/CHANGES.txt
@@ -1,5 +1,8 @@
 This file documents changes made:
-V1.0.9.17	- 2017 Nov 13
+V1.0.9.18	- 2018 Oct 6
+			- Implement using buffer size from Grbl for display
+			- Implement additional key mappings
+			- Fix Late Bind warni9.17	- 2017 Nov 13
 			- Fix to allow entry of '-' in Work position text boxes, Issue #111
 V1.0.9.16	- 2017 Nov 10
 			- Fix crash on invalid tool number< Issue #128

diff --git a/Grbl-Panel/GrblGui.vb b/Grbl-Panel/GrblGui.vb
@@ -215,6 +215,10 @@ Public Class GrblGui
                                 _gui.btnStartResume.PerformClick()
                             End If
                             handled = True
+                        Case Keys.R And My.Computer.Keyboard.CtrlKeyDown
+                            ' Start sending the file
+                            _gui.btnFileSend.PerformClick()
+                            handled = True
 
                         ' Single Step
                         Case Keys.O
@@ -293,6 +297,20 @@ Public Class GrblGui
                             _gui.btnRapidOverride50.PerformClick()
                             handled = True
 
+                       ' Miscellaneous mappings
+                        Case Keys.H     ' Go Home
+                            _gui.btnHome.PerformClick()
+                            handled = True
+                        Case Keys.D1 And My.Computer.Keyboard.CtrlKeyDown
+                            _gui.btnWorkSoftHome.PerformClick()
+                            handled = True
+                        Case Keys.D2 And My.Computer.Keyboard.CtrlKeyDown
+                            _gui.btnWorkSpclPosition.PerformClick()
+                            handled = True
+                        Case Keys.C And My.Computer.Keyboard.CtrlKeyDown
+                            _gui.btnConnect.PerformClick()
+                            handled = True
+
                     End Select
                 End If
 

diff --git a/Grbl-Panel/GrblInfo.vb b/Grbl-Panel/GrblInfo.vb
@@ -36,7 +36,26 @@
                 _single = value
             End Set
         End Property
+        Private _QueueSize As Int16
+        Public Property QueueSize() As Int16
+            Get
+                Return _QueueSize
+            End Get
+            Set(ByVal value As Int16)
+                _QueueSize = value
+            End Set
+        End Property
+        Private _BufferSize As Int16
+        Public Property BufferSize() As Int16
+            Get
+                Return _BufferSize
+            End Get
+            Set(ByVal value As Int16)
+                _BufferSize = value
+            End Set
+        End Property
     End Class
+
     ''' <summary>
     ''' Handle incoming VER and OPT message from $I request
     ''' </summary>
@@ -50,6 +69,12 @@
             If data.StartsWith("[OPT") Then
                 Dim str As String = data.Remove(data.Length - 3)
                 tbGrblOptions.Text = str.Remove(0, 5)
+
+                Dim values() As String
+                values = Split(tbGrblOptions.Text, ",")
+                info.BufferSize = Convert.ToInt16(values(2))
+                info.QueueSize = Convert.ToInt16(values(1))
+
                 info.once = False
             End If
         End If

diff --git a/Grbl-Panel/GrblStatus.vb b/Grbl-Panel/GrblStatus.vb
@@ -285,8 +285,8 @@ Partial Class GrblGui
                         Case "Bf"
                             Dim values = Split(portion(1), ",")
                             Try
-                                prgBarQ.Value = 15 - values(0)
-                                prgbRxBuf.Value = 128 - values(1)
+                                prgBarQ.Value = info.QueueSize - values(0)
+                                prgbRxBuf.Value = info.BufferSize - values(1)
                             Catch
                             End Try
                         Case "F"

diff --git a/Grbl-Panel/GrblUtils.vb b/Grbl-Panel/GrblUtils.vb
@@ -47,7 +47,7 @@ Partial Class GrblGui
             Else
                 If Not IsNothing(state) And _stopwatch.IsRunning Then
                     _span = FromMilliseconds(_stopwatch.ElapsedMilliseconds)
-                    state.Text = _span.ToString("hh\:mm\:ss")
+                    c.Text = _span.ToString("hh\:mm\:ss")
                 End If
             End If
         End Sub

diff --git a/Grbl-Panel/My Project/AssemblyInfo.vb b/Grbl-Panel/My Project/AssemblyInfo.vb
@@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("A control panel for Grbl")> 
 <Assembly: AssemblyCompany("")> 
 <Assembly: AssemblyProduct("Grbl Panel")>
-<Assembly: AssemblyCopyright("Copyright ©  2014-2017")>
+<Assembly: AssemblyCopyright("Copyright ©  2014-2018")>
 <Assembly: AssemblyTrademark("(c) Gerrit Visser")> 
 
 <Assembly: ComVisible(False)> 
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.9.17")>
-<Assembly: AssemblyFileVersion("1.0.9.17")>
+<Assembly: AssemblyVersion("1.0.9.18")>
+<Assembly: AssemblyFileVersion("1.0.9.18")>
 
 <Assembly: NeutralResourcesLanguageAttribute("en-CA")> 
diff --git a/Grbl-Panel/My Project/Settings.Designer.vb b/Grbl-Panel/My Project/Settings.Designer.vb
diff --git a/Grbl-Panel/My Project/Settings.settings b/Grbl-Panel/My Project/Settings.settings
@@ -86,9 +86,6 @@
     <Setting Name="JoggingFRDefault" Type="System.String" Scope="User">
       <Value Profile="(Default)">F2</Value>
     </Setting>
-    <Setting Name="StartupDelay" Type="System.String" Scope="User">
-      <Value Profile="(Default)">1.5</Value>
-    </Setting>
     <Setting Name="DefaultFileExt" Type="System.String" Scope="User">
       <Value Profile="(Default)">txt</Value>
     </Setting>
@@ -119,5 +116,8 @@
     <Setting Name="TruncationDigits" Type="System.String" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
+    <Setting Name="StartDelay" Type="System.String" Scope="User">
+      <Value Profile="(Default)">1.5</Value>
+    </Setting>
   </Settings>
 </SettingsFile>