Release 2.0.39, se changelog for details

terjeio · Jul 5, 2022 · 5ebc00e · 5ebc00e
1 parent 3e76e54
commit 5ebc00e
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 18 deletions.
diff --git a/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml b/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml
@@ -6,8 +6,8 @@
              xmlns:local="clr-namespace:CNC.Controls.Camera"
              xmlns:Controls="clr-namespace:CNC.Controls;assembly=CNC.Controls.WPF" x:Class="CNC.Controls.Camera.ConfigControl"
              mc:Ignorable="d" 
-             d:DesignHeight="160" d:DesignWidth="250">
-    <GroupBox x:Uid="grp_camera" x:Name="grpCamera" Header="Camera" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
+             d:DesignHeight="160" d:DesignWidth="310">
+    <GroupBox x:Uid="grp_camera" x:Name="grpCamera" Header="Camera" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="310">
         <StackPanel HorizontalAlignment="Left" Height="Auto" Margin="0,3,0,0" VerticalAlignment="Top" Width="235">
             <CheckBox x:Uid="chk_moveToSpindle" Content="Inital move to spindle" IsChecked="{Binding Path=Camera.InitialMoveToSpindle, Mode=TwoWay}" Margin="90,0,0,0"/>
             <CheckBox x:Uid="chk_confirmMove" Content="Confirm move" IsChecked="{Binding Path=Camera.ConfirmMove, Mode=TwoWay}" Margin="90,0,0,0"/>

diff --git a/CNC Controls/CNC Controls/Converters.cs b/CNC Controls/CNC Controls/Converters.cs
@@ -1,7 +1,7 @@
 /*
  * Converters.cs - part of CNC Controls library for Grbl
  *
- * v0.36 / 2021-12-08 / Io Engineering (Terje Io)
+ * v0.39 / 2022-06-24 / Io Engineering (Terje Io)
  *
  */
 
@@ -375,7 +375,7 @@ public class LogicalNotConverter : IValueConverter
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            bool result = (value is bool ? !(bool)value : ((value is int) ? (int)value == 0 : false)) || value == null;
+            bool result = (value is bool ? !(bool)value : ((value is bool?) ? (bool?)value != true : ((value is int) ? (int)value == 0 : false))) || value == null;
 
             return FinalConverter == null ? result : FinalConverter.Convert(result, targetType, parameter, culture);
         }

diff --git a/CNC Core/CNC Core/GrblViewModel.cs b/CNC Core/CNC Core/GrblViewModel.cs
@@ -1,7 +1,7 @@
 /*
  * GrblViewModel.cs - part of CNC Controls library
  *
- * v0.38 / 2022-06-01 / Io Engineering (Terje Io)
+ * v0.39 / 2022-06-24 / Io Engineering (Terje Io)
  *
  */
 
@@ -755,7 +755,7 @@ public void ParseHomedStatus(string data)
         public bool ParseStatus(string data)
         {
             bool changed, wco_present = data.Contains("|WCO:");
-            int rti = data.Contains("|WCO:") ? 1 : (data.Contains("|Ov:") ? 2 : 0);
+            int rti = data.Contains("|WCO:") || data.Contains("|MPG:") ? 1 : (data.Contains("|Ov:") ? 2 : 0);
 
             if ((changed = (_rtState[rti] != data) || _grblState.State == GrblStates.Unknown)) {
 

diff --git a/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs b/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.38.0")]
-[assembly: AssemblyFileVersion("2.0.38.0")]
+[assembly: AssemblyVersion("2.0.39.0")]
+[assembly: AssemblyFileVersion("2.0.39.0")]
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,13 @@
 ## ioSender changelog
 
+2022-07-05: [Release 2.0.39](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.39).
+
+* Fixed MPG mode switching issue, "hardened" code.
+* Removed dependency on XCeed WPF toolkit. WPF toolkit issue [#1598}(https://github.com/xceedsoftware/wpftoolkit/issues/1598) and sender issue [#231](https://github.com/terjeio/ioSender/issues/231).
+* UI color selection for 3D viewer disabled. Color changes has to be done by editing _App.cofig_ until a new color picker is found or made.
+
+---
+
 Executable for development builds available for download [here](http://www.io-engineering.com/downloads/) if you want to participate in testing.
 
 2022-06-12: [Release 2.0.38](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.38).

diff --git a/ioSender XL/ioSender XL/JobView.xaml.cs b/ioSender XL/ioSender XL/JobView.xaml.cs
@@ -1,7 +1,7 @@
 /*
  * JobView.xaml.cs - part of Grbl Code Sender
  *
- * v0.38 / 2022-02-27 / Io Engineering (Terje Io)
+ * v0.39 / 2022-06-24 / Io Engineering (Terje Io)
  *
  */
 
@@ -85,7 +85,7 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
             if (sender is GrblViewModel) switch (e.PropertyName)
                 {
                 case nameof(GrblViewModel.GrblState):
-                    if (!Controller.ResetPending)
+                    if (Controller != null && !Controller.ResetPending)
                     {
                         if (isBooted && initOK == false && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
                             Dispatcher.BeginInvoke(new System.Action(() => InitSystem()), DispatcherPriority.ApplicationIdle);

diff --git a/ioSender XL/ioSender XL/MainWindow.xaml.cs b/ioSender XL/ioSender XL/MainWindow.xaml.cs
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.38";
+        private const string version = "2.0.39";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();

diff --git a/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs b/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.38.0")]
-[assembly: AssemblyFileVersion("2.0.38.0")]
+[assembly: AssemblyVersion("2.0.39.0")]
+[assembly: AssemblyFileVersion("2.0.39.0")]
diff --git a/ioSender/ioSender/JobView.xaml.cs b/ioSender/ioSender/JobView.xaml.cs
@@ -1,7 +1,7 @@
 /*
  * JobView.xaml.cs - part of Grbl Code Sender
  *
- * v0.38 / 2022-04-15 / Io Engineering (Terje Io)
+ * v0.39 / 2022-06-24 / Io Engineering (Terje Io)
  *
  */
 
@@ -85,7 +85,7 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
             if (sender is GrblViewModel) switch (e.PropertyName)
             {
                 case nameof(GrblViewModel.GrblState):
-                    if (!Controller.ResetPending)
+                    if (Controller != null && !Controller.ResetPending)
                     {
                         if (initOK == false && isBooted && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
                         {

diff --git a/ioSender/ioSender/MainWindow.xaml.cs b/ioSender/ioSender/MainWindow.xaml.cs
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.38";
+        private const string version = "2.0.39";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();

diff --git a/ioSender/ioSender/Properties/AssemblyInfo.cs b/ioSender/ioSender/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.38.0")]
-[assembly: AssemblyFileVersion("2.0.38.0")]
+[assembly: AssemblyVersion("2.0.39.0")]
+[assembly: AssemblyFileVersion("2.0.39.0")]