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

Working on the Hadware page

Browse source
This commit is contained in:
Lars Brubaker 2018-10-12 10:55:49 -07:00
parent 3fee869824
commit e532b3c465
16 changed files with 181 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/SlicerConfiguration/Settings/SettingsHelpers.cs
View file

@ -105,8 +105,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string layer_height = nameof(layer_height);
public const string layer_name = nameof(layer_name);
public const string layer_to_pause = nameof(layer_to_pause);
public const string load_filament_length = nameof(load_filament_length);
public const string make = nameof(make);
public const string manual_movement_speeds = nameof(manual_movement_speeds);
public const string matterhackers_sid = nameof(matterhackers_sid);
public const string max_acceleration = nameof(max_acceleration);
public const string max_velocity = nameof(max_velocity);
public const string merge_overlapping_lines = nameof(merge_overlapping_lines);

3
MatterControlLib/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -113,12 +113,13 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.ip_address,
SettingsKey.ip_port,
SettingsKey.progress_reporting,
"load_filament_length",
SettingsKey.load_filament_length,
"trim_filament_markdown",
"insert_filament_markdown",
"running_clean_markdown",
"unload_filament_length",
"load_filament_speed",
SettingsKey.matterhackers_sid,
};
public List<MappedSetting> MappedSettings { get; private set; }

4
MatterControlLib/SlicerConfiguration/SlicerMapping/MappingClasses.cs
View file

@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new MappedSetting("max_fan_speed","max_fan_speed"),
new MappedSetting("min_fan_speed","min_fan_speed"),
new MappedSetting("retract_length","retract_length"),
new LoadTimeFromSpeedAndLength("load_filament_time", "load_filament_length", "load_filament_speed"),
new LoadTimeFromSpeedAndLength("load_filament_time", SettingsKey.load_filament_length, "load_filament_speed"),
new LoadTimeFromSpeedAndLength("unload_filament_time", "unload_filament_length", "load_filament_speed"),
new MappedSetting(SettingsKey.temperature,SettingsKey.temperature),
new MappedSetting("z_offset","z_offset"),
@ -66,7 +66,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new ScaledSingleNumber("retract_speed","retract_speed", 60),
new ScaledSingleNumber("support_material_speed","support_material_speed", 60),
new ScaledSingleNumber("travel_speed", "travel_speed", 60),
new AsPercentOfReferenceOrDirect("load_filament_length_over_six", "", "load_filament_length", 1.0/6.0, false),
new AsPercentOfReferenceOrDirect("load_filament_length_over_six", "", SettingsKey.load_filament_length, 1.0/6.0, false),
new AsPercentOfReferenceOrDirect("unload_filament_length_over_six", "", "unload_filament_length", 1.0/6.0, false),
new ScaledSingleNumber("load_filament_speed", "load_filament_speed", 60),
new MappedSetting("trim_filament_markdown", "trim_filament_markdown"),