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

Added has_independent_z

Browse source 
Added z calibration wizard
Finished probe calibration wizard
This commit is contained in:
Lars Brubaker 2022-04-01 11:28:58 -07:00
parent 68d361c2da
commit b25694f8c3
14 changed files with 213 additions and 577 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MatterControl.Printing/Settings/PrinterSettings.cs
View file

@ -99,6 +99,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.bed_remove_part_temperature,
SettingsKey.bed_shape,
SettingsKey.bed_size,
SettingsKey.bed_surface,
SettingsKey.bed_temperature,
SettingsKey.bed_temperature_blue_tape,
SettingsKey.bed_temperature_buildtak,
@ -107,8 +108,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.bed_temperature_kapton,
SettingsKey.bed_temperature_pei,
SettingsKey.bed_temperature_pp,
SettingsKey.has_swappable_bed,
SettingsKey.bed_surface,
SettingsKey.before_toolchange_gcode,
SettingsKey.before_toolchange_gcode_1,
SettingsKey.before_toolchange_gcode_2,
@ -148,8 +147,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.has_fan_per_extruder,
SettingsKey.has_hardware_leveling,
SettingsKey.has_heated_bed,
SettingsKey.has_independent_z_motors,
SettingsKey.has_power_control,
SettingsKey.has_sd_card_reader,
SettingsKey.has_swappable_bed,
SettingsKey.has_z_probe,
SettingsKey.has_z_servo,
SettingsKey.heat_extruder_before_homing,
@ -219,7 +220,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.use_z_probe,
SettingsKey.validate_layer_height,
SettingsKey.validate_leveling,
SettingsKey.validate_probe_offset,
SettingsKey.validation_threshold,
SettingsKey.write_regex,
SettingsKey.xy_offsets_have_been_calibrated,

6
MatterControl.Printing/Settings/SettingsKey.cs
View file

@ -45,6 +45,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string bed_remove_part_temperature = nameof(bed_remove_part_temperature);
public const string bed_shape = nameof(bed_shape);
public const string bed_size = nameof(bed_size);
public const string bed_surface = nameof(bed_surface);
public const string bed_temperature = nameof(bed_temperature);
public const string bed_temperature_blue_tape = nameof(bed_temperature_blue_tape);
public const string bed_temperature_buildtak = nameof(bed_temperature_buildtak);
@ -53,8 +54,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string bed_temperature_kapton = nameof(bed_temperature_kapton);
public const string bed_temperature_pei = nameof(bed_temperature_pei);
public const string bed_temperature_pp = nameof(bed_temperature_pp);
public const string has_swappable_bed = nameof(has_swappable_bed);
public const string bed_surface = nameof(bed_surface);
public const string before_toolchange_gcode = nameof(before_toolchange_gcode);
public const string before_toolchange_gcode_1 = nameof(before_toolchange_gcode_1);
public const string before_toolchange_gcode_2 = nameof(before_toolchange_gcode_2);
@ -133,8 +132,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string has_fan_per_extruder = nameof(has_fan_per_extruder);
public const string has_hardware_leveling = nameof(has_hardware_leveling);
public const string has_heated_bed = nameof(has_heated_bed);
public const string has_independent_z_motors = nameof(has_independent_z_motors);
public const string has_power_control = nameof(has_power_control);
public const string has_sd_card_reader = nameof(has_sd_card_reader);
public const string has_swappable_bed = nameof(has_swappable_bed);
public const string has_z_probe = nameof(has_z_probe);
public const string has_z_servo = nameof(has_z_servo);
public const string heat_extruder_before_homing = nameof(heat_extruder_before_homing);
@ -306,7 +307,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string use_z_probe = nameof(use_z_probe);
public const string validate_layer_height = nameof(validate_layer_height);
public const string validate_leveling = nameof(validate_leveling);
public const string validate_probe_offset = nameof(validate_probe_offset);
public const string validation_threshold = nameof(validation_threshold);
public const string wipe_shield_distance = nameof(wipe_shield_distance);
public const string wipe_tower_perimeters_per_extruder = nameof(wipe_tower_perimeters_per_extruder);

23
MatterControl.Printing/Settings/SliceSettingsFields.cs
View file

@ -1014,6 +1014,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
RebuildGCodeOnChange = false
},
new SliceSettingData()
{
SlicerConfigName = SettingsKey.has_independent_z_motors,
PresentationName = "Has Independent Z Motors".Localize(),
HelpText = "The printer has the ability to move each z motor independently and the firmware has [G34](https://reprap.org/wiki/G-code#G34:_Z_Stepper_Auto-Align) enabled.".Localize(),
DataEditType = DataEditTypes.CHECK_BOX,
ShowAsOverride = true,
DefaultValue = "0",
RebuildGCodeOnChange = false
},
new SliceSettingData()
{
SlicerConfigName = SettingsKey.measure_probe_offset_conductively,
PresentationName = "Measure Probe Offset Conductively".Localize(),
@ -1028,19 +1038,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
RebuildGCodeOnChange = false
},
new SliceSettingData()
{
SlicerConfigName = SettingsKey.validate_probe_offset,
PresentationName = "Validate Probe Offset Automatically".Localize(),
HelpText = "If the printer has a physically touching z probe (like a BLTouch) this will enable automatic validation of the distance between the nozzle and the z probe.".Localize(),
DataEditType = DataEditTypes.CHECK_BOX,
ShowAsOverride = true,
DefaultValue = "0",
Show = (settings) => !settings.GetBool(SettingsKey.has_hardware_leveling)
&& settings.GetBool(SettingsKey.has_z_probe),
UiUpdate = UiUpdateRequired.SliceSettings,
RebuildGCodeOnChange = false
},
new SliceSettingData()
{
SlicerConfigName = SettingsKey.conductive_pad_center,
PresentationName = "Conductive Pad Center".Localize(),

4
MatterControl.Printing/Settings/SliceSettingsLayouts.cs
View file

@ -336,9 +336,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.z_servo_depolyed_angle,
SettingsKey.z_servo_retracted_angle,
SettingsKey.measure_probe_offset_conductively,
#if DEBUG
SettingsKey.validate_probe_offset,
#endif
SettingsKey.conductive_pad_center,
SettingsKey.conductive_probe_min_z,
}),
@ -371,6 +368,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.has_fan,
SettingsKey.has_fan_per_extruder,
SettingsKey.has_hardware_leveling,
SettingsKey.has_independent_z_motors,
SettingsKey.has_heated_bed,
SettingsKey.has_swappable_bed,
SettingsKey.has_sd_card_reader,