V1.0.9.9

- Add Laser Mode text to Settings list, Issue 71 - Fix revision, Issue 77 - Fix handling of Rapid Overrides, Issue 77 - Fix Alarm decoding, Issue 67 - Avoid Exception if Grbl 0.9x reporting not set for both MPos and WPos - Adapt to new A: messages for Aux item status (which replace T: messages)
gerritv · Dec 12, 2016 · 68d6e32 · 68d6e32
1 parent 21c5fda
commit 68d6e32
Show file tree

Hide file tree

Showing 16 changed files with 459 additions and 432 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,14 @@
 This file documents changes made:
+V1.0.9.9	- 2016 Dec 12
+			- Add Laser Mode text to Settings list, Issue 71
+			- Fix revision, Issue 77
+			- Fix handling of Rapid Overrides, Issue 77
+			- Fix Alarm decoding, Issue 67
+			- Avoid Exception if Grbl 0.9x reporting not set for both MPos and WPos
+			- Adapt to new A: messages for Aux item status (which replace T: messages)
+V1.0.9.8	- 2016 Nov 24
+			- French translation, special thanks to Bernard Grosperrin for the hard work
+			- prep for other translations
 V1.0.9.7	- 2016 Oct 12
 			- Adapt to new Gbrl 1.1a reports, etc.
 			- Added button to clear Pin states, makes them latch on even a single report

