From 696f9417ba69c87ff3991b77b2f207fff4063ea2 Mon Sep 17 00:00:00 2001
From: Terje Io <terjeio@users.noreply.github.com>
Date: Fri, 11 Mar 2022 07:10:16 +0100
Subject: [PATCH] Release 2.0.37

---
 .../CNC Controls Camera/Camera.xaml           |   2 +-
 .../CNC Controls Camera/Camera.xaml.cs        |   7 +-
 .../CNC Controls Camera/CameraControl.xaml    |  26 +-
 .../CNC Controls Camera/CameraControl.xaml.cs |  67 +++-
 .../CNC Controls Camera/ConfigControl.xaml    |   6 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../CenterFinderControl.xaml                  |   2 +
 .../CenterFinderControl.xaml.cs               |  71 +++-
 .../EdgeFinderControl.xaml.cs                 |   9 +-
 .../EdgeFinderIntControl.xaml.cs              |   9 +-
 .../HeightMapControl.xaml.cs                  |  15 +-
 .../CNC Controls Probing/IProbeTab.cs         |   6 +-
 .../CNC Controls Probing/LibStrings.xaml      |   1 +
 .../CNC Controls Probing/ProbingView.xaml     |   1 +
 .../CNC Controls Probing/ProbingView.xaml.cs  |  43 ++-
 .../CNC Controls Probing/ProbingViewModel.cs  |  12 +-
 .../CNC Controls Probing/Program.cs           |   1 +
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../CNC Controls Probing/RotationControl.xaml |   3 -
 .../RotationControl.xaml.cs                   |  43 ++-
 .../ToolLengthControl.xaml.cs                 |  17 +-
 CNC Controls/CNC Controls/AppConfig.cs        |  12 +-
 CNC Controls/CNC Controls/AppConfigView.xaml  |   5 +-
 .../CNC Controls/AppConfigView.xaml.cs        |  14 +-
 CNC Controls/CNC Controls/CNC Controls.csproj |  29 ++
 CNC Controls/CNC Controls/DROControl.xaml.cs  |  63 +++-
 CNC Controls/CNC Controls/GCode.cs            |  10 +-
 CNC Controls/CNC Controls/ICamera.cs          |   5 +-
 CNC Controls/CNC Controls/JobControl.xaml.cs  |  44 ++-
 .../CNC Controls/JogBaseControl.xaml.cs       | 328 ++++++++++--------
 CNC Controls/CNC Controls/LibStrings.xaml     |   2 +
 .../CNC Controls/OutlineBaseControl.xaml      |  10 +-
 CNC Controls/CNC Controls/OutlineControl.xaml |   4 +-
 CNC Controls/CNC Controls/OutlineFlyout.xaml  |   6 +-
 .../CNC Controls/Properties/AssemblyInfo.cs   |   4 +-
 CNC Core/CNC Core/GCodeParser.cs              |  32 +-
 CNC Core/CNC Core/Grbl.cs                     | 125 +++++--
 CNC Core/CNC Core/GrblViewModel.cs            |  31 +-
 CNC Core/CNC Core/KeypressHandler.cs          |  93 ++++-
 CNC Core/CNC Core/Properties/AssemblyInfo.cs  |   4 +-
 .../CNC.Controls.Camera.resources.de-DE.csv   |   6 +
 .../CNC.Controls.Probing.resources.de-DE.csv  |   4 +
 .../csv/CNC.Controls.WPF.resources.de-DE.csv  |  15 +
 Locale/de-DE/csv/ioSender.resources.de-DE.csv |  15 +
 Locale/de-DE/translation.txt                  | Bin 101038 -> 108324 bytes
 .../CNC.Controls.Camera.resources.en-US.csv   |   6 +
 .../CNC.Controls.Probing.resources.en-US.csv  |   4 +
 .../csv/CNC.Controls.WPF.resources.en-US.csv  |  15 +
 Locale/en-US/csv/ioSender.resources.en-US.csv |  15 +
 Locale/en-US/translation.txt                  | Bin 96374 -> 103660 bytes
 .../CNC.Controls.Camera.resources.ru-RU.csv   |   6 +
 .../CNC.Controls.Probing.resources.ru-RU.csv  |   4 +
 .../csv/CNC.Controls.WPF.resources.ru-RU.csv  |  15 +
 Locale/ru-RU/csv/ioSender.resources.ru-RU.csv |  15 +
 Locale/ru-RU/translation.txt                  | Bin 98856 -> 106142 bytes
 .../CNC.Controls.Camera.resources.zh-CN.csv   |   6 +
 .../CNC.Controls.Probing.resources.zh-CN.csv  |   4 +
 .../csv/CNC.Controls.WPF.resources.zh-CN.csv  |  15 +
 Locale/zh-CN/csv/ioSender.resources.zh-CN.csv |  15 +
 Locale/zh-CN/translation.txt                  | Bin 96120 -> 103406 bytes
 changelog.md                                  |  16 +-
 ioSender XL/ioSender XL/App.xaml.cs           |   5 +-
 ioSender XL/ioSender XL/JobView.xaml          |   8 +-
 ioSender XL/ioSender XL/JobView.xaml.cs       |  50 ++-
 ioSender XL/ioSender XL/MainWindow.xaml       |   5 +
 ioSender XL/ioSender XL/MainWindow.xaml.cs    |  22 +-
 .../ioSender XL/Properties/AssemblyInfo.cs    |   4 +-
 ioSender/ioSender/App.xaml.cs                 |   5 +-
 ioSender/ioSender/JobView.xaml.cs             |  46 ++-
 ioSender/ioSender/MainWindow.xaml             |   5 +
 ioSender/ioSender/MainWindow.xaml.cs          |  24 +-
 ioSender/ioSender/Properties/AssemblyInfo.cs  |   4 +-
 72 files changed, 1133 insertions(+), 391 deletions(-)

diff --git a/CNC Controls Camera/CNC Controls Camera/Camera.xaml b/CNC Controls Camera/CNC Controls Camera/Camera.xaml
index 02da895..37cb78c 100644
--- a/CNC Controls Camera/CNC Controls Camera/Camera.xaml	
+++ b/CNC Controls Camera/CNC Controls Camera/Camera.xaml	
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CNC.Controls.Camera"
         mc:Ignorable="d"
-        Title="Sender" Height="390" Width="504"
+        Title="Sender" Height="414" Width="504"
         Topmost="True"
         Closing="Window_Closing" Icon="App.ico" ShowInTaskbar="False" ResizeMode="NoResize">
     <Window.TaskbarItemInfo>
diff --git a/CNC Controls Camera/CNC Controls Camera/Camera.xaml.cs b/CNC Controls Camera/CNC Controls Camera/Camera.xaml.cs
index cb78d2b..12d9f4b 100644
--- a/CNC Controls Camera/CNC Controls Camera/Camera.xaml.cs	
+++ b/CNC Controls Camera/CNC Controls Camera/Camera.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * Camera.xaml.cs - part of CNC Controls Camera library
  *
- * v0.33 / 2021-05-04 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-02 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io) - parts derived from AForge example code
+Copyright (c) 2018-2022, Io Engineering (Terje Io) - parts derived from AForge example code
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -66,6 +66,7 @@ private void CNCCamera_MoveOffset(Core.CameraMoveMode Mode, double XOffset, doub
         public bool HasCamera { get { return CNCCamera.HasCamera; } }
         public CameraControl CameraControl { get { return CNCCamera; } }
         public new bool IsVisible { get { return CNCCamera.IsVisible; } }
+        public bool IsMoveEnabled { get { return CNCCamera.IsMoveEnabled; } set { CNCCamera.IsMoveEnabled = value && (CNCCamera.XOffset != 0d || CNCCamera.YOffset != 0d); } }
 
         public void Setup(UIViewModel model)
         {
@@ -89,6 +90,8 @@ public void Open()
 
             Show();
 
+            CameraControl.MoveCameraToSpindlePosition = AppConfig.Settings.Camera.InitialMoveToSpindle;
+
             if (CNCCamera.OpenVideoSource())
                 IsVisibilityChanged?.Invoke();
         }
diff --git a/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml b/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml
index 2e65930..816248d 100644
--- a/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml	
+++ b/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml	
@@ -3,22 +3,32 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:CNC.Controls.Camera"
              mc:Ignorable="d" 
-             d:DesignHeight="360" d:DesignWidth="500"
+             d:DesignHeight="370" d:DesignWidth="500"
              Background="#FFF0F0F0" Loaded="CameraControl_Loaded">
+    <UserControl.Resources>
+        <system:String x:Uid="str_moveSpindleTo" x:Key="MoveSpindleTo">Move spindle to camera position?</system:String>
+        <system:String x:Uid="str_moveCameraTo" x:Key="MoveCameraTo">Move camera to spindle position?</system:String>
+    </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="320"/>
-            <RowDefinition Height="40"/>
+            <RowDefinition Height="30"/>
+            <RowDefinition Height="307"/>
+            <RowDefinition Height="33"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="420"/>
+            <ColumnDefinition Width="407"/>
             <ColumnDefinition Width="80"/>
         </Grid.ColumnDefinitions>
-        <Image Width="400" Height="300" HorizontalAlignment="Left" Name="frameHolder" VerticalAlignment="Top" Margin="10,10,0,0"/>
-        <Slider x:Name="sldcircle" Orientation="Vertical" HorizontalAlignment="Left" Value="{Binding Path=GuideScale, Mode=TwoWay}" Margin="28,30,0,0" VerticalAlignment="Top" Height="118" Width="30" Grid.Column="1" ValueChanged="sldcircle_ValueChanged" Maximum="100" Minimum="5" LargeChange="10" SmallChange="1"/>
-        <Button x:Uid="btn_moveOffset" x:Name="btnMove" Content="Move offset" IsEnabled="{Binding Path=IsMoveEnabled}" HorizontalAlignment="Left" Margin="10,4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Click="btnMove_Click" Height="22"/>
-        <ComboBox x:Name="cbxCamera" ItemsSource="{Binding Path=Cameras}" DisplayMemberPath="Name" SelectedValuePath="Camera" HorizontalAlignment="Left" Margin="100,4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="300" SelectionChanged="cbxCamera_SelectionChanged" Height="22"/>
+        <ComboBox x:Name="cbxCamera" ItemsSource="{Binding Cameras}" DisplayMemberPath="Name" SelectedValuePath="Camera" Width="400" SelectionChanged="cbxCamera_SelectionChanged" Height="22" Margin="5,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
+        <Image Width="400" Height="300" HorizontalAlignment="Left" Name="frameHolder" VerticalAlignment="Top" Margin="5,5,0,0" Grid.Row="1"/>
+        <Slider x:Name="sldcircle" Orientation="Vertical" HorizontalAlignment="Left" Value="{Binding Path=GuideScale, Mode=TwoWay}" Margin="28,1,0,0" VerticalAlignment="Top" Height="118" Width="30" Grid.Column="1" ValueChanged="sldcircle_ValueChanged" Maximum="100" Minimum="5" LargeChange="10" SmallChange="1" Grid.Row="1"/>
+        <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="5,4,0,0" Grid.ColumnSpan="2" Height="22" VerticalAlignment="Top">
+            <Button x:Uid="btn_moveOffset" x:Name="btnMove" Content="Move offset" IsEnabled="{Binding Path=IsMoveEnabled}" Width="75" Click="btnMove_Click" Height="22"/>
+            <CheckBox x:Uid="lbl_cameraToSpindlePosition" x:Name="chkCameraToSpindlePosition" Content="camera to spindle" Focusable="False" IsChecked="{Binding Path=MoveCameraToSpindlePosition, Mode=TwoWay}" IsEnabled="{Binding Path=IsMoveEnabled}" Margin="4,0,0,0" VerticalAlignment="Center"/>
+            <Button x:Uid="btn_useAsProbe" x:Name="btnUseAsProbe" Content="Use as probe position" IsEnabled="{Binding Path=grbl.IsProbing}" Focusable="False" Padding="4,0" Margin="46,0,0,0" Click="btnPublish_Click" Height="22"/>
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml.cs b/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml.cs
index de18035..353b23e 100644
--- a/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml.cs	
+++ b/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * CameraControl.xaml.cs - part of CNC Controls Camera library
  *
- * v0.30 / 2021-04-08 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-02 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io) - parts derived from AForge example code
+Copyright (c) 2018-2022, Io Engineering (Terje Io) - parts derived from AForge example code
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -68,9 +68,9 @@ public partial class CameraControl : UserControl
 
         public CameraControl()
         {
-            DataContext = this;
-
             InitializeComponent();
+
+            DataContext = this;
         }
 
         private void CameraControl_Loaded(object sender, RoutedEventArgs e)
@@ -83,6 +83,12 @@ private void CameraControl_Loaded(object sender, RoutedEventArgs e)
             if (Cameras.Count > 0)
             {
                 Camera = Cameras[0];
+                if (AppConfig.Settings.Camera.SelectedCamera != string.Empty)
+                {
+                    foreach (FilterInfo camera in Cameras)
+                        if (camera.MonikerString == AppConfig.Settings.Camera.SelectedCamera)
+                            Camera = camera;
+                }
                 cbxCamera.SelectedItem = Camera;
             }
         }
@@ -123,6 +129,15 @@ private static void OnGuideScaleChanged(DependencyObject d, DependencyPropertyCh
             AppConfig.Settings.Camera.GuideScale = (int)e.NewValue;
         }
 
