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

Made macros disabled during pining

Browse source 
Made it possible to set movement speed in setting.ini
Updated orion and rostockMax settings
Made orion and rostockMax have fast manual z moment
Made some printers have the calibration box at startup
This commit is contained in:
larsbrubaker 2014-08-28 12:22:57 -07:00
parent d7977022ef
commit e93d38ec90
11 changed files with 153 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterControls/ManualPrinterControls.cs
View file

@ -614,7 +614,7 @@ namespace MatterHackers.MatterControl
movementControlsContainer.SetEnableLevel(DisableableWidget.EnableLevel.ConfigOnly);
fanControlsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled);
tuningAdjustmentControlsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled);
macroControls.SetEnableLevel(DisableableWidget.EnableLevel.Enabled);
macroControls.SetEnableLevel(DisableableWidget.EnableLevel.ConfigOnly);
break;
default:

7
PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -181,6 +181,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
string defaultMaterialPreset;
string defaultQualityPreset;
string defaultMovementSpeeds;
private void LoadSetupSettings(string make, string model)
{
Dictionary<string, string> settingsDict = LoadPrinterSetupFromFile(make, model);
@ -220,6 +221,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
settingsDict.TryGetValue("default_material_presets", out defaultMaterialPreset);
settingsDict.TryGetValue("default_quality_preset", out defaultQualityPreset);
settingsDict.TryGetValue("default_movement_speeds", out defaultMovementSpeeds);
string defaultMacros;
printerCustomCommands = new List<CustomCommands>();
@ -450,6 +452,11 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
//Load the default slice settings for the make and model combination - if they exist
SliceSettingsCollection collection = LoadDefaultSliceSettings(this.ActivePrinter.Make, this.ActivePrinter.Model);
if (defaultMovementSpeeds != null)
{
this.ActivePrinter.ManualMovementSpeeds = defaultMovementSpeeds;
}
//Ordering matters - need to get Id for printer prior to loading slice presets
this.ActivePrinter.AutoConnectFlag = true;
this.ActivePrinter.Commit();