From f7d320bcc6651d0c85bad73b52b14ba050a40c18 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 9 Dec 2018 16:59:07 +0200 Subject: Refactored PPC firmware upgrade. --- .../PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs index 02cc4ba33..16b1c05bc 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs @@ -138,8 +138,6 @@ namespace Tango.PPC.UI.ViewModels public MachineSetupViewVM(IPPCApplicationManager applicationManager, IMachineSetupManager machineSetupManager) { MachineSetupManager = machineSetupManager; - //MachineSetupManager.ProgressLog += (x, msg) => AppendLog(msg); - MachineSetupManager.ProgressStep += (x, step) => AppendLog(Environment.NewLine + "-----------" + step.ToDescription().ToUpper() + "-----------" + Environment.NewLine); HostAddress = Settings.MachineServiceAddress; SerialNumber = ""; @@ -171,6 +169,7 @@ namespace Tango.PPC.UI.ViewModels } var logger = new SimpleStringLogger(); + logger.Categories.Remove(LogCategory.Debug); LogManager.RegisterLogger(logger); logger.LogReceived += Logger_LogReceived; @@ -275,11 +274,9 @@ namespace Tango.PPC.UI.ViewModels try { _setup_result = await MachineSetupManager.Setup(SerialNumber, HostAddress); - Settings.ApplicationState = ApplicationStates.SemiSetup; - Settings.Save(); State = MachineSetupStates.Completed; LogManager.Log("Machine setup completed."); - CompleteSetup(); + await NavigateTo(MachineSetupView.SetupCompletedView); } catch (Exception ex) { -- cgit v1.3.1