From 8086dace547374fa1d60b245d263e33cc83a8ac0 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 12 Jan 2018 13:51:10 -0800 Subject: [PATCH 1/2] Creating new property for backup firmware --- StaticData/SliceSettings/Properties.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 150d2016d..7d5be3446 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -588,6 +588,15 @@ "ReloadUiWhenChanged": true, "RebuildGCodeOnChange": false }, + { + "SlicerConfigName": "backup_firmware_before_update", + "PresentationName": "Backup Firmware Before Update", + "HelpText": "When upgrading to new firmware, first save a backup of the current firmware.", + "DataEditType": "CHECK_BOX", + "DefaultValue": "1", + "ShowIfSet": "!sla_printer", + "RebuildGCodeOnChange": false + }, { "SlicerConfigName": "has_power_control", "PresentationName": "Has Power Control", From 6e2e8627db76e0d144d68c9ab6dea61ea2113506 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 12 Jan 2018 16:43:49 -0800 Subject: [PATCH 2/2] Put in printer the backup firmware setting --- SlicerConfiguration/Settings/SettingsHelpers.cs | 1 + SlicerConfiguration/SlicerMapping/EngineMapingBase.cs | 1 + StaticData/SliceSettings/Layouts.txt | 3 ++- Submodules/agg-sharp | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SlicerConfiguration/Settings/SettingsHelpers.cs b/SlicerConfiguration/Settings/SettingsHelpers.cs index d4e43c00d..cc81cdbea 100644 --- a/SlicerConfiguration/Settings/SettingsHelpers.cs +++ b/SlicerConfiguration/Settings/SettingsHelpers.cs @@ -47,6 +47,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public const string active_quality_key = nameof(active_quality_key); public const string active_theme_name = nameof(active_theme_name); public const string auto_connect = nameof(auto_connect); + public const string backup_firmware_before_update = nameof(backup_firmware_before_update); public const string baby_step_z_offset = nameof(baby_step_z_offset); public const string baud_rate = nameof(baud_rate); public const string bed_remove_part_temperature = nameof(bed_remove_part_temperature); diff --git a/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs b/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs index 9e1a3b7e5..17ea529dd 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs @@ -57,6 +57,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration SettingsKey.has_sd_card_reader, SettingsKey.printer_name, SettingsKey.auto_connect, + SettingsKey.backup_firmware_before_update, SettingsKey.baud_rate, SettingsKey.com_port, SettingsKey.filament_cost, diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index 0ef1cb449..84847855b 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -145,11 +145,12 @@ Printer extruders_share_temperature extruder_offset Features - Features!hidden + Features Interface sla_printer show_reset_connection include_firmware_updater + backup_firmware_before_update Print Recovery recover_is_enabled recover_first_layer_speed diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 62ffc915f..a12e18142 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 62ffc915f217c8a2232810fb4f567f9b4b1009f3 +Subproject commit a12e18142ef1e3eeee68c229d9fdd6efeac4821f