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

Merge pull request #2881 from larsbrubaker/design_tools

Browse source 
Design tools
This commit is contained in:
johnlewin 2018-01-12 17:14:12 -08:00 • committed by GitHub
commit d8e3b3a9ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
SlicerConfiguration/Settings/SettingsHelpers.cs
View file

@ -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);

1
SlicerConfiguration/SlicerMapping/EngineMapingBase.cs
View file

@ -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,

3
StaticData/SliceSettings/Layouts.txt
View file

@ -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

9
StaticData/SliceSettings/Properties.json
View file

@ -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",

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 62ffc915f217c8a2232810fb4f567f9b4b1009f3
Subproject commit a12e18142ef1e3eeee68c229d9fdd6efeac4821f