From f0fc1234e7513a9cbf08ea4c76dc0116cdc4e34c Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 17 Dec 2018 18:53:52 -0800 Subject: [PATCH] making more macro replaces work issue: MatterHackers/MCCentral#4720 [temperature1] not working correctly --- MatterControlLib/ApplicationView/PrinterConfig.cs | 3 +++ StaticData/SliceSettings/Properties.json | 9 --------- Submodules/agg-sharp | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/MatterControlLib/ApplicationView/PrinterConfig.cs b/MatterControlLib/ApplicationView/PrinterConfig.cs index 4796c4ed3..feaca771b 100644 --- a/MatterControlLib/ApplicationView/PrinterConfig.cs +++ b/MatterControlLib/ApplicationView/PrinterConfig.cs @@ -85,6 +85,9 @@ namespace MatterHackers.MatterControl new MappedSetting(this, SettingsKey.temperature,SettingsKey.temperature), new MappedSetting(this, "z_offset","z_offset"), new MappedSetting(this, SettingsKey.bed_temperature,SettingsKey.bed_temperature), + new MappedSetting(this, SettingsKey.temperature1, SettingsKey.temperature1), + new MappedSetting(this, SettingsKey.temperature2, SettingsKey.temperature2), + new MappedSetting(this, SettingsKey.temperature3, SettingsKey.temperature3), new ScaledSingleNumber(this, "infill_speed", "infill_speed", 60), new ScaledSingleNumber(this, "min_print_speed", "min_print_speed", 60), new ScaledSingleNumber(this, "perimeter_speed","perimeter_speed", 60), diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index e35115dc0..c7b18e1cb 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -404,15 +404,6 @@ "ShowIfSet": "!sla_printer", "DefaultValue": "1" }, - { - "SlicerConfigName": "first_layer_bed_temperature", - "PresentationName": "Bed First Layer", - "HelpText": "The temperature to set the bed to before printing the first layer. The printer will wait until this temperature has been reached before printing. Set to 0 to eliminate bed temperature commands.", - "DataEditType": "DOUBLE", - "Units": "°C", - "ShowIfSet": "has_heated_bed", - "DefaultValue": "75" - }, { "SlicerConfigName": "first_layer_extrusion_width", "PresentationName": "First Layer", diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 7025350cc..f5b0a3891 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 7025350cc177646c67ec926ee0ca7a7f914d63be +Subproject commit f5b0a3891ca2fe22a914f9e89d39f2f0f722e2ec