Skip to content

Commit

Permalink
Release 2.0.37 - missing files
Browse files Browse the repository at this point in the history
  • Loading branch information
terjeio committed Mar 15, 2022
1 parent 696f941 commit 7131356
Show file tree
Hide file tree
Showing 19 changed files with 1,308 additions and 1 deletion.
17 changes: 17 additions & 0 deletions CNC Controls/CNC Controls/ErrorsAndAlarms.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Window x:Class="CNC.Controls.ErrorsAndAlarms"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:CNC.Controls"
mc:Ignorable="d"
x:Uid="wnd_errorsAndAlarms" Title="Controller error and alarm codes" Height="500" Width="750" MinHeight="100" MinWidth="150" Icon="App.ico">
<TabControl>
<TabItem x:Uid="tab_errors" Header="Error codes">
<local:GrblErrorList/>
</TabItem>
<TabItem x:Uid="tab_alarms" Header="Alarm codes">
<local:GrblAlarmList/>
</TabItem>
</TabControl>
</Window>
52 changes: 52 additions & 0 deletions CNC Controls/CNC Controls/ErrorsAndAlarms.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
* ErrorsAndAlarms.xaml.cs - part of CNC Controls library for Grbl
*
* v0.37 / 2022-02-26 / Io Engineering (Terje Io)
*
*/

/*
Copyright (c) 2022, Io Engineering (Terje Io)
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
· Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
· Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
· Neither the name of the copyright holder nor the names of its contributors may
be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

using System.Windows;

namespace CNC.Controls
{
public partial class ErrorsAndAlarms : Window
{
public ErrorsAndAlarms(string title)
{
InitializeComponent();
Title = title + " - " + Title;
}
}
}
265 changes: 265 additions & 0 deletions CNC Controls/CNC Controls/GCodeWrap.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
/*
* GCodeWrap.cs - part of CNC Controls library for Grbl
*
* v0.37 / 2022-02-19 / Io Engineering (Terje Io)
*
*/

