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

Migrate make/model settings keys to SettingsKey, revise service urls

Browse source
This commit is contained in:
John Lewin 2016-07-06 15:05:06 -07:00
parent 58a27356c2
commit ba41f4ebee
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
DataStorage/Classic/ClassicSqlitePrinterProfiles.cs
View file

@ -91,8 +91,8 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB
layeredProfile.ID = printer.Id.ToString();
layeredProfile.UserLayer[SettingsKey.printer_name] = printer.Name ?? "";
layeredProfile.UserLayer["MatterControl_Make"] = printer.Make ?? "";
layeredProfile.UserLayer["model"] = printer.Model ?? "";
layeredProfile.UserLayer[SettingsKey.make] = printer.Make ?? "";
layeredProfile.UserLayer[SettingsKey.model] = printer.Model ?? "";
layeredProfile.UserLayer["baud_rate"] = printer.BaudRate ?? "";
layeredProfile.UserLayer["com_port"] = printer.ComPort ?? "";
layeredProfile.UserLayer["auto_connect"] = printer.AutoConnect ? "1" : "0";

3
MatterControlApplication.cs
View file

@ -451,7 +451,8 @@ namespace MatterHackers.MatterControl
}
#if DEBUG
public static string MCWSBaseUri { get; } = "http://192.168.2.129:9206";
//public static string MCWSBaseUri { get; } = "http://192.168.2.129:9206";
public static string MCWSBaseUri { get; } = "https://mattercontrol-test.appspot.com";
#else
public static string MCWSBaseUri { get;} = "https://mattercontrol.appspot.com";
#endif

2
SlicerConfiguration/Settings/ActiveSliceSettings.cs
View file

@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
activeInstance = value;
if (activeInstance != null)
{
BedSettings.SetMakeAndModel(activeInstance.GetValue("MatterControl_Make"), activeInstance.GetValue("model"));
BedSettings.SetMakeAndModel(activeInstance.GetValue(SettingsKey.make), activeInstance.GetValue(SettingsKey.model));
}
SwitchToPrinterTheme(MatterControlApplication.IsLoading);

2
SlicerConfiguration/Settings/SettingsProfile.cs
View file

@ -66,6 +66,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string nozzle_diameter = nameof(nozzle_diameter);
public const string print_center = nameof(print_center);
public const string printer_name = nameof(printer_name);
public const string make = nameof(make);
public const string model = nameof(model);
public const string publish_bed_image = nameof(publish_bed_image);
public const string resume_position_before_z_home = nameof(resume_position_before_z_home);
public const string z_homes_to_max = nameof(z_homes_to_max);