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. --- .../PPCApplication/DefaultPPCApplicationManager.cs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs index c5dab127c..f8a0fdc36 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs @@ -62,11 +62,6 @@ namespace Tango.PPC.UI.PPCApplication /// public event EventHandler SetupRequired; - /// - /// Occurs when firmware upgrade is required. - /// - public event EventHandler FirmwareUpgradeRequired; - /// /// Occurs when the main window content has been rendered. /// @@ -164,7 +159,7 @@ namespace Tango.PPC.UI.PPCApplication if (App.StartupArgs.Contains("-update_ok")) { LogManager.Log("Application started with '-update_ok' startup arguments. The application has been successfully updated."); - settings.ApplicationState = ApplicationStates.FirmwareUpgrade; + settings.ApplicationState = ApplicationStates.Ready; settings.Save(); } @@ -191,16 +186,11 @@ namespace Tango.PPC.UI.PPCApplication { try { - if (settings.ApplicationState == ApplicationStates.PreSetup || settings.ApplicationState == ApplicationStates.SemiSetup) + if (settings.ApplicationState == ApplicationStates.PreSetup) { LogManager.Log($"The application is in {settings.ApplicationState} state. database initialization skipped. Invoking setup required event!"); SetupRequired?.Invoke(this, new EventArgs()); } - else if (settings.ApplicationState == ApplicationStates.FirmwareUpgrade) - { - LogManager.Log($"The application is in {settings.ApplicationState} state. database initialization skipped. Invoking firmware upgrade required event!"); - FirmwareUpgradeRequired?.Invoke(this, new EventArgs()); - } else { PostDbInitialize(); -- cgit v1.3.1