/*
Copyright (c) 2022, Io Engineering (Terje Io)
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
· Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
· Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
· Neither the name of the copyright holder nor the names of its contributors may
be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CNC.Core;
using CNC.GCode;
using RP.Math;

namespace CNC.Controls
{
class GCodeWrap
{
private Vector3 ToAbsolute(Vector3 orig, double[] values, bool isRelative = false)
{
Vector3 p;

if (isRelative)
p = orig + new Vector3(values[0], values[1], values[2]);
else
p = new Vector3(values[0], values[1], values[2]);

return p;
}

public void ApplyWrap(GCodeWrapViewModel model, bool compress = false)
{
uint G53lnr = 0;
int precision = GCode.File.Decimals;
double feedrate_pgm = 0d, feedrate = 0d, feedrate_cur = 0d;
string hdr = string.Format("Wrap applied, diameter: {0}, {1}-axis to {2}-axis", model.Diameter.ToInvariantString(), GrblInfo.AxisIndexToLetter(model.SourceAxis), GrblInfo.AxisIndexToLetter(model.TargetAxis));
GCPlane plane = new GCPlane(GrblParserState.Plane == Plane.XY ? Commands.G17 : Commands.G18, 0);
DistanceMode distanceMode = GrblParserState.DistanceMode;
FeedRateMode feedRateMode = GrblParserState.FeedRateMode;
AxisFlags targetAxis = GrblInfo.AxisIndexToFlag(model.TargetAxis);
List<GCodeToken> toolPath = new List<GCodeToken>();
Point6D pos = new Point6D(), newpos = new Point6D();

pos.Set(Grbl.GrblViewModel.Position.Values.Array, GrblInfo.AxisFlags);
if (model.SourceAxis == GrblConstants.X_AXIS)
pos.X = 0d;
else
pos.Y = 0d;

toolPath.Add(new GCComment(Commands.Comment, 0, hdr));

double mmDeg = model.Diameter * Math.PI / 360d;

foreach (var token in GCode.File.Tokens)
{
switch (token.Command)
{
case Commands.G0:
case Commands.G1:
{
var motion = token as GCLinearMotion;
newpos.Set(motion.Values, motion.AxisFlags);

if (motion.AxisFlags.HasFlag(AxisFlags.Y) && G53lnr != token.LineNumber)
{
switch (model.TargetAxis)
{
case GrblConstants.A_AXIS:
newpos.A = Math.Round((model.SourceAxis == GrblConstants.X_AXIS ? motion.X : motion.Y) / mmDeg, precision);
motion.AxisFlags |= AxisFlags.A;
if (model.SourceAxis == GrblConstants.X_AXIS)
{
newpos.X = 0d;
motion.AxisFlags &= ~AxisFlags.X;
}
else
{
newpos.Y = 0d;
motion.AxisFlags &= ~AxisFlags.Y;
}
break;

case GrblConstants.B_AXIS:
newpos.B = Math.Round((model.SourceAxis == GrblConstants.X_AXIS ? motion.X : motion.Y) / mmDeg, precision);
motion.AxisFlags |= AxisFlags.B;
if (model.SourceAxis == GrblConstants.X_AXIS)
{
newpos.X = 0d;
motion.AxisFlags &= ~AxisFlags.X;
}
else
{
newpos.Y = 0d;
motion.AxisFlags &= ~AxisFlags.Y;
}
break;
}

if (motion.AxisFlags.HasFlag(AxisFlags.Z) && model.Z0atCenter)
motion.Z += model.Diameter / 2d;

if (token.Command == Commands.G1)
{
double dist = 0d;

for (int i = 0; i < 3; i++)
dist += Math.Pow(distanceMode == DistanceMode.Incremental ? newpos[i] : newpos[i] - pos[i], 2d);

dist = Math.Sqrt(dist);

//if (dist > 0d)
// toolPath.Add(new GCComment(Commands.Comment, motion.LineNumber, string.Format("dist {0} {1}", dist, feedrate_pgm / dist)));

if (motion.AxisFlags == targetAxis || dist == 0d)
{
motion.AxisFlags = targetAxis;
if (feedRateMode != FeedRateMode.UnitsPerMin)
{
feedrate_cur = 0d;
toolPath.Add(new GCFeedRateMode(motion.LineNumber, feedRateMode = FeedRateMode.UnitsPerMin));
}
if (feedrate_cur != feedrate)
toolPath.Add(new GCFeedrate(motion.LineNumber, feedrate_cur = feedrate));
}
else
{
if (feedRateMode != FeedRateMode.InverseTime)
toolPath.Add(new GCFeedRateMode(motion.LineNumber, feedRateMode = FeedRateMode.InverseTime));
toolPath.Add(new GCFeedrate(motion.LineNumber, Math.Round(feedrate_pgm / dist, 1)));
}

toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, newpos.Array, motion.AxisFlags));
pos.Set(newpos.Array, motion.AxisFlags, distanceMode == DistanceMode.Incremental);
}
else
{
if (motion.AxisFlags.HasFlag(AxisFlags.Z) && model.Z0atCenter)
motion.Z += model.Diameter / 2d;

if (feedRateMode != FeedRateMode.UnitsPerMin)
{
feedrate_cur = 0d;
toolPath.Add(new GCFeedRateMode(motion.LineNumber, feedRateMode = FeedRateMode.UnitsPerMin));
}

if (feedrate_cur != feedrate_pgm)
toolPath.Add(new GCFeedrate(motion.LineNumber, feedrate_cur = feedrate_pgm));

G53lnr = 0;
toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, newpos.Array, motion.AxisFlags));
pos.Set(newpos.Array, motion.AxisFlags, distanceMode == DistanceMode.Incremental);
}
}
else // G0
{
G53lnr = 0;
toolPath.Add(new GCLinearMotion(motion.Command, motion.LineNumber, newpos.Array, motion.AxisFlags));
pos.Set(newpos.Array, motion.AxisFlags, distanceMode == DistanceMode.Incremental);
}
}
break;

case Commands.G2:
case Commands.G3:
throw new Exception(LibStrings.FindResource("HasG17G18Arcs"));
break;

case Commands.G5:
throw new Exception(LibStrings.FindResource("HasG17G18Arcs"));
break;

case Commands.G17:
case Commands.G18:
case Commands.G19:
plane = token as GCPlane;
toolPath.Add(token);
break;

case Commands.G53:
G53lnr = token.LineNumber; // No rotation for next linear move
toolPath.Add(token);
break;

case Commands.G73:
case Commands.G81:
case Commands.G82:
case Commands.G83:
case Commands.G85:
case Commands.G86:
case Commands.G89:
throw new Exception(LibStrings.FindResource("HasG17G18Arcs"));
break;

case Commands.G90:
case Commands.G91:
distanceMode = (token as GCDistanceMode).DistanceMode;
toolPath.Add(token);
break;

case Commands.G93:
case Commands.G94:
case Commands.G95:
feedRateMode = (token as GCFeedRateMode).FeedRateMode;
toolPath.Add(token);
break;

case Commands.Feedrate:
feedrate_pgm = (token as GCFeedrate).Feedrate;
feedrate = Math.Round(feedrate_pgm / mmDeg, 1);
toolPath.Add(token);
break;

default:
toolPath.Add(token);
break;
}
}

List<string> gc = GCodeParser.TokensToGCode(toolPath, compress);

// GCodeParser.Save(@"C:\Users\terjeio\Desktop\Wrap\file.nc", gc);

GCode.File.AddBlock(hdr + " - " + Grbl.GrblViewModel.FileName, Core.Action.New);

foreach (string block in gc)
GCode.File.AddBlock(block, Core.Action.Add);

GCode.File.AddBlock("", Core.Action.End);
}
}
}
44 changes: 44 additions & 0 deletions CNC Controls/CNC Controls/GCodeWrapDialog.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<Window x:Class="CNC.Controls.GCodeWrapDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:CNC.Controls"
mc:Ignorable="d"
Title="Wrap parameters" Height="150" Width="200"
SizeToContent="WidthAndHeight" ResizeMode="NoResize" MinWidth="190"
Loaded="Window_Loaded" Icon="App.ico">
<Grid Background="#FFE5E5E5">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Height="Auto" Margin="5,5">
<local:NumericField x:Uid="fld_diameter" x:Name="Diameter" Label="Diameter:" Format="-##0.###" Value="{Binding Path=Diameter, Mode=TwoWay}"/>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="70"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Label x:Uid="lbl_wrapSource" Content="Wrap:" HorizontalAlignment="Right" HorizontalContentAlignment="Right" VerticalAlignment="Center" Grid.Row="0" Grid.Column="0"/>
<ComboBox HorizontalAlignment="Left" VerticalAlignment="Center" Width="80" Grid.Row="0" Grid.Column="1"
ItemsSource="{Binding Path=SourceAxes}"
SelectedValue="{Binding Path=SourceAxis, Mode=TwoWay}"
DisplayMemberPath="Name"
SelectedValuePath="AxisId" Margin="0,2"
/>
<Label x:Uid="lbl_wrapTarget" Content="to:" HorizontalAlignment="Right" HorizontalContentAlignment="Right" VerticalAlignment="Center" Grid.Row="1" Grid.Column="0"/>
<ComboBox HorizontalAlignment="Left" VerticalAlignment="Center" Width="80" Grid.Row="1" Grid.Column="1"
ItemsSource="{Binding Path=TargetAxes}"
SelectedValue="{Binding Path=TargetAxis, Mode=TwoWay}"
DisplayMemberPath="Name"
SelectedValuePath="AxisId" Margin="0,2"
/>
</Grid>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" Width="Auto" Margin="0,10,0,0">
<Button x:Uid="btn_ok" x:Name="btnOk" Content="Ok" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
<Button x:Uid="btn_cancel" x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
</StackPanel>
</StackPanel>
</Grid>
</Window>
Loading

0 comments on commit 7131356

Please sign in to comment.