+        public static readonly DependencyProperty MoveCameraToSpindlePositionProperty = DependencyProperty.Register(nameof(MoveCameraToSpindlePosition), typeof(bool), typeof(CameraControl), new PropertyMetadata(false));
+        public bool MoveCameraToSpindlePosition
+        {
+            get { return (bool)GetValue(MoveCameraToSpindlePositionProperty); }
+            set { SetValue(MoveCameraToSpindlePositionProperty, value); }
+        }
+
+        public GrblViewModel grbl {  get { return Grbl.GrblViewModel;  } }
+
         public double XOffset
         {
             get { return _xOffset; }
@@ -139,11 +154,13 @@ public double YOffset
         public FilterInfoCollection Cameras { get; private set; } = new FilterInfoCollection(FilterCategory.VideoInputDevice);
         public FilterInfo Camera { get; private set; }
 
-        public bool OpenVideoSource()
+        public bool OpenVideoSource(FilterInfo camera)
         {
-            if (Camera != null)
+            CloseCurrentVideoSource();
+
+            if (camera != null)
             {
-                videoSource = new VideoCaptureDevice(Camera.MonikerString);
+                videoSource = new VideoCaptureDevice(camera.MonikerString);
                 videoSource.Start();
                 videoSource.NewFrame += videoSource_NewFrame;
             }
@@ -151,6 +168,11 @@ public bool OpenVideoSource()
             return videoSource != null && videoSource.IsRunning;
         }
 
+        public bool OpenVideoSource()
+        {
+            return IsCameraOpen || OpenVideoSource(Camera);
+        }
+
         public void CloseCurrentVideoSource()
         {
             if (videoSource != null)
@@ -158,8 +180,8 @@ public void CloseCurrentVideoSource()
                 videoSource.NewFrame -= videoSource_NewFrame;
                 videoSource.SignalToStop();
 
-                // wait ~ 3 seconds
-                for (int i = 0; i < 30; i++)
+                // wait ~5 seconds
+                for (int i = 0; i < 50; i++)
                 {
                     if (!videoSource.IsRunning)
                         break;
@@ -225,15 +247,36 @@ private void sldcircle_ValueChanged(object sender, RoutedPropertyChangedEventArg
 
         private void btnMove_Click(object sender, RoutedEventArgs e)
         {
-            MoveOffset?.Invoke(Mode, XOffset, YOffset);
+            if (!AppConfig.Settings.Camera.ConfirmMove || MessageBox.Show(UIUtils.TryFindParent<Window>(this), (string)FindResource(MoveCameraToSpindlePosition ? "MoveCameraTo" : "MoveSpindleTo"), "ioSender", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+            {
+                if (MoveCameraToSpindlePosition)
+                {
+                    MoveCameraToSpindlePosition = false;
+                    MoveOffset?.Invoke(Mode, -XOffset, -YOffset);
+                }
+                else
+                    MoveOffset?.Invoke(Mode, XOffset, YOffset);
+            }
+        }
+
+        private void btnPublish_Click(object sender, RoutedEventArgs e)
+        {
+            Position pos = new Position(Grbl.GrblViewModel.MachinePosition);
+
+            pos.X += XOffset;
+            pos.Y += YOffset;
+
+            Grbl.GrblViewModel.CameraProbed(pos);
         }
 
         private void cbxCamera_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if(((ComboBox)sender).IsDropDownOpen)
+            if(((ComboBox)sender).IsDropDownOpen && e.AddedItems.Count == 1)
             {
                 CloseCurrentVideoSource();
-                OpenVideoSource();
+                OpenVideoSource(e.AddedItems[0] as FilterInfo);
+                AppConfig.Settings.Camera.SelectedCamera = (e.AddedItems[0] as FilterInfo).MonikerString;
+                AppConfig.Settings.Save();
             }
         }
     }
diff --git a/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml b/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml
index fa754c4..2f6bdce 100644
--- a/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml	
+++ b/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml	
@@ -6,9 +6,11 @@
              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="140" d:DesignWidth="250">
+             d:DesignHeight="160" d:DesignWidth="250">
     <GroupBox x:Uid="grp_camera" x:Name="grpCamera" Header="Camera" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
-        <StackPanel HorizontalAlignment="Left" Height="115" Margin="0,3,0,0" VerticalAlignment="Top" Width="235">
+        <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"/>
             <Controls:NumericField x:Uid="fld_xOffset" x:Name="xOffset" Label="X offset:" ColonAt="90" Value="{Binding Path=Camera.XOffset, Mode=TwoWay}"/>
             <Controls:NumericField x:Uid="fld_yOffset" x:Name="yOffset" Label="Y offset:" ColonAt="90" Value="{Binding Path=Camera.YOffset, Mode=TwoWay}"/>
             <Grid Height="29">
diff --git a/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs b/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs
index 83bc810..d8f25de 100644
--- a/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Camera/CNC Controls Camera/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.35.0")]
-[assembly: AssemblyFileVersion("2.0.35.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]
diff --git a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml
index cfb73b1..9239393 100644
--- a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml	
@@ -17,6 +17,7 @@
         <system:String x:Uid="str_centerFinderClearance" x:Key="Clearance">Probing XY clearance too large for workpiece {0} size.</system:String>
         <system:String x:Uid="str_centerFinderFailed" x:Key="ProbingFailed">Probing failed</system:String>
         <system:String x:Uid="str_centerFinderCompleted" x:Key="ProbingCompleted">Probing completed: X distance {0}, Y distance {1}.</system:String>
+        <system:String x:Uid="str_positionsRequired" x:Key="PositionsRequired">{0} probe positions are required.</system:String>
         <Controls:MultiLineConverter x:Key="ErrorMessageConverter" />
         <Controls:LogicalNotConverter x:Key="IsNotRunningConverter" />
         <Controls:BoolToVisibleConverter x:Key="ToVisibleConverter" />
@@ -88,6 +89,7 @@
         <StackPanel Margin="5,0,0,5" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="Auto" Width="Auto">
             <Button x:Uid="btn_start" Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
             <Button x:Uid="btn_stop" Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
+            <Button x:Uid="btn_useCamera" Content="Use camera positions" IsEnabled="{Binding Path=CanApplyTransform}" Margin="2,0" Padding="4,0" Click="camera_Click"/>
         </StackPanel>
         <CheckBox x:Uid="lbl_preview" Content="Preview" Margin="365,10,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
         <GroupBox x:Uid="grp_preview" Header="Preview" Margin="365,30,0,0" Visibility="{Binding Path=PreviewEnable, Converter={StaticResource ToVisibleConverter}}" VerticalAlignment="Top">
diff --git a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs
index 00920b8..28841e0 100644
--- a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * CenterFinderControl.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-12-01 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -74,9 +74,53 @@ public CenterFinderControl()
 
         public ProbingType ProbingType { get { return ProbingType.CenterFinder; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
-            (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+            var probing = DataContext as ProbingViewModel;
+
+            if (activate)
+            {
+                probing.Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+                probing.PropertyChanged += Probing_PropertyChanged;
+            } else
+                probing.PropertyChanged -= Probing_PropertyChanged;
+        }
+
+        private void Probing_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(ProbingViewModel.CameraPositions))
+            {
+                var probing = DataContext as ProbingViewModel;
+                bool ok = probing.CameraPositions <= 1 || !probing.Positions[probing.CameraPositions - 1].Equals(probing.Positions[probing.CameraPositions - 2]);
+
+                if(ok) switch (probing.CameraPositions)
+                {
+                    case 2:
+                        if(mode == FindMode.Y)
+                            ok = probing.Positions[1].X == probing.Positions[0].X && probing.Positions[1].Y > probing.Positions[0].Y;
+                        else
+                            ok = probing.Positions[1].X > probing.Positions[0].X && probing.Positions[1].Y == probing.Positions[0].Y;
+                        break;
+
+                    case 3:
+                        ok = !probing.Positions[2].Equals(probing.Positions[0]) && probing.Positions[2].X != probing.Positions[1].X;
+                        break;
+
+                    case 4:
+                        ok = !probing.Positions[3].Equals(probing.Positions[0]) &&
+                                !probing.Positions[3].Equals(probing.Positions[1]) &&
+                                probing.Positions[3].X == probing.Positions[2].X &&
+                                probing.Positions[3].Y > probing.Positions[2].Y;
+                        break;
+                }
+
+                if (!ok)
+                {
+                    MessageBox.Show(LibStrings.FindResource("IllegalPosition"), "ioSender", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                    probing.RemoveLastPosition();
+                } else
+                    probing.CanApplyTransform = probing.CameraPositions == (mode == FindMode.XY ? 4 : 2);
+            }
         }
 
         private bool CreateProgram(bool preview)
@@ -378,6 +422,25 @@ private void start_Click(object sender, RoutedEventArgs e)
             Start((DataContext as ProbingViewModel).PreviewEnable);
         }
 
+        private void camera_Click(object sender, RoutedEventArgs e)
+        {
+            var probing = DataContext as ProbingViewModel;
+
+            if (probing.ProbeCenter == Center.None)
+            {
+                MessageBox.Show((string)FindResource("SelectType"), "Center finder", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                return;
+            }
+
+            if (probing.Positions.Count == (mode == FindMode.XY ? 4 : 2))
+            {
+                probing.IsSuccess = true;
+                OnCompleted();
+                probing.Positions.Clear();
+                probing.CanApplyTransform = probing.PreviewEnable = false;
+            }
+        }
+
         private void stop_Click(object sender, RoutedEventArgs e)
         {
             Stop();
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs
index 3c6d4fe..86f5465 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * EdgeFinderControl.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-12-01 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -78,9 +78,10 @@ public EdgeFinderControl()
 
         public ProbingType ProbingType { get { return ProbingType.EdgeFinderExternal; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
-            (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+            if(activate)
+                (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
         }
 
         public void Start(bool preview = false)
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs
index 3c87de6..d1edbc6 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * EdgeFinderIntControl.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-11-01 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -65,9 +65,10 @@ public EdgeFinderIntControl()
 
         public ProbingType ProbingType { get { return ProbingType.EdgeFinderInternal; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
-            (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+            if (activate)
+                (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
         }
 
         public void Start(bool preview = false)
diff --git a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs
index 216ef65..b30888e 100644
--- a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * HeightMapControl.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-11-29 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-09 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -61,9 +61,10 @@ public HeightMapControl()
 
         public ProbingType ProbingType { get { return ProbingType.HeightMap; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
-            (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+            if(activate)
+                (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
         }
 
         public void Start(bool preview = false)
@@ -189,8 +190,12 @@ private void OnCompleted()
                 probing.HeightMap.MapPoints = mapPoints.Points;
                 probing.HeightMap.HasHeightMap = true;
 
-                probing.Program.End(ok ? string.Format((string)FindResource("ProbingCompleted"), z_min.ToInvariantString(probing.Grbl.Format), z_max.ToInvariantString(probing.Grbl.Format)) : (string)FindResource("ProbingFailed"));
+                if(ok)
+                    probing.Program.End(string.Format((string)FindResource("ProbingCompleted"), z_min.ToInvariantString(probing.Grbl.Format), z_max.ToInvariantString(probing.Grbl.Format)));
             }
+
+            if(!ok)
+                probing.Program.End((string)FindResource("ProbingFailed"));
         }
 
         public void Load (string fileName)
diff --git a/CNC Controls Probing/CNC Controls Probing/IProbeTab.cs b/CNC Controls Probing/CNC Controls Probing/IProbeTab.cs
index 5b71808..f10c5e1 100644
--- a/CNC Controls Probing/CNC Controls Probing/IProbeTab.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/IProbeTab.cs	
@@ -1,13 +1,13 @@
 /*
  * IProbeTab.cs - part of CNC Probing library
  *
- * v0.27 / 2020-09-18 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -53,7 +53,7 @@ public enum ProbingType
     public interface IProbeTab
     {
         ProbingType ProbingType { get; }
-        void Activate();
+        void Activate(bool activate);
         void Start(bool preview = false);
         void Stop();
     }
diff --git a/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml b/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml
index b6d0c15..56f77f0 100644
--- a/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml	
@@ -14,4 +14,5 @@
     <system:String x:Uid="str_probingRadiusArcs" x:Key="HasRadiusArcs">GCode contains arcs in XZ or YZ plane (G18/19), can't apply transform. Use 'Arcs to Lines' if you really need this.</system:String>
     <system:String x:Uid="str_probingDistanceError" x:Key="ErrorProbingDistance">Probing distance must be larger than XY Clearance + ½ Probe/tool diameter.</system:String>
     <system:String x:Uid="str_probingLatchDistanceError" x:Key="ErrorLatchDistance">Latch distance must be less than Probing distance.</system:String>
+    <system:String x:Uid="str_probingIllegalPosition" x:Key="IllegalPosition">Illegal probe position, try again.</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml
index 825aed6..4807c6f 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml	
@@ -14,6 +14,7 @@
         <system:String x:Uid="str_runMacro" x:Key="RunMacro">Run {0} macro?</system:String>
         <system:String x:Uid="str_jogActive" x:Key="JogActive">Keyboard jogging active</system:String>
         <system:String x:Uid="str_jogDisabled" x:Key="JogDisabled">Keyboard jogging disabled</system:String>
+        <system:String x:Uid="str_cameraPosition" x:Key="CameraPosition">Camera position {0}, X: {1}, Y: {2}</system:String>
         <Controls:EnumValueToBooleanConverter x:Key="EnumToEnabledConverter" />
         <Controls:LogicalNotConverter x:Key="IsNotRunningConverter" />
         <Controls:MultiLineConverter x:Key="ErrorMessageConverter" />
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs
index 9b07d12..1bfed08 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * ProbingView.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-12-25 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -83,6 +83,28 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
                 keyboard.AddHandler(Key.C, ModifierKeys.Alt, ProbeConnectedToggle, this);
 
                 DataContext = model = new ProbingViewModel(DataContext as GrblViewModel, profiles);
+
+                grbl.OnCameraProbe += addCameraPosition;
+            }
+        }
+
+        private void addCameraPosition(Position position)
+        {
+            if (grbl.IsProbing)
+            {
+                if(model.CameraPositions == 0)
+                {
+                    model.PreviewText = string.Empty;
+                    model.PreviewEnable = true;
+                }
+
+                model.Positions.Add(position);
+                var positions = model.CameraPositions = model.Positions.Count;
+
+                if(positions == model.CameraPositions) // model.CameraPositions may have been changed elsewhere!
+                    model.PreviewText += (model.PreviewText == string.Empty ? string.Empty : "\n") + string.Format((string)FindResource("CameraPosition"), model.CameraPositions, position.X.ToInvariantString(), position.Y.ToInvariantString());
+
+                Jog.Focus();
             }
         }
 
@@ -212,7 +234,7 @@ private void showProbeProperties()
 
         public void Activate(bool activate, ViewType chgMode)
         {
-            if (activate)
+            if ((grbl.IsProbing = activate))
             {
                 if (model.CoordinateSystems.Count == 0)
                 {
@@ -258,7 +280,7 @@ public void Activate(bool activate, ViewType chgMode)
 
                 Probing.Command = GrblInfo.ReportProbeResult ? "G38.3" : "G38.2";
 
-                getView(tab.SelectedItem as TabItem)?.Activate();
+                getView(tab.SelectedItem as TabItem)?.Activate(true);
 
                 model.Grbl.PropertyChanged += Grbl_PropertyChanged;
 
@@ -271,6 +293,7 @@ public void Activate(bool activate, ViewType chgMode)
             else
             {
                 model.Grbl.PropertyChanged -= Grbl_PropertyChanged;
+                getView(tab.SelectedItem as TabItem)?.Activate(false);
 
                 if (!model.Grbl.IsGCLock)
                 {
@@ -368,7 +391,7 @@ private void Jog_FocusedChanged(object sender, RoutedEventArgs e)
             var btn = sender as Button;
             if (grbl.Keyboard.IsJogging)
                 grbl.Keyboard.JogCancel();
-            jogEnabled = btn.IsFocused && grbl.Keyboard.CanJog;
+            jogEnabled = btn.IsFocused && grbl.Keyboard.CanJog2;
             btn.Content = (string)FindResource(jogEnabled ? "JogActive" : "JogDisabled");
         }
 
@@ -376,9 +399,10 @@ private void tab_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (Equals(e.OriginalSource, sender))
             {
-                var view = getView(((sender as TabControl).SelectedItem as TabItem));
-                if (view != null)
+                if (e.AddedItems.Count == 1)
                 {
+                    var view = getView(e.AddedItems[0] as TabItem);
+                    model.Positions.Clear();
                     model.ProbingType = view.ProbingType;
                     model.Message = string.Empty;
                     model.PreviewEnable = false;
@@ -386,7 +410,10 @@ private void tab_SelectionChanged(object sender, SelectionChangedEventArgs e)
                     if (GrblInfo.IsGrblHAL)
                         Comms.com.WriteByte(GrblConstants.CMD_STATUS_REPORT_ALL);
 
-                    view.Activate();
+                    if(e.RemovedItems.Count == 1)
+                        getView(e.RemovedItems[0] as TabItem).Activate(false);
+
+                    view.Activate(true);
                 }
                 e.Handled = true;
             }
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs
index be331ba..5ac78a1 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs	
@@ -1,13 +1,13 @@
 /*
  * ProbingViewModel.cs - part of CNC Probing library
  *
- * v0.36 / 2021-11-29 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -358,6 +358,7 @@ public ProbingType ProbingType
         public string SlowProbe { get { return string.Format(Probing.Command + "F{0}", LatchFeedRate.ToInvariantString()); } }
         public string Instructions { get { return _instructions; } set { _instructions = value; OnPropertyChanged(); } }
         public string Position { get { return _position; } set { if (_position != value) { _position = value; OnPropertyChanged(); }  } }
+        public int CameraPositions { get { return _positions.Count;} set { OnPropertyChanged(); } }
 
         public int Passes { get { return _passes; } set { _passes = value; OnPropertyChanged(); } }
         public int CoordinateSystem { get { return _coordinateSystem; } set { _coordinateSystem = value; OnPropertyChanged(); } }
@@ -492,7 +493,14 @@ public bool PreviewEnable
                     _enablePreview = value;
                     OnPropertyChanged();
                     if (!_enablePreview)
+                    {
                         PreviewText = string.Empty;
+                        if(CameraPositions > 0)
+                        {
+                            CameraPositions = 0;
+                            Positions.Clear();
+                        }
+                    }
                 }
             }
         }
diff --git a/CNC Controls Probing/CNC Controls Probing/Program.cs b/CNC Controls Probing/CNC Controls Probing/Program.cs
index 4d325a1..6b13c25 100644
--- a/CNC Controls Probing/CNC Controls Probing/Program.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/Program.cs	
@@ -374,6 +374,7 @@ public bool Execute(bool go)
                 string response;
 
                 step = 0;
+                probing.CameraPositions = 0;
                 probing.Positions.Clear();
                 probing.Machine.Clear();
 
diff --git a/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs b/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs
index 02d5125..9f5478c 100644
--- a/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs	
@@ -34,5 +34,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.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]
diff --git a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml
index 464f46c..3d89688 100644
--- a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml	
@@ -66,9 +66,6 @@
                 <GroupBox x:Uid="grp_workpiece" Header="Workpiece" Visibility="Collapsed">
                     <Controls:NumericField x:Uid="fld_distance" Label="Distance" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" Margin="0,5,85,0" VerticalAlignment="Top"/>
                 </GroupBox>
-                <GroupBox x:Uid="grp_camera" Header="Camera">
-                    <Button x:Uid="btn_addPosition" Content="Add _position" IsEnabled="{Binding Path=Grbl.IsCameraVisible}" Margin="2,0" Width="75" Height="23" Focusable="False" Click="addPosition_Click"/>
-                </GroupBox>
                 <GroupBox x:Uid="grp_RotationCenter" Header="Rotation center" HorizontalAlignment="Left" Margin="5,0" ToolTip="Click to select rotation center relative to job, if not selected X0,Y0 is used.">
                     <StackPanel Orientation="Horizontal">
                         <Controls:OriginControl Value="{Binding Path=Origin, Mode=TwoWay}" IsEnabled="{Binding Path=Grbl.IsFileLoaded}" Margin="5,5,0,0"/>
diff --git a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs
index bed66db..a9eaef5 100644
--- a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * RotationControl.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-11-01 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2021, Io Engineering (Terje Io)
+Copyright (c) 2021-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -59,14 +59,28 @@ public RotationControl()
 
         public ProbingType ProbingType { get { return ProbingType.Rotation; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
             var probing = DataContext as ProbingViewModel;
 
-            if(probing.ProbeEdge == Edge.A || probing.ProbeEdge == Edge.B || probing.ProbeEdge == Edge.C || probing.ProbeEdge == Edge.D)
-                probing.ProbeEdge = Edge.None;
+            if (activate) {
+                if (probing.ProbeEdge == Edge.A || probing.ProbeEdge == Edge.B || probing.ProbeEdge == Edge.C || probing.ProbeEdge == Edge.D)
+                    probing.ProbeEdge = Edge.None;
 
-            probing.Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+                probing.Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+                probing.PropertyChanged += Probing_PropertyChanged;
+            } else
+                probing.PropertyChanged -= Probing_PropertyChanged;
+        }
+
+        private void Probing_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if(e.PropertyName == nameof(ProbingViewModel.CameraPositions))
+            {
+                var probing = DataContext as ProbingViewModel;
+
+                probing.CanApplyTransform = probing.CameraPositions == 2;
+            }
         }
 
         public void Start(bool preview = false)
@@ -167,7 +181,6 @@ private void addpos ()
             probing.Positions.Add(new Position(probing.Grbl.MachinePosition));
         }
 
-
         private void OnCompleted()
         {
             bool ok;
@@ -223,22 +236,6 @@ private void use00_Click(object sender, RoutedEventArgs e)
             (DataContext as ProbingViewModel).Origin = OriginControl.Origin.None;
         }
 
-        private void addPosition_Click(object sender, RoutedEventArgs e)
-        {
-            var probing = DataContext as ProbingViewModel;
-
-            probing.Positions.Add(new Position(probing.Grbl.MachinePosition));
-
-            if(!(probing.CanApplyTransform = probing.Positions.Count == 2))
-            {
-                if (probing.Positions.Count > 2)
-                {
-                    probing.Positions.RemoveAt(0);
-                    probing.Positions.RemoveAt(0);
-                }
-            }
-        }
-
         private void apply_Click(object sender, RoutedEventArgs e)
         {
             using (new UIUtils.WaitCursor())
diff --git a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs
index 257981d..69d0206 100644
--- a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * ToolLengthControl.cs - part of CNC Probing library
  *
- * v0.36 / 2021-12-01 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -57,12 +57,15 @@ public ToolLengthControl()
         }
         public ProbingType ProbingType { get { return ProbingType.ToolLength; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
-            var probing = DataContext as ProbingViewModel;
-            probing.Instructions = string.Empty;
-            if (!probing.Grbl.IsParserStateLive)
-                probing.Grbl.ExecuteCommand(probing.Grbl.IsGrblHAL ? GrblConstants.CMD_GETPARSERSTATE : GrblConstants.CMD_GETNGCPARAMETERS);
+            if (activate)
+            {
+                var probing = DataContext as ProbingViewModel;
+                probing.Instructions = string.Empty;
+                if (!probing.Grbl.IsParserStateLive)
+                    probing.Grbl.ExecuteCommand(probing.Grbl.IsGrblHAL ? GrblConstants.CMD_GETPARSERSTATE : GrblConstants.CMD_GETNGCPARAMETERS);
+            }
         }
 
         public void Start(bool preview = false)
diff --git a/CNC Controls/CNC Controls/AppConfig.cs b/CNC Controls/CNC Controls/AppConfig.cs
index 5c1bb6a..4a04eb7 100644
--- a/CNC Controls/CNC Controls/AppConfig.cs	
+++ b/CNC Controls/CNC Controls/AppConfig.cs	
@@ -1,7 +1,7 @@
 /*
  * AppConfig.cs - part of CNC Controls library
  *
- * v0.36 / 2022-01-23 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-02 / Io Engineering (Terje Io)
  *
  */
 
@@ -44,10 +44,10 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 using System.Collections.ObjectModel;
 using System.Windows.Media;
 using System.Threading;
+using System.Windows.Media.Media3D;
 using CNC.Core;
 using CNC.GCode;
 using static CNC.GCode.GCodeParser;
-using System.Windows.Media.Media3D;
 
 namespace CNC.Controls
 {
@@ -104,19 +104,24 @@ public class ProbeConfig : ViewModelBase
     [Serializable]
     public class CameraConfig : ViewModelBase
     {
+        private string _camera = string.Empty;
         private double _xoffset = 0d, _yoffset = 0d;
         private int _guideScale = 10;
+        private bool _moveToSpindle = false, _confirmMove = false;
         private CameraMoveMode _moveMode = CameraMoveMode.BothAxes;
 
         [XmlIgnore]
-        internal bool IsDirty { get; private set; } = false;
+        internal bool IsDirty { get; set; } = false;
 
         [XmlIgnore]
         public CameraMoveMode[] MoveModes { get { return (CameraMoveMode[])Enum.GetValues(typeof(CameraMoveMode)); } }
 
+        public string SelectedCamera { get { return _camera; } set { _camera = value; IsDirty = true; OnPropertyChanged(); } }
         public double XOffset { get { return _xoffset; } set { _xoffset = value; OnPropertyChanged(); } }
         public double YOffset { get { return _yoffset; } set { _yoffset = value; OnPropertyChanged(); } }
         public int GuideScale { get { return _guideScale; } set { _guideScale = value; IsDirty = true; OnPropertyChanged(); } }
+        public bool InitialMoveToSpindle { get { return _moveToSpindle; } set { _moveToSpindle = value; IsDirty = true; OnPropertyChanged(); } }
+        public bool ConfirmMove { get { return _confirmMove; } set { _confirmMove = value; IsDirty = true; OnPropertyChanged(); } }
         public CameraMoveMode MoveMode { get { return _moveMode; } set { _moveMode = value; OnPropertyChanged(); } }
     }
 
@@ -315,6 +320,7 @@ public bool Save(string filename)
 
         public bool Save()
         {
+            Camera.IsDirty = false;
             return configfile != null && Save(configfile);
         }
 
diff --git a/CNC Controls/CNC Controls/AppConfigView.xaml b/CNC Controls/CNC Controls/AppConfigView.xaml
index d76be37..b07b4a4 100644
--- a/CNC Controls/CNC Controls/AppConfigView.xaml	
+++ b/CNC Controls/CNC Controls/AppConfigView.xaml	
@@ -11,7 +11,10 @@
         <system:String x:Uid="msg_restart" x:Key="RestartMessage">A restart is required after changing settings!</system:String>
     </UserControl.Resources>
     <DockPanel>
-        <Button x:Uid="btn_saveSettings" x:Name="btnSave" DockPanel.Dock="Bottom" Content="Save settings" Margin="10,0,0,5" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="5,0" Click="btnSave_Click"/>
+        <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+            <Button x:Uid="btn_saveSettings" x:Name="btnSave" Content="Save settings" Margin="5" Padding="5,0" Click="btnSave_Click"/>
+            <Button x:Uid="btn_saveKeyMap" x:Name="btnSaveKeyMap" Content="Save keymappings" Margin="5" Padding="5,0" Click="btnSaveKeyMap_Click"/>
+        </StackPanel>
         <ItemsControl x:Name="xx" DockPanel.Dock="Top">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
diff --git a/CNC Controls/CNC Controls/AppConfigView.xaml.cs b/CNC Controls/CNC Controls/AppConfigView.xaml.cs
index f4f5d37..b312d1f 100644
--- a/CNC Controls/CNC Controls/AppConfigView.xaml.cs	
+++ b/CNC Controls/CNC Controls/AppConfigView.xaml.cs	
@@ -1,12 +1,12 @@
 /*
  * AppConfigView.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.36 / 2021-12-25 / Io Engineering (Terje Io)
+ * v0.37 / 2021-02-27 / Io Engineering (Terje Io)
  *
  */
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -100,7 +100,15 @@ public void Setup(UIViewModel model, AppConfig profile)
 
         private void btnSave_Click(object sender, RoutedEventArgs e)
         {
-            AppConfig.Settings.Save();
+            if(AppConfig.Settings.Save())
+                Grbl.GrblViewModel.Message = LibStrings.FindResource("SettingsSaved");
+        }
+
+        private void btnSaveKeyMap_Click(object sender, RoutedEventArgs e)
+        {
+            string filename = CNC.Core.Resources.Path + string.Format("KeyMap{0}.xml", (int)AppConfig.Settings.Jog.Mode);
+            if(Grbl.GrblViewModel.Keyboard.SaveMappings(filename))
+                Grbl.GrblViewModel.Message = string.Format(LibStrings.FindResource("KeymappingsSaved"), filename);
         }
     }
 }
diff --git a/CNC Controls/CNC Controls/CNC Controls.csproj b/CNC Controls/CNC Controls/CNC Controls.csproj
index b611145..8c3cd0e 100644
--- a/CNC Controls/CNC Controls/CNC Controls.csproj	
+++ b/CNC Controls/CNC Controls/CNC Controls.csproj	
@@ -68,9 +68,15 @@
     <Compile Include="ConsoleWindow.xaml.cs">
       <DependentUpon>ConsoleWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ErrorsAndAlarms.xaml.cs">
+      <DependentUpon>ErrorsAndAlarms.xaml</DependentUpon>
+    </Compile>
     <Compile Include="FileActionControl.xaml.cs">
       <DependentUpon>FileActionControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="GCodeWrapDialog.xaml.cs">
+      <DependentUpon>GCodeWrapDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="GCodeCompress.cs" />
     <Compile Include="GCodeListControl.xaml.cs">
       <DependentUpon>GCodeListControl.xaml</DependentUpon>
@@ -79,6 +85,7 @@
     <Compile Include="GCodeRotateDialog.xaml.cs">
       <DependentUpon>GCodeRotateDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="GCodeWrap.cs" />
     <Compile Include="GotoBaseControl.xaml.cs">
       <DependentUpon>GotoBaseControl.xaml</DependentUpon>
     </Compile>
@@ -88,6 +95,9 @@
     <Compile Include="GotoFlyoutControl.xaml.cs">
       <DependentUpon>GotoFlyoutControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="GrblAlarmList.xaml.cs">
+      <DependentUpon>GrblAlarmList.xaml</DependentUpon>
+    </Compile>
     <Compile Include="GrblConfigView.xaml.cs">
       <DependentUpon>GrblConfigView.xaml</DependentUpon>
     </Compile>
@@ -113,6 +123,9 @@
     <Compile Include="FeedControl.xaml.cs">
       <DependentUpon>FeedControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="GrblErrorList.xaml.cs">
+      <DependentUpon>GrblErrorList.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ICamera.cs" />
     <Compile Include="ICNCView.cs" />
     <Compile Include="IGCodeConverter.cs" />
@@ -226,6 +239,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ErrorsAndAlarms.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="GCodeWrapDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="GotoBaseControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -234,6 +255,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="GrblAlarmList.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="GrblErrorList.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="JogBaseControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/CNC Controls/CNC Controls/DROControl.xaml.cs b/CNC Controls/CNC Controls/DROControl.xaml.cs
index ebd4420..da8acec 100644
--- a/CNC Controls/CNC Controls/DROControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/DROControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * DROControl.xaml.cs - part of CNC Controls library
  *
- * v0.36 / 2021-12-25 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2020, Io Engineering (Terje Io)
+Copyright (c) 2018-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -47,7 +47,6 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 
 namespace CNC.Controls
 {
-
     public partial class DROControl : UserControl
     {
         private double orgpos;
@@ -90,16 +89,16 @@ private void DRO_Loaded(object sender, RoutedEventArgs e)
 
                 keyboardMappingsOk = true;
 
-                keyboard.AddHandler(Key.X, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
-                keyboard.AddHandler(Key.Y, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
-                keyboard.AddHandler(Key.Z, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
+                keyboard.AddHandler(Key.X, ModifierKeys.Control | ModifierKeys.Shift, ZeroX);
+                keyboard.AddHandler(Key.Y, ModifierKeys.Control | ModifierKeys.Shift, ZeroY);
+                keyboard.AddHandler(Key.Z, ModifierKeys.Control | ModifierKeys.Shift, ZeroZ);
                 if (GrblInfo.AxisFlags.HasFlag(AxisFlags.A))
-                    keyboard.AddHandler(Key.A, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
+                    keyboard.AddHandler(Key.A, ModifierKeys.Control | ModifierKeys.Shift, ZeroA);
                 if (GrblInfo.AxisFlags.HasFlag(AxisFlags.B))
-                    keyboard.AddHandler(Key.B, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
+                    keyboard.AddHandler(Key.B, ModifierKeys.Control | ModifierKeys.Shift, ZeroB);
                 if (GrblInfo.AxisFlags.HasFlag(AxisFlags.C))
-                    keyboard.AddHandler(Key.C, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
-                keyboard.AddHandler(Key.D0, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
+                    keyboard.AddHandler(Key.C, ModifierKeys.Control | ModifierKeys.Shift, ZeroC);
+                keyboard.AddHandler(Key.D0, ModifierKeys.Control | ModifierKeys.Shift, ZeroAxes);
             }
         }
 
@@ -163,9 +162,47 @@ void btnZeroAll_Click(object sender, EventArgs e)
             AxisPositionChanged("ALL", 0.0d);
         }
 
-        private bool zeroAxes(Key key)
+        private bool ZeroAxes(Key key)
+        {
+            AxisPositionChanged("ALL", 0d);
+
+            return true;
+        }
+
+        private bool ZeroX(Key key)
         {
-            AxisPositionChanged(key == Key.D0 ? "ALL" : key.ToString(), 0d);
+            AxisPositionChanged("X", 0d);
+
+            return true;
+        }
+
+        private bool ZeroY(Key key)
+        {
+            AxisPositionChanged("Y", 0d);
+
+            return true;
+        }
+        private bool ZeroZ(Key key)
+        {
+            AxisPositionChanged("Z", 0d);
+
+            return true;
+        }
+        private bool ZeroA(Key key)
+        {
+            AxisPositionChanged("A", 0d);
+
+            return true;
+        }
+        private bool ZeroB(Key key)
+        {
+            AxisPositionChanged("B", 0d);
+
+            return true;
+        }
+        private bool ZeroC(Key key)
+        {
+            AxisPositionChanged("C", 0d);
 
             return true;
         }
@@ -184,5 +221,3 @@ void AxisPositionChanged(string axis, double position)
         }
     }
 }
-
-
diff --git a/CNC Controls/CNC Controls/GCode.cs b/CNC Controls/CNC Controls/GCode.cs
index eb2e958..a3d380e 100644
--- a/CNC Controls/CNC Controls/GCode.cs	
+++ b/CNC Controls/CNC Controls/GCode.cs	
@@ -1,13 +1,13 @@
 /*
  * GCode.cs - part of CNC Controls library for Grbl
  *
- * v0.36 / 2021-12-14 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io)
+Copyright (c) 2018-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -151,6 +151,11 @@ public bool AddTransformer(Type converter, string name, ObservableCollection<Men
             return ok;
         }
 
+        public bool HasTransformer(Type converter)
+        {
+            return Transformers.Where(x => x.Type == converter).FirstOrDefault().Type == converter;
+        }
+
         private void TransformMenu_Click(object sender, RoutedEventArgs e)
         {
             Transform((int)(sender as MenuItem).Tag);
@@ -279,7 +284,6 @@ public void Save()
                         {
                             foreach (DataRow line in Program.Data.Rows)
                                 stream.WriteLine((string)line["Data"]);
-
                         }
                     }
                 }
diff --git a/CNC Controls/CNC Controls/ICamera.cs b/CNC Controls/CNC Controls/ICamera.cs
index ab9a09a..34ac89a 100644
--- a/CNC Controls/CNC Controls/ICamera.cs	
+++ b/CNC Controls/CNC Controls/ICamera.cs	
@@ -1,12 +1,12 @@
 /*
  * ICamera.cs - part of CNC Controls library for Grbl
  *
- * v0.33 / 2021-05-04 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -50,6 +50,7 @@ public interface ICamera
 
         bool HasCamera { get; }
         bool IsVisible { get; }
+        bool IsMoveEnabled { get; set; }
 
         void Open();
         void Close();
diff --git a/CNC Controls/CNC Controls/JobControl.xaml.cs b/CNC Controls/CNC Controls/JobControl.xaml.cs
index 1f2602a..dfc97e4 100644
--- a/CNC Controls/CNC Controls/JobControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/JobControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * JobControl.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.36 / 2021-12-27 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io)
+Copyright (c) 2018-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -169,10 +169,10 @@ private void JobControl_Loaded(object sender, RoutedEventArgs e)
                     keyboard.AddHandler(Key.F11, ModifierKeys.None, FnKeyHandler);
                     keyboard.AddHandler(Key.F12, ModifierKeys.None, FnKeyHandler);
 
-                    keyboard.AddHandler(Key.OemMinus, ModifierKeys.Control, feedRateDown);
-                    keyboard.AddHandler(Key.OemPlus, ModifierKeys.Control, feedRateUp);
-                    keyboard.AddHandler(Key.OemMinus, ModifierKeys.Shift | ModifierKeys.Control, feedRateDownFine);
-                    keyboard.AddHandler(Key.OemPlus, ModifierKeys.Shift | ModifierKeys.Control, feedRateUpFine);
+                    keyboard.AddHandler(Key.OemMinus, ModifierKeys.Control, FeedRateDown);
+                    keyboard.AddHandler(Key.OemPlus, ModifierKeys.Control, FeedRateUp);
+                    keyboard.AddHandler(Key.OemMinus, ModifierKeys.Shift | ModifierKeys.Control, FeedRateDownFine);
+                    keyboard.AddHandler(Key.OemPlus, ModifierKeys.Shift | ModifierKeys.Control, FeedRateUpFine);
                 }
 
                 GCodeParser.IgnoreM6 = AppConfig.Settings.Base.IgnoreM6;
@@ -316,25 +316,25 @@ public void EnablePolling(bool enable)
 
         #region Keyboard shortcut handlers
 
-        private bool feedRateUpFine(Key key)
+        private bool FeedRateUpFine(Key key)
         {
             Comms.com.WriteByte((byte)GrblConstants.CMD_FEED_OVR_FINE_PLUS);
             return true;
         }
 
-        private bool feedRateDownFine(Key key)
+        private bool FeedRateDownFine(Key key)
         {
             Comms.com.WriteByte((byte)GrblConstants.CMD_FEED_OVR_FINE_MINUS);
             return true;
         }
 
-        private bool feedRateUp(Key key)
+        private bool FeedRateUp(Key key)
         {
             Comms.com.WriteByte((byte)GrblConstants.CMD_FEED_OVR_COARSE_PLUS);
             return true;
         }
 
-        private bool feedRateDown(Key key)
+        private bool FeedRateDown(Key key)
         {
             Comms.com.WriteByte((byte)GrblConstants.CMD_FEED_OVR_COARSE_MINUS);
             return true;
@@ -486,7 +486,29 @@ public void CycleStart()
 
         public void SendRTCommand(string command)
         {
-            Comms.com.WriteByte((byte)command[0]);
+            var b = Convert.ToInt32(command[0]);
+
+            if(b > 255) switch(b)
+            { 
+                case 8222:
+                    b = GrblConstants.CMD_SAFETY_DOOR;
+                    break;
+
+                case 8225:
+                    b = GrblConstants.CMD_STATUS_REPORT_ALL;
+                    break;
+
+                case 710:
+                    b = GrblConstants.CMD_OPTIONAL_STOP_TOGGLE;
+                    break;
+
+                case 8240:
+                    b = GrblConstants.CMD_SINGLE_BLOCK_TOGGLE;
+                    break;
+            }
+
+            if(b <= 255)
+                Comms.com.WriteByte((byte)b);
         }
 
         private void SendCommand(string command)
diff --git a/CNC Controls/CNC Controls/JogBaseControl.xaml.cs b/CNC Controls/CNC Controls/JogBaseControl.xaml.cs
index 200799b..0565860 100644
--- a/CNC Controls/CNC Controls/JogBaseControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/JogBaseControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * JogBaseControl.xaml.cs - part of CNC Controls library
  *
- * v0.36 / 2022-01-10 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
@@ -59,7 +59,6 @@ public partial class JogBaseControl : UserControl
         private KeypressHandler keyboard;
         private static bool keyboardMappingsOk = false;
 
-
         private const Key xplus = Key.J, xminus = Key.H, yplus = Key.K, yminus = Key.L, zplus = Key.I, zminus = Key.M, aplus = Key.U, aminus = Key.N;
 
         public JogBaseControl()
@@ -118,203 +117,256 @@ private void JogControl_Loaded(object sender, RoutedEventArgs e)
 
                     if (AppConfig.Settings.Jog.Mode == JogConfig.JogMode.UI)
                     {
-                        keyboard.AddHandler(Key.PageUp, ModifierKeys.None, cursorKeyJog, false);
-                        keyboard.AddHandler(Key.PageDown, ModifierKeys.None, cursorKeyJog, false);
-                        keyboard.AddHandler(Key.Left, ModifierKeys.None, cursorKeyJog, false);
-                        keyboard.AddHandler(Key.Up, ModifierKeys.None, cursorKeyJog, false);
-                        keyboard.AddHandler(Key.Right, ModifierKeys.None, cursorKeyJog, false);
-                        keyboard.AddHandler(Key.Down, ModifierKeys.None, cursorKeyJog, false);
+                        keyboard.AddHandler(Key.PageUp, ModifierKeys.None, CursorJogZplus, false);
+                        keyboard.AddHandler(Key.PageDown, ModifierKeys.None, CursorJogZminus, false);
+                        keyboard.AddHandler(Key.Left, ModifierKeys.None, CursorJogXminus, false);
+                        keyboard.AddHandler(Key.Up, ModifierKeys.None, CursorJogYplus, false);
+                        keyboard.AddHandler(Key.Right, ModifierKeys.None, CursorJogXplus, false);
+                        keyboard.AddHandler(Key.Down, ModifierKeys.None, CursorJogYminus, false);
                     }
 
-                    keyboard.AddHandler(xplus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                    keyboard.AddHandler(xminus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                    keyboard.AddHandler(yplus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                    keyboard.AddHandler(yminus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                    keyboard.AddHandler(zplus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                    keyboard.AddHandler(zminus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
+                    keyboard.AddHandler(xplus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogXplus, false);
+                    keyboard.AddHandler(xminus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogXminus, false);
+                    keyboard.AddHandler(yplus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogYplus, false);
+                    keyboard.AddHandler(yminus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogYminus, false);
+                    keyboard.AddHandler(zplus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogZplus, false);
+                    keyboard.AddHandler(zminus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogZminus, false);
                     if(GrblInfo.AxisFlags.HasFlag(AxisFlags.A)) {
-                        keyboard.AddHandler(aplus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                        keyboard.AddHandler(aminus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
+                        keyboard.AddHandler(aplus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogAplus, false);
+                        keyboard.AddHandler(aminus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogAminus, false);
                     }
 
                     if (AppConfig.Settings.Jog.Mode != JogConfig.JogMode.Keypad)
                     {
-                        keyboard.AddHandler(Key.End, ModifierKeys.None, endJog, false);
-
-                        keyboard.AddHandler(Key.NumPad0, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad1, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad2, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad3, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad4, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad5, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad6, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad7, ModifierKeys.Control, adjustJog);
-
-                        keyboard.AddHandler(Key.NumPad2, ModifierKeys.None, adjustJog2);
-                        keyboard.AddHandler(Key.NumPad4, ModifierKeys.None, adjustJog2);
-                        keyboard.AddHandler(Key.NumPad6, ModifierKeys.None, adjustJog2);
-                        keyboard.AddHandler(Key.NumPad8, ModifierKeys.None, adjustJog2);
+                        keyboard.AddHandler(Key.End, ModifierKeys.None, EndJog, false);
+
+                        keyboard.AddHandler(Key.NumPad0, ModifierKeys.Control, JogStep0);
+                        keyboard.AddHandler(Key.NumPad1, ModifierKeys.Control, JogStep1);
+                        keyboard.AddHandler(Key.NumPad2, ModifierKeys.Control, JogStep2);
+                        keyboard.AddHandler(Key.NumPad3, ModifierKeys.Control, JogStep3);
+                        keyboard.AddHandler(Key.NumPad4, ModifierKeys.Control, JogFeed0);
+                        keyboard.AddHandler(Key.NumPad5, ModifierKeys.Control, JogFeed1);
+                        keyboard.AddHandler(Key.NumPad6, ModifierKeys.Control, JogFeed2);
+                        keyboard.AddHandler(Key.NumPad7, ModifierKeys.Control, JogFeed3);
+
+                        keyboard.AddHandler(Key.NumPad2, ModifierKeys.None, FeedDec);
+                        keyboard.AddHandler(Key.NumPad4, ModifierKeys.None, StepDec);
+                        keyboard.AddHandler(Key.NumPad6, ModifierKeys.None, StepInc);
+                        keyboard.AddHandler(Key.NumPad8, ModifierKeys.None, FeedInc);
                     }
                 }
             }
         }
 
-        private void distance_Click(object sender, RoutedEventArgs e)
+        private bool KeyJogXplus(Key key)
         {
-            distance = int.Parse((string)(sender as RadioButton).Tag);
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "Z+" : "X+");
+
+            return true;
         }
 
-        private void feedrate_Click(object sender, RoutedEventArgs e)
+        private bool KeyJogXminus(Key key)
         {
-            feedrate = int.Parse((string)(sender as RadioButton).Tag);
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "Z-" : "X-");
+
+            return true;
         }
 
-        private bool endJog(Key key)
+        private bool KeyJogYplus(Key key)
         {
-            if(!keyboard.IsRepeating && keyboard.IsJogging)
-                JogCommand("stop");
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "X-" : "Y+");
 
-            return keyboard.IsJogging;
+            return true;
         }
 
-        private bool adjustJog(Key key)
+        private bool KeyJogYminus(Key key)
         {
-            switch (key)
-            {
-                case Key.NumPad0:
-                    JogData.StepSize = JogViewModel.JogStep.Step0;
-                    return true;
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "X+" : "Y-");
 
-                case Key.NumPad1:
-                    JogData.StepSize = JogViewModel.JogStep.Step1;
-                    return true;
+            return true;
+        }
 
-                case Key.NumPad2:
-                    JogData.StepSize = JogViewModel.JogStep.Step2;
-                    return true;
+        private bool KeyJogZplus(Key key)
+        {
+            if (keyboard.CanJog2 && !keyboard.IsRepeating && !GrblInfo.LatheModeEnabled)
+                JogCommand("Z+");
 
-                case Key.NumPad3:
-                    JogData.StepSize = JogViewModel.JogStep.Step3;
-                    return true;
+            return true;
+        }
 
-                case Key.NumPad4:
-                    JogData.Feed = JogViewModel.JogFeed.Feed0;
-                    return true;
+        private bool KeyJogZminus(Key key)
+        {
+            if (keyboard.CanJog2 && !keyboard.IsRepeating && !GrblInfo.LatheModeEnabled)
+                JogCommand("Z-");
 
-                case Key.NumPad5:
-                    JogData.Feed = JogViewModel.JogFeed.Feed1;
-                    return true;
+            return true;
+        }
 
-                case Key.NumPad6:
-                    JogData.Feed = JogViewModel.JogFeed.Feed2;
-                    return true;
+        private bool KeyJogAplus(Key key)
+        {
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand("A+");
 
-                case Key.NumPad7:
-                    JogData.Feed = JogViewModel.JogFeed.Feed3;
-                    return true;
-            }
+            return true;
+        }
+
+        private bool KeyJogAminus(Key key)
+        {
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand("A-");
 
             return true;
         }
 
-        private bool adjustJog2(Key key)
+        private bool CursorJogXplus(Key key)
         {
-            switch (key)
-            {
-                case Key.NumPad2:
-                    JogData.FeedDec();
-                    return true;
+            if (keyboard.CanJog && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "Z+" : "X+");
+
+            return true;
+        }
 
-                case Key.NumPad4:
-                    JogData.StepDec();
-                    return true;
+        private bool CursorJogXminus(Key key)
+        {
+            if (keyboard.CanJog && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "Z-" : "X-");
 
-                case Key.NumPad6:
-                    JogData.StepInc();
-                    return true;
+            return true;
+        }
 
-                case Key.NumPad8:
-                    JogData.FeedInc();
-                    return true;
-            }
+        private bool CursorJogYplus(Key key)
+        {
+            if (keyboard.CanJog && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "X-" : "Y+");
 
             return true;
         }
 
-        private bool normalKeyJog(Key key)
+        private bool CursorJogYminus(Key key)
         {
-            if (keyboard.CanJog2 && !keyboard.IsRepeating) switch (key)
-            {
-                case zplus:
-                    if (!GrblInfo.LatheModeEnabled)
-                        JogCommand("Z+");
-                    break;
+            if (keyboard.CanJog && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "X+" : "Y-");
 
-                case zminus:
-                    if (!GrblInfo.LatheModeEnabled)
-                        JogCommand("Z-");
-                    break;
+            return true;
+        }
 
-                case xminus:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "Z-" : "X-");
-                    break;
+        private bool CursorJogZplus(Key key)
+        {
+            if (keyboard.CanJog && !keyboard.IsRepeating && !GrblInfo.LatheModeEnabled)
+                JogCommand("Z+");
 
-                case yplus:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "X-" : "Y+");
-                    break;
+            return true;
+        }
 
-                case xplus:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "Z+" : "X+");
-                    break;
+        private bool CursorJogZminus(Key key)
+        {
+            if (keyboard.CanJog && !keyboard.IsRepeating && !GrblInfo.LatheModeEnabled)
+                JogCommand("Z-");
 
-                case yminus:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "X+" : "Y-");
-                    break;
+            return true;
+        }
 
-                case aplus:
-                    JogCommand("A+");
-                    break;
+        private void distance_Click(object sender, RoutedEventArgs e)
+        {
+            distance = int.Parse((string)(sender as RadioButton).Tag);
+        }
 
-                case aminus:
-                    JogCommand("A-");
-                    break;
-            }
+        private void feedrate_Click(object sender, RoutedEventArgs e)
+        {
+            feedrate = int.Parse((string)(sender as RadioButton).Tag);
+        }
+
+        private bool EndJog(Key key)
+        {
+            if(!keyboard.IsRepeating && keyboard.IsJogging)
+                JogCommand("stop");
+
+            return keyboard.IsJogging;
+        }
+
+        private bool JogStep0(Key key)
+        {
+            JogData.StepSize = JogViewModel.JogStep.Step0;
 
             return true;
         }
 
-        private bool cursorKeyJog(Key key)
+        private bool JogStep1(Key key)
         {
-            if(keyboard.CanJog && !keyboard.IsRepeating) switch (key)
-            {
-                case Key.PageUp:
-                    if (!GrblInfo.LatheModeEnabled)
-                        JogCommand("Z+");
-                    break;
+            JogData.StepSize = JogViewModel.JogStep.Step1;
 
-                case Key.PageDown:
-                    if (!GrblInfo.LatheModeEnabled)
-                        JogCommand("Z-");
-                    break;
+            return true;
+        }
 
-                case Key.Left:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "Z-" : "X-");
-                    break;
+        private bool JogStep2(Key key)
+        {
+            JogData.StepSize = JogViewModel.JogStep.Step2;
 
-                case Key.Up:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "X-" : "Y+");
-                    break;
+            return true;
+        }
 
-                case Key.Right:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "Z+" : "X+");
-                    break;
+        private bool JogStep3(Key key)
+        {
+            JogData.StepSize = JogViewModel.JogStep.Step3;
 
-                case Key.Down:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "X+" : "Y-");
-                    break;
-            }
+            return true;
+        }
+
+        private bool JogFeed0(Key key)
+        {
+            JogData.Feed = JogViewModel.JogFeed.Feed0;
+
+            return true;
+        }
 
-            return keyboard.CanJog;
+        private bool JogFeed1(Key key)
+        {
+            JogData.Feed = JogViewModel.JogFeed.Feed1;
+
+            return true;
+        }
+        private bool JogFeed2(Key key)
+        {
+            JogData.Feed = JogViewModel.JogFeed.Feed2;
+
+            return true;
+        }
+        private bool JogFeed3(Key key)
+        {
+            JogData.Feed = JogViewModel.JogFeed.Feed3;
+
+            return true;
+        }
+
+        private bool FeedDec(Key key)
+        {
+            JogData.FeedDec();
+
+            return true;
+        }
+        private bool FeedInc(Key key)
+        {
+            JogData.FeedInc();
+
+            return true;
+        }
+
+        private bool StepDec(Key key)
+        {
+            JogData.StepDec();
+
+            return true;
+        }
+
+        private bool StepInc(Key key)
+        {
+            JogData.StepInc();
+
+            return true;
         }
 
         private void JogCommand(string cmd)
diff --git a/CNC Controls/CNC Controls/LibStrings.xaml b/CNC Controls/CNC Controls/LibStrings.xaml
index 23c66ee..6eb3bd3 100644
--- a/CNC Controls/CNC Controls/LibStrings.xaml	
+++ b/CNC Controls/CNC Controls/LibStrings.xaml	
@@ -36,4 +36,6 @@
     <system:String x:Uid="str_grblStateAlarm" x:Key="StateAlarm">ALARM</system:String>
     <system:String x:Uid="str_grblStateDoor" x:Key="StateDoor">DOOR</system:String>
     <system:String x:Uid="str_grblStateSleep" x:Key="StateSleep">SLEEP</system:String>
+    <system:String x:Uid="str_settingsSaved" x:Key="SettingsSaved">Settings saved.</system:String>
+    <system:String x:Uid="str_keymappingsSaved" x:Key="KeymappingsSaved">Keymappings saved to {0}</system:String>
 </ResourceDictionary>
diff --git a/CNC Controls/CNC Controls/OutlineBaseControl.xaml b/CNC Controls/CNC Controls/OutlineBaseControl.xaml
index 564100e..2d65a4f 100644
--- a/CNC Controls/CNC Controls/OutlineBaseControl.xaml	
+++ b/CNC Controls/CNC Controls/OutlineBaseControl.xaml	
@@ -6,23 +6,23 @@
              xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:CNC.Controls"
              mc:Ignorable="d" Loaded="OutlineControl_Loaded"
-             d:DesignHeight="130" d:DesignWidth="250">
+             d:DesignHeight="100" d:DesignWidth="250">
     <UserControl.Resources>
         <ResourceDictionary>
             <local:LogicalNotConverter x:Key="LogicalNotConverter" />
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid Height="130" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource LogicalNotConverter}}">
+    <Grid Height="100" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource LogicalNotConverter}}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="180"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-        <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="5,15,4,0" Width="Auto" VerticalAlignment="Top" Grid.ColumnSpan="2">
+        <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="5,0,4,0" Width="Auto" VerticalAlignment="Top" Grid.ColumnSpan="2">
             <Run x:Uid="txt_line1" Text="Execute moves to outline X and Y program limits."/>
             <LineBreak/>
             <Run x:Uid="txt_line2" Text="Ensure tool tip is clear of any obstructions!" Foreground="Red" FontWeight="Bold"/>
         </TextBlock>
-        <local:NumericField x:Uid="lbl_feedrate" Label="Feed rate:" Value="{Binding Path=FeedRate, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}}" Unit="{Binding Path=FeedrateUnit, Mode=OneWay}" Format="###0" HorizontalAlignment="Left" Margin="5,95,0,0" VerticalAlignment="Top"/>
-        <Button x:Uid="btn_go" Content="Go" IsEnabled="{Binding Path=IsFileLoaded}" Grid.Column="1" Width="50" Height="25" HorizontalAlignment="Right" Margin="0,95,8,0" VerticalAlignment="Top" Click="button_Go" />
+        <local:NumericField x:Uid="lbl_feedrate" Label="Feed rate:" Value="{Binding Path=FeedRate, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}}" Unit="{Binding Path=FeedrateUnit, Mode=OneWay}" Format="###0" HorizontalAlignment="Left" Margin="5,70,0,0" VerticalAlignment="Top"/>
+        <Button x:Uid="btn_go" Content="Go" IsEnabled="{Binding Path=IsFileLoaded}" Grid.Column="1" Width="50" Height="25" HorizontalAlignment="Right" Margin="0,70,8,0" VerticalAlignment="Top" Click="button_Go" />
     </Grid>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/OutlineControl.xaml b/CNC Controls/CNC Controls/OutlineControl.xaml
index fc8968b..f946a3a 100644
--- a/CNC Controls/CNC Controls/OutlineControl.xaml	
+++ b/CNC Controls/CNC Controls/OutlineControl.xaml	
@@ -5,8 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:CNC.Controls"
              mc:Ignorable="d" 
-             d:DesignHeight="150" d:DesignWidth="250">
-    <GroupBox x:Uid="grp_outline" x:Name="grpOutline" Header="Outline" HorizontalAlignment="Left" VerticalAlignment="Top" Width="250" Height="150">
+             d:DesignHeight="125" d:DesignWidth="250">
+    <GroupBox x:Uid="grp_outline" x:Name="grpOutline" Header="Outline" HorizontalAlignment="Left" VerticalAlignment="Top" Width="250" Height="125">
         <local:OutlineBaseControl/>
     </GroupBox>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/OutlineFlyout.xaml b/CNC Controls/CNC Controls/OutlineFlyout.xaml
index 2445515..cc824b2 100644
--- a/CNC Controls/CNC Controls/OutlineFlyout.xaml	
+++ b/CNC Controls/CNC Controls/OutlineFlyout.xaml	
@@ -6,7 +6,7 @@
              xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:CNC.Controls"
              mc:Ignorable="d" 
-             d:DesignHeight="130" d:DesignWidth="300" MaxWidth="300"
+             d:DesignHeight="120" d:DesignWidth="300" MaxWidth="300"
              Loaded="OutlineFlyout_Loaded">
     <UserControl.Resources>
         <system:String x:Uid="str_outlineFlyout" x:Key="MenuLabel">_Outline</system:String>
@@ -24,8 +24,8 @@
         </Style>
     </UserControl.Resources>
     <Border BorderBrush="DarkGray" BorderThickness="1" CornerRadius="3" Background="#FFE5E5EA">
-        <Grid Height="130">
-            <local:OutlineBaseControl/>
+        <Grid Height="120">
+            <local:OutlineBaseControl Margin="0,15,0,0"/>
             <Button Content="×" Focusable="False" Style="{StaticResource SmallXButtonStyle}" VerticalContentAlignment="Top" HorizontalAlignment="Left" Margin="285,0,0,0" VerticalAlignment="Top" Width="14" Height="18" Click="btn_Close"/>
         </Grid>
     </Border>
diff --git a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs b/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs
index 1c63df4..504cd8c 100644
--- a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs	
+++ b/CNC Controls/CNC Controls/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.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]
diff --git a/CNC Core/CNC Core/GCodeParser.cs b/CNC Core/CNC Core/GCodeParser.cs
index 70125e8..d871208 100644
--- a/CNC Core/CNC Core/GCodeParser.cs	
+++ b/CNC Core/CNC Core/GCodeParser.cs	
@@ -1,13 +1,13 @@
 /*
  * GCodeParser.cs - part of CNC Controls library
  *
- * v0.36 / 2021-11-17 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-22 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -917,7 +917,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             if (modalGroups.HasFlag(ModalGroups.G5))
             {
                 FeedRateMode = (FeedRateMode)(cmdFeedrateMode - 93);
-                Tokens.Add(new GCodeToken(cmdFeedrateMode, gcValues.N));
+                Tokens.Add(new GCFeedRateMode(cmdFeedrateMode, gcValues.N));
             }
 
             //
@@ -1620,6 +1620,7 @@ public static void Save(string filePath, List<GCodeToken> objToSerialize)
                         typeof(GCCannedDrill),
                         typeof(GCPlane),
                         typeof(GCDistanceMode),
+                        typeof(GCFeedRateMode),
                         typeof(GCIJKMode),
                         typeof(GCUnits),
                         typeof(GCLatheMode),
@@ -2841,6 +2842,11 @@ public GCFeedrate(Commands command, uint lnr, double feedrate) : base(command, l
             Feedrate = feedrate;
         }
 
+        public GCFeedrate(uint lnr, double feedrate) : base(Commands.Feedrate, lnr)
+        {
+            Feedrate = feedrate;
+        }
+
         public double Feedrate { get; set; }
 
         public new string ToString()
@@ -2938,9 +2944,29 @@ public GCDistanceMode(Commands command, uint lnr) : base(command, lnr)
         {
         }
 
+        public GCDistanceMode(uint lnr, DistanceMode distanceMode) : base(distanceMode == DistanceMode.Absolute ? Commands.G90 : Commands.G91, lnr)
+        {
+        }
+
         public DistanceMode DistanceMode { get { return Command == Commands.G90 ? DistanceMode.Absolute : DistanceMode.Incremental; } }
     }
 
+    public class GCFeedRateMode : GCodeToken
+    {
+        public GCFeedRateMode()
+        { }
+
+        public GCFeedRateMode(Commands command, uint lnr) : base(command, lnr)
+        {
+        }
+
+        public GCFeedRateMode(uint lnr, FeedRateMode feedRateMode) : base(feedRateMode == FeedRateMode.UnitsPerMin ? Commands.G94 : (feedRateMode == FeedRateMode.InverseTime ? Commands.G93 : Commands.G95), lnr)
+        {
+        }
+
+        public FeedRateMode FeedRateMode { get { return Command == Commands.G94 ? FeedRateMode.UnitsPerMin : (Command == Commands.G93 ? FeedRateMode.InverseTime : FeedRateMode.UnitsPerRev); } }
+    }
+
     public class GCIJKMode : GCodeToken
     {
         public GCIJKMode()
diff --git a/CNC Core/CNC Core/Grbl.cs b/CNC Core/CNC Core/Grbl.cs
index e9d5df4..2b835cc 100644
--- a/CNC Core/CNC Core/Grbl.cs	
+++ b/CNC Core/CNC Core/Grbl.cs	
@@ -1,7 +1,7 @@
 /*
  * Grbl.cs - part of CNC Controls library
  *
- * v0.36 / 2022-01-20 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-10 / Io Engineering (Terje Io)
  *
  */
 
@@ -652,19 +652,31 @@ private void Values_PropertyChanged(object sender, PropertyChangedEventArgs e)
             OnPropertyChanged(e.PropertyName);
         }
 
-        public void Parse(string values)
+        public bool Parse(string values)
         {
-            bool changed = false;
-            double[] position = dbl.ParseList(values); 
-            for (var i = 0; i < position.Length; i++) {
-                if (double.IsNaN(Values[i]) ? !double.IsNaN(position[i]) : Values[i] != position[i])
+            bool changed = false, ok = false;
+
+            try
+            {
+                double[] position = dbl.ParseList(values);
+
+                for (var i = 0; i < position.Length; i++)
                 {
-                    Values[i] = position[i];
-                    changed = true;
+                    if (double.IsNaN(Values[i]) ? !double.IsNaN(position[i]) : Values[i] != position[i])
+                    {
+                        Values[i] = position[i];
+                        changed = true;
+                    }
                 }
+
+                if (changed)
+                    OnPropertyChanged("Position");
+
+                ok = true;
             }
-            if(changed)
-                OnPropertyChanged("Position");
+            catch { }
+
+            return ok;
         }
 
         public string ToString(AxisFlags axisflags, int precision = 3)
@@ -1304,9 +1316,9 @@ public static string Tool
             return value;
         }
 
-        public static void Process(string data)
+        public static bool Process(string data)
         {
-            if (data.StartsWith("[GC:"))
+            if (data.StartsWith("[GC:")) try
             {
                 state.Clear();
                 string[] s = data.Substring(4).TrimEnd(']').Split(' ');
@@ -1522,7 +1534,10 @@ public static void Process(string data)
                         }
                     }
                 }
+                return true;
             }
+            catch { }
+            return false;
         }
     }
 
@@ -1744,7 +1759,9 @@ private static void process(string data)
 
     public class GrblErrors
     {
-        private static Dictionary<string, string> messages = new Dictionary<string, string>();
+        private static Dictionary<int, string> messages = new Dictionary<int, string>();
+
+        public static Dictionary<int, string> List { get { return messages; } }
 
         public static bool Get()
         {
@@ -1794,14 +1811,17 @@ public static bool Get(GrblViewModel model)
 
                         while (line != null)
                         {
+                            int key;
                             string[] columns = line.Split(',');
 
-                            if (columns.Length == 3)
+                            columns[0].Replace("\"", "");
+
+                            if (columns.Length == 3 && int.TryParse(columns[0], out key))
                             {
-                                if (!noload && messages.TryGetValue(columns[0], out msg))
-                                    messages.Remove(columns[0]);
+                                if (!noload && messages.TryGetValue(key, out msg))
+                                    messages.Remove(key);
 
-                                 messages.Add(columns[0], columns[2]);
+                                messages.Add(key, columns[1] + ": " + columns[2]);
                             }
 
                             line = file.ReadLine();
@@ -1823,10 +1843,16 @@ private static void Process(string data)
             if (data.StartsWith("[ERRORCODE:"))
             {
                 var details = data.Substring(11).TrimEnd(']').Split('|');
-                if(details.Length == 3)
-                    messages.Add(details[0], details[2] == string.Empty ? details[1] : details[2]);
-                else
-                    messages.Add(details[0], details[1]);
+                try
+                {
+                    if (details.Length == 3)
+                        messages.Add(int.Parse(details[0]), details[2] == string.Empty ? details[1] : details[2]);
+                    else
+                        messages.Add(int.Parse(details[0]), details[1]);
+                }
+                catch
+                {
+                }
             }
         }
 
@@ -1835,26 +1861,34 @@ static GrblErrors()
 
         }
 
-        public static string GetMessage(string key)
+        public static string GetMessage(string code)
         {
             string message = null;
 
-            if (messages != null)
-                messages.TryGetValue(key, out message);
+            try
+            {
+                if (messages != null)
+                    messages.TryGetValue(int.Parse(code), out message);
+            }
+            catch
+            {
+            }
 
-            return message == null ? string.Format("error:{0}", key) : message;
+            return message == null ? string.Format("error:{0}", code) : message;
         }
     }
 
     public class GrblAlarms
     {
-        private static Dictionary<string, string> messages = new Dictionary<string, string>();
+        private static Dictionary<int, string> messages = new Dictionary<int, string>();
 
         public static bool Get()
         {
             return Grbl.GrblViewModel != null && Get(Grbl.GrblViewModel);
         }
 
+        public static Dictionary<int, string> List { get { return messages; } }
+
         public static bool Get(GrblViewModel model)
         {
             bool? res = null;
@@ -1898,14 +1932,17 @@ public static bool Get(GrblViewModel model)
 
                         while (line != null)
                         {
+                            int key;
                             string[] columns = line.Split(',');
 
-                            if (columns.Length == 3)
+                            columns[0].Replace("\"", "");
+
+                            if (columns.Length == 3 && int.TryParse(columns[0], out key))
                             {
-                                if (!noload && messages.TryGetValue(columns[0], out msg))
-                                    messages.Remove(columns[0]);
+                                if (!noload && messages.TryGetValue(key, out msg))
+                                    messages.Remove(key);
 
-                                messages.Add(columns[0], columns[1] + ": " + columns[2]);
+                                messages.Add(key, columns[1] + ": " + columns[2]);
                             }
 
                             line = file.ReadLine();
@@ -1927,21 +1964,33 @@ private static void Process(string data)
             if (data.StartsWith("[ALARMCODE:"))
             {
                 var details = data.Substring(11).TrimEnd(']').Split('|');
-                if(details.Length == 3)
-                    messages.Add(details[0], details[1] == string.Empty ? details[2] : details[1] + ": " + details[2]);
-                else
-                    messages.Add(details[0], details[1]);
+                try
+                {
+                    if (details.Length == 3)
+                        messages.Add(int.Parse(details[0]), details[1] == string.Empty ? details[2] : details[1] + ": " + details[2]);
+                    else
+                        messages.Add(int.Parse(details[0]), details[1]);
+                }
+                catch
+                {
+                }
             }
         }
 
-        public static string GetMessage(string key)
+        public static string GetMessage(string code)
         {
             string message = "";
 
-            if (messages != null)
-                messages.TryGetValue(key, out message);
+            try
+            {
+                if (messages != null)
+                    messages.TryGetValue(int.Parse(code), out message);
+            }
+            catch
+            {
+            }
 
-            return message == "" ? string.Format("Alarm {0}", key) : message;
+            return message == "" ? string.Format("Alarm {0}", code) : message;
         }
     }
 
diff --git a/CNC Core/CNC Core/GrblViewModel.cs b/CNC Core/CNC Core/GrblViewModel.cs
index 51e12b6..4732613 100644
--- a/CNC Core/CNC Core/GrblViewModel.cs	
+++ b/CNC Core/CNC Core/GrblViewModel.cs	
@@ -1,13 +1,13 @@
 /*
  * GrblViewModel.cs - part of CNC Controls library
  *
- * v0.36 / 2021-12-19 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-02 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -54,7 +54,7 @@ public class GrblViewModel : MeasureViewModel
         private string[] _rtState = new string[3];
         private bool has_wco = false, suspend = false, _hasFans = false;
         private bool _flood, _mist, _fan0, _toolChange, _reset, _isMPos, _isJobRunning, _isProbeSuccess, _pgmEnd, _isParserStateLive, _isTloRefSet;
-        private bool _canReset, _isCameraVisible = false, _responseLogVerbose = false;
+        private bool _canReset, _isCameraVisible = false, _responseLogVerbose = false, _isProbing = false;
         private bool? _mpg;
         private int _pwm, _line, _scrollpos, _blocks = 0, _executingBlock = 0, _auxinValue = -2;
         private double _feedrate = 0d;
@@ -79,6 +79,7 @@ public class GrblViewModel : MeasureViewModel
         public Action<string> OnGrblReset;
         public Action<string> OnRealtimeStatusProcessed;
         public Action<string> OnWCOUpdated;
+        public Action<Position> OnCameraProbe;
 
         public delegate void GrblResetHandler();
 
@@ -219,6 +220,11 @@ public void Clear()
 
         public ICommand MDICommand { get; private set; }
 
+        public void CameraProbed(Position position)
+        {
+            OnCameraProbe?.Invoke(position);
+        }
+
         private bool ApplyCommand(string command)
         {
             bool ok;
@@ -274,11 +280,12 @@ public void ExecuteMacro(string macro)
                 {
                     try
                     {
+                        commands[i] = commands[i].Replace("\r", "");
                         parser.ParseBlock(ref commands[i], false);
                     }
                     catch (Exception e)
                     {
-                        if (!(ok = System.Windows.MessageBox.Show(string.Format(LibStrings.FindResource("LoadError").Replace("\\n", "\r"), LineNumber, commands[i]), e.Message, System.Windows.MessageBoxButton.YesNo) == System.Windows.MessageBoxResult.Yes))
+                        if (!(ok = System.Windows.MessageBox.Show(string.Format(LibStrings.FindResource("LoadError").Replace("\\n", "\r"), e.Message, i + 1, commands[i]), "ioSender", System.Windows.MessageBoxButton.YesNo) == System.Windows.MessageBoxResult.Yes))
                             break;
                     }
                 }
@@ -353,6 +360,7 @@ private set
         public bool IsG92Active { get { return GrblParserState.IsActive("G92") != null; } }
         public bool IsToolOffsetActive { get { return IsGrblHAL ? GrblParserState.IsActive("G49") == null : !(double.IsNaN(ToolOffset.Z) || ToolOffset.Z == 0d); } }
         public bool IsJobRunning { get { return _isJobRunning; } set { if (_isJobRunning != value) { _isJobRunning = value; OnPropertyChanged(); } } }
+        public bool IsProbing { get { return _isProbing; } set { _isProbing = value; OnPropertyChanged(); } }
         public bool ProgramEnd { get { return _pgmEnd; } set { _pgmEnd = value; if(_pgmEnd) OnPropertyChanged(); } }
         public int GrblError { get { return _grblState.Error; } set { _grblState.Error = value; OnPropertyChanged(); } }
         public StreamingState StreamingState { get { return _streamingState; } set { if (_streamingState != value) { _streamingState = value; OnPropertyChanged(); } } }
@@ -704,25 +712,23 @@ public void SetGrblError(int error)
             Message = error == 0 ? string.Empty : GrblErrors.GetMessage(error.ToString());
         }
 
-        public bool ParseGCStatus(string data)
+        public void ParseGCStatus(string data)
         {
-            GrblParserState.Process(data);
-            if (GrblParserState.IsLoaded)
+            if (GrblParserState.Process(data) && GrblParserState.IsLoaded)
                 ParserState = data.Substring(4).TrimEnd(']');
-
-            return GrblParserState.IsLoaded;
         }
 
         public bool ParseProbeStatus(string data)
         {
             string[] values = data.TrimEnd(']').Split(':');
-            if (values.Length == 3)
+            if (values.Length == 3 && ProbePosition.Parse(values[1]))
             {
-                ProbePosition.Parse(values[1]);
                 IsProbeSuccess = values[2] == "1";
                 for (int i = 0; i < GrblInfo.NumAxes; i++)
                     GrblWorkParameters.ProbePosition.Values[i] = ProbePosition.Values[i];
             }
+            else
+                IsProbeSuccess = false;
 
             return IsProbeSuccess && values.Length == 3;
         }
@@ -730,9 +736,8 @@ public bool ParseProbeStatus(string data)
         public void ParseHomedStatus(string data)
         {
             string[] values = data.TrimEnd(']').Split(':');
-            if (values.Length == 3)
+            if (values.Length == 3 && HomePosition.Parse(values[1]))
             {
-                HomePosition.Parse(values[1]);
                 AxisHomed.Value = (AxisFlags)int.Parse(values[2]);
                 for (int i = 0; i < GrblInfo.NumAxes; i++)
                 {
diff --git a/CNC Core/CNC Core/KeypressHandler.cs b/CNC Core/CNC Core/KeypressHandler.cs
index aac8442..ac045e4 100644
--- a/CNC Core/CNC Core/KeypressHandler.cs	
+++ b/CNC Core/CNC Core/KeypressHandler.cs	
@@ -1,7 +1,7 @@
 /*
  * KeypressHandler.xaml.cs - part of CNC Controls library
  *
- * v0.36 / 2022-01-10 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
@@ -37,12 +37,14 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 
 */
 
-using CNC.GCode;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Xml.Serialization;
+using CNC.GCode;
 
 namespace CNC.Core
 {
@@ -56,13 +58,21 @@ public enum JogMode
             None // must be last!
         }
 
+        [XmlType(TypeName = "KeyMapping")]
         public class KeypressHandlerFn
         {
-            public Key key;
-            public ModifierKeys modifiers;
-            public bool onUp;
+            [XmlIgnore]
+            internal string method, dummy;
+
+            public Key Key;
+            public ModifierKeys Modifiers;
+            public bool OnUp;
+            [XmlIgnore]
             public UserControl context;
+            [XmlIgnore]
             public Func<Key, bool> Call;
+            public string Context { get { return context == null ? "null" : context.Name; } set { dummy = value; } }
+            public string Method { get { return Call.Method.ReflectedType.Name + "." +  Call.Method.Name; } set { method = value; } }
         }
 
         private int N_AXIS = 3;
@@ -74,11 +84,11 @@ public class KeypressHandlerFn
 
         public void AddHandler(Key key, ModifierKeys modifiers, Func<Key, bool> handler, UserControl context = null, bool onUp = true)
         {
-            handlers.Add(new KeypressHandlerFn(){key = key, modifiers = modifiers, Call = handler, context = context, onUp = onUp });
+            handlers.Add(new KeypressHandlerFn(){Key = key, Modifiers = modifiers, Call = handler, context = context, OnUp = onUp });
         }
         public void AddHandler(Key key, ModifierKeys modifiers, Func<Key, bool> handler, bool onUp)
         {
-            handlers.Add(new KeypressHandlerFn() { key = key, modifiers = modifiers, Call = handler, context = null, onUp = onUp });
+            handlers.Add(new KeypressHandlerFn() { Key = key, Modifiers = modifiers, Call = handler, context = null, OnUp = onUp });
         }
 
         public KeypressHandler(GrblViewModel model)
@@ -98,6 +108,67 @@ public KeypressHandler(GrblViewModel model)
         public bool CanJog { get { return allowJog && (grbl.GrblState.State == GrblStates.Idle || grbl.GrblState.State == GrblStates.Tool || grbl.GrblState.State == GrblStates.Jog); } }
         public bool IsJogging { get { return jogMode != JogMode.None || grbl.GrblState.State == GrblStates.Jog; } }
 
+        public bool SaveMappings (string filename)
+        {
+            if (handlers.Count == 0)
+                return false;
+
+            bool ok = false;
+
+            XmlSerializer xs = new XmlSerializer(typeof(List<KeypressHandlerFn>), new XmlRootAttribute("KeyMappings"));
+
+            try
+            {
+                FileStream fsout = new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.None);
+                using (fsout)
+                {
+                    var keymappings = handlers.Where(x => x.Method != "JobControl.FnKeyHandler").ToList();
+                    xs.Serialize(fsout, keymappings);
+                    ok = true;
+                }
+            }
+            catch
+            {
+            }
+
+            return ok;
+        }
+
+        public bool LoadMappings(string filename)
+        {
+            if (handlers.Count == 0)
+                return false;
+
+            bool ok = false;
+            List<KeypressHandlerFn> keymappings = new List<KeypressHandlerFn>();
+            XmlSerializer xs = new XmlSerializer(typeof(List<KeypressHandlerFn>), new XmlRootAttribute("KeyMappings"));
+
+            try
+            {
+                StreamReader reader = new StreamReader(filename);
+                keymappings = (List<KeypressHandlerFn>)xs.Deserialize(reader);
+                reader.Close();
+
+                foreach(var keymap in keymappings)
+                {
+                    var map = handlers.Where(x => x.Method == keymap.method).FirstOrDefault();
+                    if(map != null)
+                    {
+                        map.Key = keymap.Key;
+                        map.Modifiers = keymap.Modifiers;
+                    }
+                }
+
+                ok = true;
+            }
+            catch
+            {
+                System.Windows.MessageBox.Show("keymap file is corrupt!", "ioSender", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
+            }
+
+            return ok;
+        }
+
         public bool ProcessKeypress(KeyEventArgs e, bool allowJog, UserControl context = null)
         {
             bool isJogging = IsJogging, jogkeyPressed = false;
@@ -350,24 +421,24 @@ public bool ProcessKeypress(KeyEventArgs e, bool allowJog, UserControl context =
 
             if (Keyboard.Modifiers == ModifierKeys.Alt)
             {
-                var handler = handlers.Where(k => k.modifiers == Keyboard.Modifiers && k.key == e.SystemKey && k.onUp == e.IsUp && k.context == context).FirstOrDefault();
+                var handler = handlers.Where(k => k.Modifiers == Keyboard.Modifiers && k.Key == e.SystemKey && k.OnUp == e.IsUp && k.context == context).FirstOrDefault();
                 if (handler != null)
                     return handler.Call(e.SystemKey);
                 else
                 {
-                    handler = handlers.Where(k => k.modifiers == Keyboard.Modifiers && k.key == e.SystemKey && k.onUp == e.IsUp && k.context == null).FirstOrDefault();
+                    handler = handlers.Where(k => k.Modifiers == Keyboard.Modifiers && k.Key == e.SystemKey && k.OnUp == e.IsUp && k.context == null).FirstOrDefault();
                     if (handler != null)
                         return handler.Call(e.SystemKey);
                 }
             }
             else if (Keyboard.Modifiers == ModifierKeys.None || Keyboard.Modifiers == ModifierKeys.Control || Keyboard.Modifiers == (ModifierKeys.Control | ModifierKeys.Shift))
             {
-                var handler = handlers.Where(k => k.modifiers == Keyboard.Modifiers && k.key == e.Key && k.onUp == e.IsUp && k.context == context).FirstOrDefault();
+                var handler = handlers.Where(k => k.Modifiers == Keyboard.Modifiers && k.Key == e.Key && k.OnUp == e.IsUp && k.context == context).FirstOrDefault();
                 if (handler != null)
                     return handler.Call(e.Key);
                 else
                 {
-                    handler = handlers.Where(k => k.modifiers == Keyboard.Modifiers && k.key == e.Key && k.onUp == e.IsUp && k.context == null).FirstOrDefault();
+                    handler = handlers.Where(k => k.Modifiers == Keyboard.Modifiers && k.Key == e.Key && k.OnUp == e.IsUp && k.context == null).FirstOrDefault();
                     if (handler != null)
                         return handler.Call(e.Key);
                 }
diff --git a/CNC Core/CNC Core/Properties/AssemblyInfo.cs b/CNC Core/CNC Core/Properties/AssemblyInfo.cs
index 7afb30b..04b4035 100644
--- a/CNC Core/CNC Core/Properties/AssemblyInfo.cs	
+++ b/CNC Core/CNC Core/Properties/AssemblyInfo.cs	
@@ -35,5 +35,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.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]
diff --git a/Locale/de-DE/csv/CNC.Controls.Camera.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.Camera.resources.de-DE.csv
index e5a527f..4dd8823 100644
--- a/Locale/de-DE/csv/CNC.Controls.Camera.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.Camera.resources.de-DE.csv
@@ -1,6 +1,12 @@
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Aktuelle Position ermitteln
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Offset verschieben
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use as probe position
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_confirmMove:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm move
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_moveToSpindle:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Inital move to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,X offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Y offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Kamera
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,camera to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Offset Bewegung:
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveCameraTo:System.String.$Content,None,True,True,,Move camera to spindle position?
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveSpindleTo:System.String.$Content,None,True,True,,Move spindle to camera position?
diff --git a/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
index f212fb5..91e3a78 100644
--- a/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
@@ -22,6 +22,7 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_useX0Y0:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Nutze X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Antast Tiefe:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Z-Versatz von der aktuellen Position, an der die Antastung erfolgen soll"
@@ -108,6 +109,7 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.C
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Löschen
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Setze Koordinatensystem:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Antastung XY-Abstand zu groß für Werkstückgröße {0}.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,"Antasten abgeschlossen: X Abstand {0}, Y Abstand {1}."
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,Antasten fehlgeschlagen
@@ -131,12 +133,14 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,"Es wird eine schnelle Bewegung nach X0Y0 durchgeführt, bevor mit der Antastung der Höhenkarte begonnen wird.\\nSicherstellen, dass die anfängliche Z-Position frei von Hindernissen ist, die während der Antastung entstehen können."
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Tastatur-Jogging aktiv
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Tastatur-Jogging deaktiviert
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Antasten…
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Antast Weg muss größer sein als XY Abstand + ½ Taster/Werkzeug Durchmesser.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen mit Alarm, löschen in GRBL Tab."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,Antasten abgebrochen/fehlgeschlagen.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapMinSize:System.String.$Content,None,True,True,,Höhenkarte muss mindestens 4 Punkte haben.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapNarrow:System.String.$Content,None,True,True,,Höhenkarte kann nicht unendlich klein sein.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,"Illegal probe position, try again."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,Rückzugsweg muss kleiner sein als Antast Weg.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen, konnte die aktuelle Maschinenposition nicht ermitteln."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen, Tastspitze nicht angeschlossen."
diff --git a/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
index 4f27315..d92273d 100644
--- a/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
@@ -3,6 +3,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Abbruch
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Abbruch
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Abbruch
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Löschen
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Alles Löschen
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Alles Löschen
@@ -25,6 +26,7 @@ CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Control
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Neu Laden
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Einstellungen von Steuerung neu laden
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset
@@ -33,6 +35,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Window
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zurücksetzen
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Speichern Sie die geänderten Einstellungen in der Steuerung.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Speichern
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Einstellungen speichern
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Senden
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Einstellen
@@ -55,6 +58,7 @@ CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.W
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Verbindung zum Sender
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,Winkel
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Winkel:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diameter:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Distanz Schnellvorschub:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Vorschub Schnell:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
@@ -93,8 +97,12 @@ CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windo
 CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Jogging
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,UI jogging
 CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Arbeitsparameter
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Block
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Daten
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Name
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Offset
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingId:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Id
@@ -178,6 +186,8 @@ CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Wi
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Werkzeug:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Ausführliche Informationen
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X Achse:
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X Achse:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y Achse:
@@ -215,6 +225,7 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.Stri
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,UNBEKANNT
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"Datei: {0}\\n!,?,~ und SPACE im Dateinamen nicht unterstützt, bitte umbenennen."
 CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_Jog
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,Keymappings saved to {0}
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_Macros
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,str_mposFlyout:System.String.$Content,None,True,True,,M_Pos
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Tür noch geöffnet, beenden?"
@@ -241,6 +252,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Schade...\\nWeiter laden?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,Datei enthält keine Einstellungen.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Einstellungen aus Datei wiederherstellen
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Zeitüberschreitung beim Setzen von {0}, weiter?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,Alle Einstellungen werden in {0} im Programmverzeichnis gespeichert.
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,Stop
@@ -256,7 +268,10 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,Ungültige Eingabe: Der minimal zulässige Wert ist {0}.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Ungültige Eingabe: keine IP4-Adresse..
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Ungültige Eingabe: Der zulässige Bereich ist {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Alarm codes
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Error codes
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Netzwerk
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Seriell
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,X und Y Programmgrenzen abfahren
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,"Sicherstellen, dass die Werkzeugspitze frei von Hindernissen ist!"
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,Controller error and alarm codes
diff --git a/Locale/de-DE/csv/ioSender.resources.de-DE.csv b/Locale/de-DE/csv/ioSender.resources.de-DE.csv
index 9e0252e..1b76b1f 100644
--- a/Locale/de-DE/csv/ioSender.resources.de-DE.csv
+++ b/Locale/de-DE/csv/ioSender.resources.de-DE.csv
@@ -1,7 +1,9 @@
 ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Distanz für Tastatur Schrittweite (mit &lt;Strg&gt; Taste).
 ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Über
+ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,A _brief tour
 ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Kamera
 ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Schließen
+ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Error and alarm codes
 ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Exit
 ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Datei
 ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Hilfe
@@ -11,12 +13,25 @@ ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Contro
 ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Speichern
 ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Verändern
 ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Verwendungshinweise
+ioSender.g.en-US.resources:mainwindow.baml,mnu_videoTutorials:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Video tutorials
 ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
 ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,Schrittweite: {0}
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,Kreisbogen zu Linien
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuCompress:System.String.$Content,None,True,True,,Komprimieren (experimentell)
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuDragKnife:System.String.$Content,None,True,True,,Schleppmesserbewegungen hinzufügen
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,Drehen
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Door is open, close door and continue?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Door state cannot be cleared with &lt;Reset&gt;
+ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,E-Stop active! - clear before continuing...
+ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,"E-Stop still active, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"Homing cycle required, &lt;Home&gt; to continue"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,"Controller is in {0} state and cannot respond, try a soft reset?"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,"Controller is not able to communicate due to alarm {0}, attempting a soft reset."
+ioSender.g.en-US.resources:jobview.baml,str_msgNoResponse:System.String.$Content,None,True,True,,Controller is not responding!
+ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,Waiting for controller ({0})...
 ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,Laufzeit: {0}
 ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D Ansicht
 ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D Ansicht
diff --git a/Locale/de-DE/translation.txt b/Locale/de-DE/translation.txt
index ea3d4c2ed60f34a93efdef8c5cb2f95d2df216ae..b674c276c9ce1dcb74bbde6b001c8466d88936f9 100644
GIT binary patch
delta 4418
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
JA9q4D{13#%S&9Gv

delta 925
zcmWlWe@K)E7{~p-_ro{MOKr>ZI+ipsiA(GfvFMLGY0F7}Y~t*KWw&-5>dw=}?GPt7
zku8Qeclel3-I%RIocPBfKISW7uE`h?A#R8mMALPd4Y|1y&P-zO{&=3}%a;!ie4l4%
z&YZYn9&?%{kkez99&0sdGp}D3^Bs`R{S|v8?%0H>G_5qPf^Hl<DjSE#Ap<21im1ot
zEwXWHw?UTNR)awY_!B$w*_DNTl$~d!5_dVZzEwntclu@LbOEHYdLvynYwjB1q#wO`
zJYNiz0-j3gJNGVR>ipXZb$|4VN^6WX^5M38<x8bYMzakR4K~ml!GLT9XN}?vEu_<0
z#}tn8jY7OhuFovg8A(ZdXO%+jfvC)M^}^sxD<$`ZL)7|3gpyxY$?|2VD$#HHcG1wa
zFde+sCAOGqqK)hGRB(Mx?tK5;Aif_a6qy`KD6(&KA%i?OeY83el<Auuv*g~kC}g=a
zCj&p-&k_4VnUSWKf^=pnAn^z5MhX9}0u^-N)Ay)kC6}H*_R_;;A4QhysW#~)*NU(2
zk2&gl?4#io50&V1;MpZgu7*g}%l;%xqib!{|0F~+Pus}z)K3%12I^RCpz^g46+8<|
z#-AR8{)n=)<MeCl02NqO@~8YV{MQbs_(7Y*|E@IC>{f`9|30Gf7jbfIkJHi%4>?|*
zqDR}+^7G5^Zk|vPVtWQ69N&d@F8;rrP|>c%GSI8=WEL)SQ5Jf&lNQt{{7WwGaZfgG
zu{jsBT$O`qExH%=Ca$(2!6_?7dCP_wzM7A5ZE`<cIoxpsVfH#;<Shrfw11AEXfNM&
z>$ugeLv589F`16*L5@+&>w1twD!WcY)z+&}l*x%&L^-z>gPQAo_`&wG2y(m*VXgZt
zVkT|kJPw0LF5o^ttj9eq<i(iE+l^@Axh5UG*n|N0H0r9b5q|CD#~1^<n&IP1LDchl
z03Nmk;pY=Ax)*QO!NnlF+F%QQGi!@sMACUIq93Uyf)BL9&+%H8Ht;oKik6CE*vK|U
z8%GDw&HY!fqxCWB6rPIdtLtL8$k9O<HQTqirLc2QH|M`Yy{4P<CMh#3ima-Y3Uy{S
iP;sV5)-um1G-UBonWdGCdtTAi>^k-i>8b3)Q1KtU%!G0P

diff --git a/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv
index 744dcbe..6f454a3 100644
--- a/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv
@@ -1,6 +1,12 @@
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get current position
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Move offset
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use as probe position
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_confirmMove:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm move
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_moveToSpindle:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Inital move to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,X offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Y offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Camera
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,camera to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Offset motion:
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveCameraTo:System.String.$Content,None,True,True,,Move camera to spindle position?
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveSpindleTo:System.String.$Content,None,True,True,,Move spindle to camera position?
diff --git a/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
index 07f8197..991e7fd 100644
--- a/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
@@ -22,6 +22,7 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_useX0Y0:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Use X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Depth:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Z offset from current position where probing will take place
@@ -108,6 +109,7 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.C
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set coordinate system:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Probing XY clearance too large for workpiece {0} size.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,"Probing completed: X distance {0}, Y distance {1}."
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,Probing failed
@@ -131,12 +133,14 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,A rapid motion to X0Y0 will be performed before probing the height map starts.\\nEnsure the initial Z-position is clear of any obstacles that might be encountered during probing.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Keyboard jogging active
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Keyboard jogging disabled
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Probing...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Probing distance must be larger than XY Clearance + ½ Probe/tool diameter.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Probing failed with alarm, clear in Grbl tab."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,Probing cancelled/failed.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapMinSize:System.String.$Content,None,True,True,,Height map must have at least 4 points.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapNarrow:System.String.$Content,None,True,True,,Height map can&apos;t be infinitely narrow.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,"Illegal probe position, try again."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,Latch distance must be less than Probing distance.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Probing failed, could not establish current machine position."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Probing failed, probe is not connected."
diff --git a/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
index 8920998..616ab35 100644
--- a/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
@@ -3,6 +3,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
@@ -25,6 +26,7 @@ CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Control
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reload settings from controller.
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset
@@ -33,6 +35,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Window
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Rewind
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save settings
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Send
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set
@@ -55,6 +58,7 @@ CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.W
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Sender connection
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,degrees
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Angle:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diameter:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Fast distance:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Fast feedrate:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
@@ -93,8 +97,12 @@ CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windo
 CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Jogging
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,UI jogging
 CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Work Parameters
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Block
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Data
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Name
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Offset
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingId:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Id
@@ -178,6 +186,8 @@ CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Wi
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verbose
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
@@ -215,6 +225,7 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.Stri
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,UNKNOWN
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"File: {0}\\n!,?,~ and SPACE is not supported in filenames, please rename."
 CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_Jog
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,Keymappings saved to {0}
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_Macros
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,str_mposFlyout:System.String.$Content,None,True,True,,M_Pos
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
@@ -241,6 +252,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Bummer...\\nContinue loading?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,The file does not contain any settings.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Restore settings from file
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Timed out while setting {0}, continue?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,All settings written to {0} in the sender folder.
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,Stop
@@ -256,7 +268,10 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,Invalid input: minimum allowed value is {0}.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Invalid input: not an IP4 address..
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Invalid input: allowed range is {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Alarm codes
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Error codes
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Network
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Serial
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,Execute moves to outline X and Y program limits.
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,Ensure tool tip is clear of any obstructions!
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,Controller error and alarm codes
diff --git a/Locale/en-US/csv/ioSender.resources.en-US.csv b/Locale/en-US/csv/ioSender.resources.en-US.csv
index 9a5f228..15f9f65 100644
--- a/Locale/en-US/csv/ioSender.resources.en-US.csv
+++ b/Locale/en-US/csv/ioSender.resources.en-US.csv
@@ -1,7 +1,9 @@
 ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Distance for keyboard step jog (with &lt;CTRL&gt; modifier).
 ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_About
+ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,A _brief tour
 ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Camera
 ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Close
+ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Error and alarm codes
 ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Exit
 ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_File
 ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Help
@@ -11,12 +13,25 @@ ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Contro
 ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Save
 ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Transform
 ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Usage _tips
+ioSender.g.en-US.resources:mainwindow.baml,mnu_videoTutorials:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Video tutorials
 ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
 ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,Jog step: {0}
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,Arcs to lines
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuCompress:System.String.$Content,None,True,True,,Compress (experimental)
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuDragKnife:System.String.$Content,None,True,True,,Add drag knife moves
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,Rotate
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Door is open, close door and continue?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Door state cannot be cleared with &lt;Reset&gt;
+ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,E-Stop active! - clear before continuing...
+ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,"E-Stop still active, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"Homing cycle required, &lt;Home&gt; to continue"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,"Controller is in {0} state and cannot respond, try a soft reset?"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,"Controller is not able to communicate due to alarm {0}, attempting a soft reset."
+ioSender.g.en-US.resources:jobview.baml,str_msgNoResponse:System.String.$Content,None,True,True,,Controller is not responding!
+ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,Waiting for controller ({0})...
 ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,Run time: {0}
 ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D View
 ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D View
diff --git a/Locale/en-US/translation.txt b/Locale/en-US/translation.txt
index 99a94933bf2c8ab78e4e941628fd7fa7c7c8c953..6d08580759ce6cb18fe68a3304aac83c57dad4b5 100644
GIT binary patch
delta 4211
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

delta 918
zcmXw1QAk^76!u*2O)?wPOonrP2$s6xG7;+ni!#KC1_{BX#RhdTW+B{ZS+fvAcGo%Q
zAWG`;AfCYQL_%<V*oKODR(>aa@F5i0L^B_1rmfAONGLW<i%4lZySt6Oob#RU9KP>7
ze1|`3j*HS#L6VwEtR+_bz2+<#Ufq-^@VXgrw{q%Vz6l>ce;YIAdOWJiP}`Y=f#%Fv
zplt20KuTRepkl*uIsNp(ia-Y~X<@2Gr0EU|kgvTFXv5Z}rTwmD5l!7b@?UZQjrV#4
zXv9Ce&f)05Eu83oKsN8JmLh{yfJZ|<EDUL&2|wO>2UmwI<hnc}lH;>gE#^P}ne1N}
zf#fgW7x3VdNlJbd1*{l7R^=`v&r$B1kd`vntgm1k71Uvr#KaR3)8A$AXnK<pGdD|V
zIVB5pG3gbk@_Tz3ZZ8a?dm%*4izW@ZZs-Jbto%TWzvPYN{H<QZ`&)yU+Y)hP%SY)<
zTEyV(0?z;8!|h!k-rVt{XUBt<Jug;g{g}&cVrbWo<JlfGs6CPkVft<u^LN7dVlRRd
z_Y@4PIJvK&bzjEBo@#z~5G(J6r*aW`kbA2X^Y^1<JIDjtGYZw`V-h9`erza+xcYDx
zpBCmYRTS~bqeYx~)Psd$yE@xx{BfHeTTenb_i`AQPDHGK8OG%k1=s&lZkWI$uxA29
z*i`{Wc(4>&1h%e)H8wB7606X{3iD`Sna6a{E-~>m%(9Jgm}aTdFwgu3NO6Y|>Wu8L
z8vHC$4Pov)3(gAGYJnt6y$f?ZX91VQH=ALij2(7Btn_@zdG@da-ejX45a1CTxPUcu
zf?JK0rQ|&|YHu)iGn8>>CrnB_*adoEtxmYbu6_t<uDJkpI;QJ`%j`}c1X!>SK4mk#
zDr)QnncF{tI52a+`i<KI9(LOeJ?v>e$gE~S<>LM7;hG1$JT?HbhIh+wQOllPQ8lh#
zfo?7bpi|HF!=MPf?Q3w0tY!=pRy_tHOGaTFy$e+=SP4c<Idsf929E!BrYH>a*)gyQ
zY$*ore~QSuRmAnzU`=4P@&Cz<Z=r`r<8WP~qErN$)L8{Iosx0A%tg^ttpb`2E=-rp
UIBGb-*NiS!I|VCz8{rK64F`*gjsO4v

diff --git a/Locale/ru-RU/csv/CNC.Controls.Camera.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.Camera.resources.ru-RU.csv
index 373982e..5ae8b2f 100644
--- a/Locale/ru-RU/csv/CNC.Controls.Camera.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.Camera.resources.ru-RU.csv
@@ -1,6 +1,12 @@
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Текушая позиция
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Переместить на смещение
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use as probe position
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_confirmMove:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm move
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_moveToSpindle:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Inital move to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,Смещение X:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Смещение Y:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Камера
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,camera to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Смещение перемещений:
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveCameraTo:System.String.$Content,None,True,True,,Move camera to spindle position?
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveSpindleTo:System.String.$Content,None,True,True,,Move spindle to camera position?
diff --git a/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
index 9ad0904..5f8dd64 100644
--- a/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
@@ -22,6 +22,7 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_useX0Y0:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Использ. X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Глубина:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Смещение места измерения по Z от текущей позиции.
@@ -108,6 +109,7 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.C
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Удалить
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Обновить
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Система координат:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Зазор измерения XY слишком велик для детали размера {0}.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,"Измерение завершено: размер X  {0}, разменр Y {1}."
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,Ошибка озмерения
@@ -131,12 +133,14 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,"Быстрое перемнщение в X0Y0 перед началом измерения карты высот.\\nУбедитесть, что позиция по Z установлена в положение, свободнгое от препятствий."
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Перемещение клавиатурой активно
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Перемещение клавиатурой отключено
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Измерение...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Дистанция измерения должна быть более зазора XY + ½ диаметра щупа.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Авария при измерении, сбросьте на закладке Grbl."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,Измерение прервано/ошибка.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapMinSize:System.String.$Content,None,True,True,,Карта высот должна содержать минимум 4 точки.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapNarrow:System.String.$Content,None,True,True,,Карта высот не может быть бесконечно узкой.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,"Illegal probe position, try again."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,Дистанция фиксации должна быть меньше дистанции измерения.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Ошибка озмерения, текущяя позиция не известна."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Ошибка озмерения, датчик не подключен."
diff --git a/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
index 50b2f00..203fa5a 100644
--- a/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
@@ -3,6 +3,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отмена
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отмена
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отмена
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистить
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистить все
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистить все
@@ -25,6 +26,7 @@ CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Control
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Перечитать
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Перечитать настройки из контроллера.
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сброс
@@ -33,6 +35,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Window
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,В начало
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Применить изменения в контроллер.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сохранить
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сохранить настройки
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отправить
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Уст.
@@ -55,6 +58,7 @@ CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.W
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Подключение контроллера
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,градусы
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Угол:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diameter:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Расстояние Быстро:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача Быстро:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
@@ -93,8 +97,12 @@ CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windo
 CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Jogging
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Экранный пульт
 CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Параметры Обработки
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Блокировать
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Данные
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Имя
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Смещение
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingId:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Id
@@ -178,6 +186,8 @@ CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Wi
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Инструмент:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Подробный
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Web порт
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось X:
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось X:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось Y:
@@ -215,6 +225,7 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.Stri
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,НЕОПРЕД.
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"Файл: {0}\\n!,?,~ и ПРОБЕЛ не поддерживаются в имени файла, пожалуйста переименуйте."
 CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_Пульт
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,Keymappings saved to {0}
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_Макрос
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,str_mposFlyout:System.String.$Content,None,True,True,,Маш._координаты
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,Дверь не закрыта. Выйти?
@@ -241,6 +252,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Ошибка...\\nПродолжить загрузку?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,Файл не содержит параметров настройки.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Восстановить настройки из файла
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Превышено время при установке {0}, продолжить?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,Все установки записаны в {0} в папке программы.
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,Стоп
@@ -256,7 +268,10 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,Ошибка ввода: min. значение {0}.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Ошибка ввода: неверный формат IP4 адреса..
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Ошибка ввода: Разрешенный диапазон {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Alarm codes
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Error codes
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Сеть
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Последовательный порт
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,Объехать по контуру обработки в плоскости X-Y.
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,"Убедитесь, что на пути инструмента нет препятствий!"
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,Controller error and alarm codes
diff --git a/Locale/ru-RU/csv/ioSender.resources.ru-RU.csv b/Locale/ru-RU/csv/ioSender.resources.ru-RU.csv
index 624bd65..e9e50e5 100644
--- a/Locale/ru-RU/csv/ioSender.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/ioSender.resources.ru-RU.csv
@@ -1,7 +1,9 @@
 ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Расстояние для пошагового перемещения клавиатурой (+&lt;CTRL&gt;).
 ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_О програме
+ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,A _brief tour
 ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Камера
 ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Закрыть
+ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Error and alarm codes
 ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Выход
 ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Файл
 ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Справка
@@ -11,12 +13,25 @@ ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Contro
 ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Сохранить
 ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Преобразовать
 ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Заметки по использованию
+ioSender.g.en-US.resources:mainwindow.baml,mnu_videoTutorials:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Video tutorials
 ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
 ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,Шаг перемешений : {0}
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,Дуги в отрезки
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuCompress:System.String.$Content,None,True,True,,Сжать (экспериментальная)
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuDragKnife:System.String.$Content,None,True,True,,Добавить перемещение флюгерного ножа
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,Поворот
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Door is open, close door and continue?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Door state cannot be cleared with &lt;Reset&gt;
+ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,E-Stop active! - clear before continuing...
+ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,"E-Stop still active, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"Homing cycle required, &lt;Home&gt; to continue"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,"Controller is in {0} state and cannot respond, try a soft reset?"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,"Controller is not able to communicate due to alarm {0}, attempting a soft reset."
+ioSender.g.en-US.resources:jobview.baml,str_msgNoResponse:System.String.$Content,None,True,True,,Controller is not responding!
+ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,Waiting for controller ({0})...
 ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,Времы выполнения: {0}
 ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D Вид
 ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D Вид
diff --git a/Locale/ru-RU/translation.txt b/Locale/ru-RU/translation.txt
index 450ae68bc80746764756789e7f06f2640c37b95d..e2d41f69e744925fa2f147e677cb2f78ed84be5b 100644
GIT binary patch
delta 4421
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
A7XSbN

delta 935
zcmWlXYe<_16o&JDeqW52rM6h@)(fsJ)?JCKWV(vDtaPQbA(N72U2&SGX>d}q5Hi_C
zvfzq{b1ui_6qk)&LUE%%oJaCWsUk8&_QSa@8)LOz+v3;->TK|bbo=_}@Vtk^%Xtsy
z>oN0Sr+KK@EL~gYG}$P1gX-4I6e#T#=i_#Wva`=Bp=bVr^glHZIrUsnkzXrktP*`?
zR*_WwoI<W6s$6{432_~1fc$gRl`G2Y*HyegKQ)z7P_t00+aY~#7}jfd_sim2Hii0I
zvXp*1E8X5iu8g<t0y)}zlzAs0SKFFZ>3G*{A^-csGW9_jWbGrrLi<|><U}-tE9n@d
zwR1Q(r^<AY?!UB8CVD)1lt_eVN1{V4tY|cq9M7?tY&2HAk0vhU%SJM!%FLC3B5jwv
zid0=~%%_c^0L6wv()?YySvp566z!nNW~yXt!E3x{H_9mg#xb#uUE3<*9~)Gv%0$SP
zQEB4mpxA#|R^zwU$uaMxz=D?==X|t&tBHPCXr{Emk=rw5S@6-W+a5~I`(US!mtLk>
zw$j6uy>xOpOdU&MiZ4c}>`pu78(g*0PBY7XdU`QHYfAyTwi2eqorpy5I&x^>kE9g+
zxe6N0^yJi-s`*k3J8AR2MfUtXX{7x(K#Obl==t>&l|LA!o9iAb&mN}V9vqYLY_^c?
zDn8`2hVwk6Lgi`=9XzZe#v?h1>9uC`DBPH5=qU@j^-Lb>6t1@7doC)(2zNY&8$4Br
zw7zM@VU45Pagpnbk>s)x4DnnsQu=HOQboLaz%ULSKv?%zV0jzgJA|ZGV|vkKr~ev`
z^S~iE_0C$PG=0K>R6eUt^t10cF6#qML;*Xu#Ic=fYb;#rf{Wtc?0p0cde()Yrf1!F
z0zB=(b+&pis>j|$g@vPDwDO75ILE7AwDC5tLEpB(uTP#v5BTyK_&DQ76Fbkq!$Cj%
zoIGpvRKGD;eHP8>0Q$^&_8dBM`S%FgHJi!!gh#9F=79+6^v3rvQK$z$L6@SZyU?TZ
zbT8Vut{2_x_!OIZ{bz6~d@7EU{P1%$>FGEo6~6g}p~FVepG{y;lM=I4k&MNy(D{O(
rR%x82iYoJ-Bv*l5vIUI_jar-Os5K}%wwOU9MQ+Y~iD|v}D-_{>8D@nM

diff --git a/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
index 219ab44..b227161 100644
--- a/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
@@ -1,6 +1,12 @@
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get current position
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Move offset
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use as probe position
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_confirmMove:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm move
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_moveToSpindle:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Inital move to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,X offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Y offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,相机
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,camera to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Offset motion:
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveCameraTo:System.String.$Content,None,True,True,,Move camera to spindle position?
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveSpindleTo:System.String.$Content,None,True,True,,Move spindle to camera position?
diff --git a/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
index 0990c63..ef9b46c 100644
--- a/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
@@ -22,6 +22,7 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_useX0Y0:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Use X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Depth:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Z offset from current position where probing will take place
@@ -108,6 +109,7 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.C
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set coordinate system:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Probing XY clearance too large for workpiece {0} size.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,"Probing completed: X distance {0}, Y distance {1}."
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,Probing failed
@@ -131,12 +133,14 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,A rapid motion to X0Y0 will be performed before probing the height map starts.\\nEnsure the initial Z-position is clear of any obstacles that might be encountered during probing.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Keyboard jogging active
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Keyboard jogging disabled
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Probing...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Probing distance must be larger than XY Clearance + ½ Probe/tool diameter.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Probing failed with alarm, clear in Grbl tab."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,Probing cancelled/failed.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapMinSize:System.String.$Content,None,True,True,,Height map must have at least 4 points.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapNarrow:System.String.$Content,None,True,True,,Height map can&apos;t be infinitely narrow.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,"Illegal probe position, try again."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,Latch distance must be less than Probing distance.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Probing failed, could not establish current machine position."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Probing failed, probe is not connected."
diff --git a/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
index 982e545..291db41 100644
--- a/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
@@ -3,6 +3,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
@@ -25,6 +26,7 @@ CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Control
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reload settings from controller.
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,复位
@@ -33,6 +35,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Window
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Rewind
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save settings
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Send
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set
@@ -55,6 +58,7 @@ CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.W
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Sender connection
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,degrees
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,角度:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diameter:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Fast distance:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Fast feedrate:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
@@ -93,8 +97,12 @@ CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windo
 CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Jogging
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,UI jogging
 CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Work Parameters
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,块
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Data
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,名称
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,偏移
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingId:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Id
@@ -178,6 +186,8 @@ CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Wi
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verbose
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
@@ -215,6 +225,7 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.Stri
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,UNKNOWN
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"File: {0}\\n!,?,~ and SPACE is not supported in filenames, please rename."
 CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_Jog
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,Keymappings saved to {0}
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_Macros
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,str_mposFlyout:System.String.$Content,None,True,True,,M_Pos
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
@@ -241,6 +252,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Bummer...\\nContinue loading?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,The file does not contain any settings.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Restore settings from file
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Timed out while setting {0}, continue?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,All settings written to {0} in the sender folder.
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,Stop
@@ -256,7 +268,10 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,Invalid input: minimum allowed value is {0}.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Invalid input: not an IP4 address..
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Invalid input: allowed range is {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Alarm codes
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Error codes
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Network
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Serial
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,Execute moves to outline X and Y program limits.
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,Ensure tool tip is clear of any obstructions!
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,Controller error and alarm codes
diff --git a/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv b/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
index 2ce385b..8277855 100644
--- a/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
@@ -1,7 +1,9 @@
 ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Distance for keyboard step jog (with &lt;CTRL&gt; modifier).
 ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_About
+ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,A _brief tour
 ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Camera
 ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Close
+ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Error and alarm codes
 ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Exit
 ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_File
 ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Help
@@ -11,12 +13,25 @@ ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Contro
 ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Save
 ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Transform
 ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Usage _tips
+ioSender.g.en-US.resources:mainwindow.baml,mnu_videoTutorials:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Video tutorials
 ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
 ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,Jog step: {0}
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,Arcs to lines
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuCompress:System.String.$Content,None,True,True,,Compress (experimental)
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuDragKnife:System.String.$Content,None,True,True,,Add drag knife moves
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,Rotate
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Door is open, close door and continue?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Door state cannot be cleared with &lt;Reset&gt;
+ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,E-Stop active! - clear before continuing...
+ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,"E-Stop still active, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"Homing cycle required, &lt;Home&gt; to continue"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,"Controller is in {0} state and cannot respond, try a soft reset?"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,"Controller is not able to communicate due to alarm {0}, attempting a soft reset."
+ioSender.g.en-US.resources:jobview.baml,str_msgNoResponse:System.String.$Content,None,True,True,,Controller is not responding!
+ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,Waiting for controller ({0})...
 ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,Run time: {0}
 ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D View
 ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D View
diff --git a/Locale/zh-CN/translation.txt b/Locale/zh-CN/translation.txt
index d2c667d16d3c203a640f7e83b82c0d15c31b8846..04493d175d661896da178029ca9a20eb862accca 100644
GIT binary patch
delta 4084
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

delta 1010
zcmW-geMp;k5XYZ;@;pgM^=T&JtT^XO+ZAg=qR-kWo2Wz!#X0BNEJ}<)vMd$rG6`9r
zU8r5K&X!_xuyezSlWr?TA^4L%uE>xPLJ^7SaD7o*%W#{FnYz&x8Po0Q{<`mR$K7%F
zx%4;M?X(z6i((~b<*ayhvxrGA+!mSd#ZthfoG6RtmVu^%ld<SP3Hckrz`FD761!4*
zA6Wd*JTOn0i)Rbw?=x9T?F`SZRL6OZnX^)@5%yv1pBzlRUWI;Jib*yTus}nTj`cT9
z37B}h6Uy<<%@SrlbqG}X<!lL>Pi3*>JDq@uwgd_tzePK=Xl-9->5fqyEA-_89K$<z
z4^!9#`!Rhw3(HS?r@F!dd)9MHhtUtG+0&2_nDOjuJPy4#Bw9F`vtZv}73};+ji4##
z%xGzS1-HUU=Ie{-G%{E5e{}4Vbv^2_2P4r43*w&w9{ntZ-r*$Eem<*V`^UUIi+|zf
z*}(V-1KK8iSTiZ$4--9XVlrRL64QEKU6PspxC}?oZ#7VAFXUjxjDr<?yJ2K=^CkgL
zF8Z)}Q2-hHwvS-`qRiw}T)@XarZrZs96#{aqWeJs)-88p**y;?@4E2XvKxm~-F!cZ
zKRxi^vwIE<tM-?*UX&jO(6Ji8?v)_^{V0U%D*=>Ld;Osog%uwztopG3Q2_mGLDu&8
zpavc55q9(E4ZvHAAvXH!IT1HDJ(#zd#K!bE);*cRblQP+TQ+?9<OEyZs>;C2JH43R
zJ%_>F5bo}TFncG&y8d<X)WAcK5&&UkmWOJdvUM;=+XBSMrG*)~A;Ofhqyw8s%@T}I
zZYB)V?-EQ<EEC3*;k{67BvT=HXy#=IDA7Ww&LV#Wj8du`#ucLsc2U`_gh2!4*TaCu
z!dd90dN@Ea8}uk&*Ml9%eH@&cN)^ntuS%5gafph_*c*@m<bM+qbfXF4%F$*h)|06f
zx`=Os9{RKux@pd#Du)BSioXr|L1*DqT2(II(jKOKClu4F3nc1o2dDZIvicK!-lFFL
z6J@tUC&?~#>g!Im#?tc?nLEb4s;2ByudY|Vb3u((@w^KyIx?J5n@xAaNhNp&sxlPm
zEQEN)76zw42O|)ok&j_eMJShItzg8V_w|&z01L`!1R8jnx(H5cxd?7W8h|;TN-wGY
z{2(}${!4I8WLx4Eupzyb$AUdxylt?v$etP=OC>wTGrf3T+Qn?6UFBQGj*$v-Uxf?G
IQWWywKi}7!^Z)<=

diff --git a/changelog.md b/changelog.md
index 570adde..6ee906b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,7 +2,21 @@
 
 Executable for development builds available for download [here](http://www.io-engineering.com/downloads/) if you want to participate in testing.
 
-2022-01-27:
+2022-03-11: [Release 2.0.35](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.37).
+
+* Added list of controller alarm and error codes to _Help_ menu.
+* Added link to tutorial videos to  _Help_ menu. By @S2000Stefan
+* Added link to guided tour blog post to  _Help_ menu. By @phil-barret
+* Improved camera handling, can now be used for center probing. New camera settings options added to _App: Settings_ tab.
+* Fixed bugs in height map probing causing intermittent application hang.
+* Added mapping of G-code to rotary axis to _File > Transform_ menu. Experimental.
+* Modified _Grbl_ tab layout in XL version to always show _Outline_ box.
+* Added support for custom keyboard shorcut mappings, current mappings can be exported from the _App: Settings_ tab.
+* General "hardening" of code.
+
+---
+
+2022-01-27: [Release 2.0.35](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.36).
 
 * Fixed nasty bug where crazy motions could happen if a probing sequence was stopped before completion.
 * Improved support for legacy Grbl controllers.
diff --git a/ioSender XL/ioSender XL/App.xaml.cs b/ioSender XL/ioSender XL/App.xaml.cs
index 33cc74a..0cf3cb8 100644
--- a/ioSender XL/ioSender XL/App.xaml.cs	
+++ b/ioSender XL/ioSender XL/App.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * App.xaml.cs - part of Grbl Code Sender
  *
- * v0.36 / 2021-11-19 / Io Engineering (Terje Io)
+ * v0.37 / 2021-02-20 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -97,6 +97,7 @@ private void DispatcherOnUnhandledException(object sender, DispatcherUnhandledEx
             args.Handled = true;
 
             MessageBox.Show("Unhandled exception occured: " + (args.Exception as Exception).Message, "DispatcherException");
+            Environment.Exit(-1);
         }
 
         private void TaskSchedulerOnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs args)
diff --git a/ioSender XL/ioSender XL/JobView.xaml b/ioSender XL/ioSender XL/JobView.xaml
index 738e346..c4b088d 100644
--- a/ioSender XL/ioSender XL/JobView.xaml	
+++ b/ioSender XL/ioSender XL/JobView.xaml	
@@ -55,13 +55,13 @@
             </Grid.RowDefinitions>
             <cnccontrols:JogControl x:Name="jogControl" Grid.Row="0" Grid.ColumnSpan="2" Margin="5,0,0,0" MinWidth="510" Width="510"/>
             <StackPanel Grid.Row="1" Margin="5,0,0,0" Width="250" VerticalAlignment="Stretch">
-                <cnccontrols:CoolantControl HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="coolantControl"/>
-                <cnccontrols:SpindleControl x:Name="spindleControl" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 <cnccontrols:OutlineControl x:Name="outlineControl"/>
+                <cnccontrols:SpindleControl x:Name="spindleControl"/>
+                <cnccontrols:CoolantControl x:Name="coolantControl"/>
             </StackPanel>
             <StackPanel Grid.Row="1" Grid.Column="1" Margin="0,0,0,5" Width="250" VerticalAlignment="Stretch">
-                <cnccontrols:WorkParametersControl x:Name="workParametersControl" HorizontalAlignment="Left" VerticalAlignment="Top" IsToolChanging="{Binding IsToolChanging}"/>
-                <cnccontrols:FeedControl x:Name="feedControl" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                <cnccontrols:WorkParametersControl x:Name="workParametersControl" IsToolChanging="{Binding IsToolChanging}"/>
+                <cnccontrols:FeedControl x:Name="feedControl"/>
                 <cnccontrols:GotoControl x:Name="gotoControl"/>
             </StackPanel>
         </Grid>
diff --git a/ioSender XL/ioSender XL/JobView.xaml.cs b/ioSender XL/ioSender XL/JobView.xaml.cs
index 9023aa7..d32f98f 100644
--- 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.36 / 2022-01-20 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,7 +56,7 @@ namespace GCode_Sender
     public partial class JobView : UserControl, ICNCView
     {
         private bool? initOK = null;
-        private bool sdStream = false;
+        private bool isBooted = false;
         private GrblViewModel model;
         private IInputElement focusedControl = null;
         private Controller Controller = null;
@@ -87,7 +87,7 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                 case nameof(GrblViewModel.GrblState):
                     if (!Controller.ResetPending)
                     {
-                        if (initOK == false && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
+                        if (isBooted && initOK == false && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
                             Dispatcher.BeginInvoke(new System.Action(() => InitSystem()), DispatcherPriority.ApplicationIdle);
                     }
                     break;
@@ -155,8 +155,8 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                     }
                     else if (!string.IsNullOrEmpty(filename) && AppConfig.Settings.GCodeViewer.IsEnabled)
                     {
-                        MainWindow.GCodeViewer.Open(GCode.File.Tokens);
-                        MainWindow.EnableView(true, ViewType.GCodeViewer);
+//                        MainWindow.GCodeViewer.Open(GCode.File.Tokens);
+//                        MainWindow.EnableView(true, ViewType.GCodeViewer);
                         GCodeSender.EnablePolling(false);
                         gcodeRenderer.Open(GCode.File.Tokens);
                         GCodeSender.EnablePolling(true);
@@ -189,6 +189,8 @@ public void Activate(bool activate, ViewType chgMode)
                     switch (Controller.Restart())
                     {
                         case Controller.RestartResult.Ok:
+                            if (!isBooted)
+                                Dispatcher.BeginInvoke(new System.Action(() => OnBooted()), DispatcherPriority.ApplicationIdle);
                             initOK = InitSystem();
                             break;
 
@@ -207,27 +209,42 @@ public void Activate(bool activate, ViewType chgMode)
                 if (initOK == null)
                     initOK = false;
 
-                #if ADD_CAMERA
+#if ADD_CAMERA
                 if (MainWindow.UIViewModel.Camera != null)
                 {
                     MainWindow.UIViewModel.Camera.MoveOffset += Camera_MoveOffset;
                     MainWindow.UIViewModel.Camera.IsVisibilityChanged += Camera_Opened;
+                    MainWindow.UIViewModel.Camera.IsMoveEnabled = true;
                 }
-                #endif
+#endif
                 //if (viewer == null)
                 //    viewer = new Viewer();
 
                 if(GCode.File.IsLoaded)
                     MainWindow.ui.WindowTitle = ((GrblViewModel)DataContext).FileName;
 
+                model.Keyboard.JogStepDistance = AppConfig.Settings.Jog.LinkStepJogToUI ? AppConfig.Settings.JogUiMetric.Distance0 : AppConfig.Settings.Jog.StepDistance;
+                model.Keyboard.JogDistances[(int)KeypressHandler.JogMode.Slow] = AppConfig.Settings.Jog.SlowDistance;
+                model.Keyboard.JogDistances[(int)KeypressHandler.JogMode.Fast] = AppConfig.Settings.Jog.FastDistance;
+                model.Keyboard.JogFeedrates[(int)KeypressHandler.JogMode.Step] = AppConfig.Settings.Jog.StepFeedrate;
+                model.Keyboard.JogFeedrates[(int)KeypressHandler.JogMode.Slow] = AppConfig.Settings.Jog.SlowFeedrate;
+                model.Keyboard.JogFeedrates[(int)KeypressHandler.JogMode.Fast] = AppConfig.Settings.Jog.FastFeedrate;
+
+                model.Keyboard.IsJoggingEnabled = AppConfig.Settings.Jog.Mode != JogConfig.JogMode.UI;
+
+                if (!GrblInfo.IsGrblHAL)
+                    model.Keyboard.IsContinuousJoggingEnabled = AppConfig.Settings.Jog.KeyboardEnable;
             }
             else if(ViewType != ViewType.Shutdown)
             {
                 DRO.IsFocusable = false;
-                #if ADD_CAMERA
+#if ADD_CAMERA
                 if (MainWindow.UIViewModel.Camera != null)
+                {
                     MainWindow.UIViewModel.Camera.MoveOffset -= Camera_MoveOffset;
-                #endif
+                    MainWindow.UIViewModel.Camera.IsMoveEnabled = false;
+                }
+#endif
                 focusedControl = focusedControl = AppConfig.Settings.Base.KeepMdiFocus &&
                                   Keyboard.FocusedElement is TextBox &&
                                    (Keyboard.FocusedElement as TextBox).Tag is string &&
@@ -273,7 +290,7 @@ private void showProgramLimits()
                 height = limitsControl.ActualHeight;
 
             limitsControl.Visibility = (dp.ActualHeight - t1.ActualHeight - t2.ActualHeight + limitsControl.ActualHeight) > height ? Visibility.Visible : Visibility.Collapsed;
-            outlineControl.Visibility = rhGrid.ActualHeight > 625 ? Visibility.Visible : Visibility.Collapsed;
+            coolantControl.Visibility = rhGrid.ActualHeight > 600 ? Visibility.Visible : Visibility.Collapsed;
             gotoControl.Visibility = rhGrid.ActualHeight > 575 ? Visibility.Visible : Visibility.Collapsed;
         }
 
@@ -308,6 +325,19 @@ void Camera_MoveOffset(CameraMoveMode Mode, double XOffset, double YOffset)
             Comms.com.WriteString("G90\r"); // reset to previous or G80 to cancel motion mode?   
         }
 #endif
+
+        private void OnBooted()
+        {
+            isBooted = true;
+            string filename = CNC.Core.Resources.Path + string.Format("KeyMap{0}.xml", (int)AppConfig.Settings.Jog.Mode);
+
+            if (System.IO.File.Exists(filename))
+                model.Keyboard.LoadMappings(filename);
+
+            if (GrblInfo.NumAxes > 3)
+                GCode.File.AddTransformer(typeof(GCodeWrapViewModel), "Wrap to rotary (WIP)", MainWindow.UIViewModel.TransformMenuItems);
+        }
+
         private bool InitSystem()
         {
             initOK = true;
diff --git a/ioSender XL/ioSender XL/MainWindow.xaml b/ioSender XL/ioSender XL/MainWindow.xaml
index 7783160..a373b05 100644
--- a/ioSender XL/ioSender XL/MainWindow.xaml	
+++ b/ioSender XL/ioSender XL/MainWindow.xaml	
@@ -45,6 +45,9 @@
             <MenuItem x:Uid="mnu_help" x:Name="menuHelp" Header="_Help">
                 <MenuItem x:Uid="mnu_wiki" Header="_Wiki" Click="aboutWikiItem_Click"/>
                 <MenuItem x:Uid="mnu_usageTips" Header="Usage _tips" Click="tipsWikiItem_Click"/>
+                <MenuItem x:Uid="mnu_briefTour" Header="A _brief tour" Click="briefTour_Click"/>
+                <MenuItem x:Uid="mnu_videoTutorials" Header="_Video tutorials" Click="videoTutorials_Click"/>
+                <MenuItem x:Uid="mnu_errorsAndAlarms" Header="_Error and alarm codes" Click="errorAndAlarms_Click"/>
                 <MenuItem x:Uid="mnu_about" Header="_About" Click="aboutMenuItem_Click"/>
             </MenuItem>
         </Menu>
@@ -118,9 +121,11 @@
             <TabItem x:Uid="tab_grbl" x:Name="tabGrbl" Header="Grbl" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <local:JobView x:Name="Grbl"/>
             </TabItem>
+            <!---
             <TabItem x:Uid="tab_3DView" x:Name="tabViewer" Header="3D View">
                 <cncviewer:Viewer x:Name="viewer"/>
             </TabItem>
+            -->
             <TabItem x:Uid="tab_probing" x:Name="tabProbing" Header="Probing">
                 <cncprobingcontrols:ProbingView x:Name="probingView"/>
             </TabItem>
diff --git a/ioSender XL/ioSender XL/MainWindow.xaml.cs b/ioSender XL/ioSender XL/MainWindow.xaml.cs
index 0158e48..6ae6fc6 100644
--- a/ioSender XL/ioSender XL/MainWindow.xaml.cs	
+++ b/ioSender XL/ioSender XL/MainWindow.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.36 / 2022-01-27 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-11 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.36";
+        private const string version = "2.0.37";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
@@ -70,7 +70,7 @@ public MainWindow()
             InitializeComponent();
 
             ui = this;
-            GCodeViewer = viewer;
+//            GCodeViewer = viewer;
             Title = string.Format(Title, version);
 
             int res;
@@ -242,6 +242,21 @@ void tipsWikiItem_Click(object sender, EventArgs e)
             System.Diagnostics.Process.Start("https://github.com/terjeio/ioSender/wiki/Usage-tips");
         }
 
+        void briefTour_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://www.grbl.org/single-post/one-sender-to-rule-them-all");
+        }
+
+        void videoTutorials_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://youtube.com/playlist?list=PLnSV6o2cRxM5mQQe4ec5cS2J8jBsEciY3");
+        }
+
+        void errorAndAlarms_Click(object sender, EventArgs e)
+        {
+            new ErrorsAndAlarms(BaseWindowTitle) { Owner = Application.Current.MainWindow }.Show();
+        }
+
         void aboutMenuItem_Click(object sender, EventArgs e)
         {
             About about = new About(BaseWindowTitle) { Owner = Application.Current.MainWindow };
@@ -261,7 +276,6 @@ private void Base_PropertyChanged(object sender, System.ComponentModel.PropertyC
             }
         }
 
-
         private void Pipe_FileTransfer(string filename)
         {
             if(!JobRunning)
diff --git a/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs b/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs
index 1cfb6cf..cd858f2 100644
--- 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.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]
diff --git a/ioSender/ioSender/App.xaml.cs b/ioSender/ioSender/App.xaml.cs
index 33cc74a..c7cbed1 100644
--- a/ioSender/ioSender/App.xaml.cs
+++ b/ioSender/ioSender/App.xaml.cs
@@ -1,13 +1,13 @@
 /*
  * App.xaml.cs - part of Grbl Code Sender
  *
- * v0.36 / 2021-11-19 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-20 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -97,6 +97,7 @@ private void DispatcherOnUnhandledException(object sender, DispatcherUnhandledEx
             args.Handled = true;
 
             MessageBox.Show("Unhandled exception occured: " + (args.Exception as Exception).Message, "DispatcherException");
+            Environment.Exit(-1);
         }
 
         private void TaskSchedulerOnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs args)
diff --git a/ioSender/ioSender/JobView.xaml.cs b/ioSender/ioSender/JobView.xaml.cs
index 98454c8..ce9ae16 100644
--- 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.36 / 2022-01-20 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,7 +56,7 @@ namespace GCode_Sender
     public partial class JobView : UserControl, ICNCView
     {
         private bool? initOK = null;
-        private bool sdStream = false;
+        private bool isBooted = false;
         private GrblViewModel model;
         private IInputElement focusedControl = null;
         private Controller Controller = null;
@@ -83,12 +83,14 @@ private void View_DataContextChanged(object sender, DependencyPropertyChangedEve
         private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (sender is GrblViewModel) switch (e.PropertyName)
-                {
+            {
                 case nameof(GrblViewModel.GrblState):
                     if (!Controller.ResetPending)
                     {
-                        if (initOK == false && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
-                            Dispatcher.BeginInvoke(new System.Action(() => InitSystem()), DispatcherPriority.ApplicationIdle);
+                            if (initOK == false && isBooted && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
+                            {
+                                Dispatcher.BeginInvoke(new System.Action(() => InitSystem()), DispatcherPriority.ApplicationIdle);
+                            }
                     }
                     break;
 
@@ -155,8 +157,8 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                     }
                     else if (!string.IsNullOrEmpty(filename) && AppConfig.Settings.GCodeViewer.IsEnabled)
                     {
-                        MainWindow.GCodeViewer.Open(GCode.File.Tokens);
-                        MainWindow.EnableView(true, ViewType.GCodeViewer);
+                        //MainWindow.GCodeViewer.Open(GCode.File.Tokens);
+                        //MainWindow.EnableView(true, ViewType.GCodeViewer);
                         GCodeSender.EnablePolling(false);
                         gcodeRenderer.Open(GCode.File.Tokens);
                         GCodeSender.EnablePolling(true);
@@ -190,6 +192,8 @@ public void Activate(bool activate, ViewType chgMode)
                     switch (Controller.Restart())
                     {
                         case Controller.RestartResult.Ok:
+                            if(!isBooted)
+                                Dispatcher.BeginInvoke(new System.Action(() => OnBooted()), DispatcherPriority.ApplicationIdle);
                             initOK = InitSystem();
                             break;
 
@@ -205,13 +209,14 @@ public void Activate(bool activate, ViewType chgMode)
                     model.Message = Controller.Message;
                 }
 
-                #if ADD_CAMERA
+#if ADD_CAMERA
                 if (MainWindow.UIViewModel.Camera != null)
                 {
                     MainWindow.UIViewModel.Camera.MoveOffset += Camera_MoveOffset;
                     MainWindow.UIViewModel.Camera.IsVisibilityChanged += Camera_Opened;
+                    MainWindow.UIViewModel.Camera.IsMoveEnabled = true;
                 }
-                #endif
+#endif
                 //if (viewer == null)
                 //    viewer = new Viewer();
 
@@ -233,10 +238,12 @@ public void Activate(bool activate, ViewType chgMode)
             else if(ViewType != ViewType.Shutdown)
             {
                 DRO.IsFocusable = false;
-                #if ADD_CAMERA
-                if (MainWindow.UIViewModel.Camera != null)
-                    MainWindow.UIViewModel.Camera.MoveOffset -= Camera_MoveOffset;
-                #endif
+#if ADD_CAMERA
+                if (MainWindow.UIViewModel.Camera != null) {
+                    MainWindow.UIViewModel.Camera.MoveOffset-= Camera_MoveOffset;
+                    MainWindow.UIViewModel.Camera.IsMoveEnabled = false;
+                }
+#endif
                 focusedControl = AppConfig.Settings.Base.KeepMdiFocus &&
                                   Keyboard.FocusedElement is TextBox &&
                                    (Keyboard.FocusedElement as TextBox).Tag is string &&
@@ -315,6 +322,19 @@ void Camera_MoveOffset(CameraMoveMode Mode, double XOffset, double YOffset)
             Comms.com.WriteString("G90\r"); // reset to previous or G80 to cancel motion mode?   
         }
 #endif
+
+        private void OnBooted()
+        {
+            isBooted = true;
+            string filename = CNC.Core.Resources.Path + string.Format("KeyMap{0}.xml", (int)AppConfig.Settings.Jog.Mode);
+
+            if (System.IO.File.Exists(filename))
+                model.Keyboard.LoadMappings(filename);
+
+            if (GrblInfo.NumAxes > 3)
+                GCode.File.AddTransformer(typeof(GCodeWrapViewModel), "Wrap to rotary (WIP)", MainWindow.UIViewModel.TransformMenuItems);
+        }
+
         bool InitSystem()
         {
             initOK = true;
diff --git a/ioSender/ioSender/MainWindow.xaml b/ioSender/ioSender/MainWindow.xaml
index 897d194..cd71c5d 100644
--- a/ioSender/ioSender/MainWindow.xaml
+++ b/ioSender/ioSender/MainWindow.xaml
@@ -45,6 +45,9 @@
             <MenuItem x:Uid="mnu_help" x:Name="menuHelp" Header="_Help">
                 <MenuItem x:Uid="mnu_wiki" Header="_Wiki" Click="aboutWikiItem_Click"/>
                 <MenuItem x:Uid="mnu_usageTips" Header="Usage _tips" Click="tipsWikiItem_Click"/>
+                <MenuItem x:Uid="mnu_briefTour" Header="A _brief tour" Click="briefTour_Click"/>
+                <MenuItem x:Uid="mnu_videoTutorials" Header="_Video tutorials" Click="videoTutorials_Click"/>
+                <MenuItem x:Uid="mnu_errorsAndAlarms" Header="_Error and alarm codes" Click="errorAndAlarms_Click"/>
                 <MenuItem x:Uid="mnu_about" Header="_About" Click="aboutMenuItem_Click"/>
             </MenuItem>
         </Menu>
@@ -119,9 +122,11 @@
             <TabItem x:Uid="tab_grbl" x:Name="tabGrbl" Header="Grbl" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <local:JobView x:Name="Grbl"/>
             </TabItem>
+            <!---
             <TabItem x:Uid="tab_3DView" x:Name="tabViewer" Header="3D View">
                 <cncviewer:Viewer x:Name="viewer"/>
             </TabItem>
+            -->
             <TabItem x:Uid="tab_probing" x:Name="tabProbing" Header="Probing">
                 <cncprobingcontrols:ProbingView x:Name="probingView"/>
             </TabItem>
diff --git a/ioSender/ioSender/MainWindow.xaml.cs b/ioSender/ioSender/MainWindow.xaml.cs
index c417a82..0291e27 100644
--- a/ioSender/ioSender/MainWindow.xaml.cs
+++ b/ioSender/ioSender/MainWindow.xaml.cs
@@ -1,13 +1,13 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.36 / 2021-12-25 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.36";
+        private const string version = "2.0.37";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
@@ -70,7 +70,7 @@ public MainWindow()
             InitializeComponent();
 
             ui = this;
-            GCodeViewer = viewer;
+//            GCodeViewer = viewer;
             Title = string.Format(Title, version);
 
             int res;
@@ -244,6 +244,21 @@ void tipsWikiItem_Click(object sender, EventArgs e)
             System.Diagnostics.Process.Start("https://github.com/terjeio/ioSender/wiki/Usage-tips");
         }
 
+        void briefTour_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://www.grbl.org/single-post/one-sender-to-rule-them-all");
+        }
+
+        void videoTutorials_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://youtube.com/playlist?list=PLnSV6o2cRxM5mQQe4ec5cS2J8jBsEciY3");
+        }
+
+        void errorAndAlarms_Click(object sender, EventArgs e)
+        {
+            new ErrorsAndAlarms(BaseWindowTitle) { Owner = Application.Current.MainWindow }.Show();
+        }
+
         void aboutMenuItem_Click(object sender, EventArgs e)
         {
             About about = new About(BaseWindowTitle) { Owner = Application.Current.MainWindow };
@@ -263,7 +278,6 @@ private void Base_PropertyChanged(object sender, System.ComponentModel.PropertyC
             }
         }
 
-
         private void Pipe_FileTransfer(string filename)
         {
             if(!JobRunning)
diff --git a/ioSender/ioSender/Properties/AssemblyInfo.cs b/ioSender/ioSender/Properties/AssemblyInfo.cs
index 1cfb6cf..cd858f2 100644
--- 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.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]