nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto fix if value is invalid (if we have a 0 multiplier)

Browse source
This commit is contained in:
LarsBrubaker 2020-03-28 08:24:47 -07:00
parent 1779e9a44c
commit ccdf166ded
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MatterControlLib/PrinterCommunication/Io/ToolSpeedMultiplierStream.cs
View file

@ -35,12 +35,17 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
public class ToolSpeedMultiplierStream : GCodeStreamProxy
{
private PrinterMove lastDestination = PrinterMove.Unknown;
private double t0Multiplier;
private double t1Multiplier;
public ToolSpeedMultiplierStream(PrinterConfig printer, GCodeStream internalStream)
: base(printer, internalStream)
{
t0Multiplier = printer.Settings.GetValue<double>(SettingsKey.t1_extrusion_move_speed_multiplier);
t1Multiplier = printer.Settings.GetValue<double>(SettingsKey.t1_extrusion_move_speed_multiplier);
if (t1Multiplier == 0)
{
t1Multiplier = 1;
}
printer.Settings.SettingChanged += Settings_SettingChanged;
}
@ -49,7 +54,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
// we don't change the setting while printing
if (stringEvent.Data == SettingsKey.t1_extrusion_move_speed_multiplier)
{
t0Multiplier = printer.Settings.GetValue<double>(SettingsKey.t1_extrusion_move_speed_multiplier);
t1Multiplier = printer.Settings.GetValue<double>(SettingsKey.t1_extrusion_move_speed_multiplier);
}
}
@ -91,7 +96,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
if (extrusionDelta && xyPositionDelta)
{
// modify the speed by the T1 multiplier
moveToSend.feedRate *= t0Multiplier;
moveToSend.feedRate *= t1Multiplier;
}
}