diff --git a/Grbl-Panel.sln b/Grbl-Panel.sln
@@ -9,10 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Custom", "RepeatButton\Custom.vbproj", "{CF82893A-4C6B-4D08-B8AD-A17EF45DE6F2}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "GrblPanelSetup", "GrblPanelSetup\GrblPanelSetup.wixproj", "{8A91965D-5D4D-4828-BD99-9977996C633E}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "GrblPanelInstall", "GrblPanelInstall\GrblPanelInstall.wixproj", "{26B2B5BB-C13D-47F0-8805-3EFF8A2B6F9C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,20 +33,6 @@ Global
 		{CF82893A-4C6B-4D08-B8AD-A17EF45DE6F2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CF82893A-4C6B-4D08-B8AD-A17EF45DE6F2}.Release|x86.ActiveCfg = Release|Any CPU
 		{CF82893A-4C6B-4D08-B8AD-A17EF45DE6F2}.Release|x86.Build.0 = Release|Any CPU
-		{8A91965D-5D4D-4828-BD99-9977996C633E}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{8A91965D-5D4D-4828-BD99-9977996C633E}.Debug|x86.ActiveCfg = Debug|x86
-		{8A91965D-5D4D-4828-BD99-9977996C633E}.Debug|x86.Build.0 = Debug|x86
-		{8A91965D-5D4D-4828-BD99-9977996C633E}.Release|Any CPU.ActiveCfg = Release|x86
-		{8A91965D-5D4D-4828-BD99-9977996C633E}.Release|Any CPU.Build.0 = Release|x86
-		{8A91965D-5D4D-4828-BD99-9977996C633E}.Release|x86.ActiveCfg = Release|x86
-		{8A91965D-5D4D-4828-BD99-9977996C633E}.Release|x86.Build.0 = Release|x86
-		{26B2B5BB-C13D-47F0-8805-3EFF8A2B6F9C}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{26B2B5BB-C13D-47F0-8805-3EFF8A2B6F9C}.Debug|x86.ActiveCfg = Debug|x86
-		{26B2B5BB-C13D-47F0-8805-3EFF8A2B6F9C}.Debug|x86.Build.0 = Debug|x86
-		{26B2B5BB-C13D-47F0-8805-3EFF8A2B6F9C}.Release|Any CPU.ActiveCfg = Release|x86
-		{26B2B5BB-C13D-47F0-8805-3EFF8A2B6F9C}.Release|Any CPU.Build.0 = Release|x86
-		{26B2B5BB-C13D-47F0-8805-3EFF8A2B6F9C}.Release|x86.ActiveCfg = Release|x86
-		{26B2B5BB-C13D-47F0-8805-3EFF8A2B6F9C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Grbl-Panel/CHANGES.txt b/Grbl-Panel/CHANGES.txt
@@ -1,4 +1,14 @@
 This file documents changes made:
+V1.0.9.9	- 2016 Dec 12
+			- Add Laser Mode text to Settings list, Issue 71
+			- Fix revision, Issue 77
+			- Fix handling of Rapid Overrides, Issue 77
+			- Fix Alarm decoding, Issue 67
+			- Avoid Exception if Grbl 0.9x reporting not set for both MPos and WPos
+			- Adapt to new A: messages for Aux item status (which replace T: messages)
+V1.0.9.8	- 2016 Nov 24
+			- French translation, special thanks to Bernard Grosperrin for the hard work
+			- prep for other translations
 V1.0.9.7	- 2016 Oct 12
 			- Adapt to new Gbrl 1.1a reports, etc.
 			- Added button to clear Pin states, makes them latch on even a single report

diff --git a/Grbl-Panel/CREDITS.txt b/Grbl-Panel/CREDITS.txt
@@ -12,4 +12,5 @@ This tool would not have been possible without:
 - Tyler for adding IP connectivity
 - Peter Smid, for his amazing books on CNC and Gcode
 - Ed Reed, aka JoeBananas10 for the Macro button code and OffSet setting changes
-- matmurdock for adding the icon
+- matmurdock for adding the icon
+- Bernard Grosperrin for the work to internationalize all the messages and text, and the French translations
diff --git a/Grbl-Panel/Grbl-Panel.vbproj.user b/Grbl-Panel/Grbl-Panel.vbproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
 </Project>
diff --git a/Grbl-Panel/GrblGui.vb b/Grbl-Panel/GrblGui.vb
@@ -228,13 +228,13 @@ Public Class GrblGui
                             _gui.btnSpindleOverrideReset.PerformClick()
                             handled = True
                         Case Keys.R And My.Computer.Keyboard.ShiftKeyDown
-                            _gui.btnRapidPlus.PerformClick()
+                            _gui.btnRapidOverrideReset.PerformClick()
                             handled = True
                         Case Keys.R
-                            _gui.btnRapidMinus.PerformClick()
+                            _gui.btnRapidOverride50.PerformClick()
                             handled = True
                         Case Keys.R And My.Computer.Keyboard.AltKeyDown
-                            _gui.btnRapidOverrideReset.PerformClick()
+                            _gui.btnRapidOverride25.PerformClick()
                             handled = True
 
                     End Select

diff --git a/Grbl-Panel/GrblOverrides.vb b/Grbl-Panel/GrblOverrides.vb
@@ -14,7 +14,7 @@ Partial Class grblgui
         CMD_FEED_OVR_COARSE_MINUS = 146 ' 0x92
         CMD_FEED_OVR_FINE_PLUS = 147 ' 0x93
         CMD_FEED_OVR_FINE_MINUS = 148 ' 0x94
-        CMD_RAPID_OVR_RESET = 149 ' 0x95       'Restores rapid override value To 100%.
+        CMD_RAPID_OVR_FULL = 149 ' 0x95       'Restores rapid override value To 100%.
         CMD_RAPID_OVR_MEDIUM = 150 '0x96
         CMD_RAPID_OVR_LOW = 151 ' 0x97
         ' CMD_RAPID_OVR_EXTRA_LOW 0x98 ' *Not SUPPORTED*
@@ -62,7 +62,7 @@ Partial Class grblgui
     Public Sub showOverrides(ByVal data As String)
 
         ' Process Override values, Grbl 1.x only
-        If data.Contains("Ov:") Or data.Contains("T:") Then
+        If data.Contains("Ov:") Or data.Contains("A:") Then
             data = data.Remove(data.Length - 3, 3)
             Dim statusMessage = Split(data, "|")
             For Each item As String In statusMessage
@@ -73,26 +73,26 @@ Partial Class grblgui
                         tbFeedOvr.Text = ovr(0) + "%"
                         tbRapidOvr.Text = ovr(1) + "%"
                         tbSpindleOvr.Text = ovr(2) + "%"
-                        If Not data.Contains("T") Then
+                        If Not data.Contains("A") Then
                             btnSpindleOverride.BackColor = Color.Transparent
+                            btnFloodOverride.BackColor = Color.Transparent
+                            btnMistOverride.BackColor = Color.Transparent
                         End If
-                    Case "T"
+                    Case "A"
                         If portion(1).Contains("S") Then
                             btnSpindleOverride.BackColor = Color.Crimson
+                        Else
+                            btnSpindleOverride.BackColor = Color.Transparent
                         End If
                         If portion(1).Contains("F") Then
-                            If btnFloodOverride.BackColor = Color.Crimson Then
-                                btnFloodOverride.BackColor = Color.Transparent
-                            Else
-                                btnFloodOverride.BackColor = Color.Crimson
-                            End If
+                            btnFloodOverride.BackColor = Color.Crimson
+                        Else
+                            btnFloodOverride.BackColor = Color.Transparent
                         End If
                         If portion(1).Contains("M") Then
-                            If btnMistOverride.BackColor = Color.Crimson Then
-                                btnMistOverride.BackColor = Color.Transparent
-                            Else
-                                btnMistOverride.BackColor = Color.Crimson
-                            End If
+                            btnMistOverride.BackColor = Color.Crimson
+                        Else
+                            btnMistOverride.BackColor = Color.Transparent
                         End If
                 End Select
             Next
@@ -123,13 +123,13 @@ Partial Class grblgui
                 End If
         End Select
     End Sub
-    Private Sub btnRapidOverride_Click(sender As Object, e As EventArgs) Handles btnRapidPlus.Click, btnRapidMinus.Click
+    Private Sub btnRapidOverride_Click(sender As Object, e As EventArgs) Handles btnRapidOverrideReset.Click, btnRapidOverride50.Click, btnRapidOverride25.Click
         Dim btn As Button = sender
 
         Select Case DirectCast(btn.Tag, String)
-            Case "plus"
+            Case "50"
                 grblPort.sendData(Chr(overrideChars.CMD_RAPID_OVR_MEDIUM))
-            Case "minus"
+            Case "25"
                 grblPort.sendData(Chr(overrideChars.CMD_RAPID_OVR_LOW))
         End Select
     End Sub
@@ -155,10 +155,10 @@ Partial Class grblgui
     Private Sub btnFeedOverrideReset_Click(sender As Object, e As EventArgs) Handles btnFeedOverrideReset.Click, btnSpindleOverrideReset.Click, btnRapidOverrideReset.Click
         Dim btn As Button = sender
         Select Case DirectCast(btn.Tag, String)
+            Case "Rapid"
+                grblPort.sendData(Chr(overrideChars.CMD_RAPID_OVR_FULL))
             Case "Feed"
                 grblPort.sendData(Chr(overrideChars.CMD_FEED_OVR_RESET))
-            Case "Rapid"
-                grblPort.sendData(Chr(overrideChars.CMD_RAPID_OVR_RESET))
             Case "Spindle"
                 grblPort.sendData(Chr(overrideChars.CMD_SPINDLE_OVR_RESET))
         End Select
@@ -175,15 +175,11 @@ Partial Class grblgui
         Select Case DirectCast(btn.Tag, String)
             Case "SpindleOverride"
                 grblPort.sendData(Chr(overrideChars.CMD_SPINDLE_OVR_STOP))
-
-                If btnSpindleOverride.BackColor = Color.Crimson Then
-                    btnSpindleOverride.BackColor = Color.Transparent
-                End If
             Case "FloodOverride"
                 grblPort.sendData(Chr(overrideChars.CMD_TOGGLE_FLOOD))
             Case "MistOverride"
                 grblPort.sendData(Chr(overrideChars.CMD_TOGGLE_MIST))
         End Select
-        ' btn colour changes based on T:SFM response handled in showOverrides()
+        ' btn colour changes based on A:SFM response handled in showOverrides()
     End Sub
 End Class
diff --git a/Grbl-Panel/GrblPosition.vb b/Grbl-Panel/GrblPosition.vb
@@ -74,32 +74,43 @@ Partial Class GrblGui
 
 
     Public Sub showGrblPositions(ByVal data As String)
-
+		dim positions() as String
+
         ' Show data in the Positions group (from our own thread)
         If data = vbCrLf Then Return
 
         If GrblVersion = 0 Then
-            ' Grbl versions 0.x
+            ' Grbl versions 0.x, assume/expect $10=3 or equivalent 
+			data = data.Remove(data.Length - 3, 3)   ' Remove the "> " at end
             If (data.Contains("MPos:")) Then
                 ' Lets display the values
-                data = data.Remove(data.Length - 3, 3)   ' Remove the "> " at end
-                Dim positions = Split(data, ":")
-                Dim machPos = Split(positions(1), ",")
-                Dim workPos = Split(positions(2), ",")
-
-                tbMachX.Text = machPos(0).ToString
-                tbMachY.Text = machPos(1).ToString
-                tbMachZ.Text = machPos(2).ToString
-
-                tbWorkX.Text = workPos(0).ToString
-                tbWorkY.Text = workPos(1).ToString
-                tbWorkZ.Text = workPos(2).ToString
-
-                'Set same values into the repeater view on Offsets page
-                tbOffSetsMachX.Text = machPos(0).ToString
-                tbOffSetsMachY.Text = machPos(1).ToString
-                tbOffSetsMachZ.Text = machPos(2).ToString
+                    positions = Split(data, ":")
+                    ' MPos will always be first
+                    Dim machPos = Split(positions(1), ",")
+
+                    tbMachX.Text = machPos(0).ToString
+                    tbMachY.Text = machPos(1).ToString
+                    tbMachZ.Text = machPos(2).ToString
+                    'Set same values into the repeater view on Offsets page
+                    tbOffSetsMachX.Text = machPos(0).ToString
+                    tbOffSetsMachY.Text = machPos(1).ToString
+                    tbOffSetsMachZ.Text = machPos(2).ToString
+
             End If
+			if (data.Contains("WPos:")) Then
+				Dim workPos() As String
+                     positions = Split(data, ":")
+                    ' WPos might be first or it might be second (if MPos is also present)
+                    If positions.Count = 2 Then
+                        workPos = Split(positions(1), ",")
+                    Else
+                        workPos = Split(positions(2), ",")
+                    End If
+                    tbWorkX.Text = workPos(0).ToString
+                    tbWorkY.Text = workPos(1).ToString
+                    tbWorkZ.Text = workPos(2).ToString
+            End If
+
         End If
 
         If GrblVersion = 1 Then

diff --git a/Grbl-Panel/GrblSettings.vb b/Grbl-Panel/GrblSettings.vb
@@ -34,6 +34,7 @@ Partial Class GrblGui
             {"27", Resources.GrblSettings_HomingPullOffMm},
             {"30", Resources.GrblSettings_RpmMax},
             {"31", Resources.GrblSettings_RpmMin},
+			{"32", Resources.GrblSettings_LaserMode},
             {"100", Resources.GrblSettings_XStepMm},
             {"101", Resources.GrblSettings_YStepMm},
             {"102", Resources.GrblSettings_ZStepMm},

diff --git a/Grbl-Panel/GrblStatus.vb b/Grbl-Panel/GrblStatus.vb
@@ -262,6 +262,9 @@ Partial Class GrblGui
 
                             tbCurrentStatus.BackColor = Color.LightGreen
                             tbCurrentStatus.Text = GrblGui_showGrblStatus_HOLD
+						Case "<Alarm"
+                            Me.btnUnlock.BackColor = Color.Crimson
+                            statusSetIndicators("<Alarm")       ' Messy Status messages make for messy code :(
                         Case "<Jog"
                             tbCurrentStatus.BackColor = Color.LightGreen
                             tbCurrentStatus.Text = "JOG"
@@ -283,7 +286,8 @@ Partial Class GrblGui
                                 prgbRxBuf.Value = 128 - values(1)
                             Catch
                             End Try
-                        Case "F"
+                        Case "F"
+                        Case "FS"
                             ' TODO Figure out where to display Grbl's actual feedrate, if at all
                     End Select
                 Next

diff --git a/Grbl-Panel/My Project/AssemblyInfo.vb b/Grbl-Panel/My Project/AssemblyInfo.vb
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.9.6")>
-<Assembly: AssemblyFileVersion("1.0.9.6")>
+<Assembly: AssemblyVersion("1.0.9.9")>
+<Assembly: AssemblyFileVersion("1.0.9.9")>
 
 <Assembly: NeutralResourcesLanguageAttribute("en-CA")> 
diff --git a/Grbl-Panel/My Project/Resources.Designer.vb b/Grbl-Panel/My Project/Resources.Designer.vb
diff --git a/Grbl-Panel/My Project/Resources.fr.resx b/Grbl-Panel/My Project/Resources.fr.resx
@@ -456,4 +456,7 @@
   <data name="GrblSettings_FillSettings_Value" xml:space="preserve">
     <value>Valeur</value>
   </data>
+  <data name="GrblSettings_LaserMode" xml:space="preserve">
+    <value>Mode laser</value>
+  </data>
 </root>
diff --git a/Grbl-Panel/My Project/Resources.resx b/Grbl-Panel/My Project/Resources.resx
@@ -456,4 +456,7 @@
   <data name="GrblSettings_FillSettings_Value" xml:space="preserve">
     <value>Value</value>
   </data>
+  <data name="GrblSettings_LaserMode" xml:space="preserve">
+    <value>laser mode</value>
+  </data>
 </root>