From ed086e60a7f030fc816fc8696d677484aaf71d7a Mon Sep 17 00:00:00 2001 From: Andras Schaffer Date: Mon, 15 Jan 2024 10:18:22 +0100 Subject: [PATCH] Disable ConfigStandardParams and ConfigAdvancedParams pages and enable ConfigFullParamList. --- ExtLibs/Utilities/DisplayView.cs | 19 ++++++++++--------- GCSViews/SoftwareConfig.cs | 4 ++-- MainV2.cs | 4 ++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ExtLibs/Utilities/DisplayView.cs b/ExtLibs/Utilities/DisplayView.cs index 8b935879c2..b8472ab1a1 100644 --- a/ExtLibs/Utilities/DisplayView.cs +++ b/ExtLibs/Utilities/DisplayView.cs @@ -1,4 +1,5 @@ -using System; +using org.mariuszgromada.math.mxparser.mathcollection; +using System; using System.Collections; using System.Collections.Generic; using System.IO; @@ -196,10 +197,10 @@ public DisplayView() //config tuning displayBasicTuning = true; displayExtendedTuning = true; - displayStandardParams = true; + displayStandardParams = false; displayAdvancedParams = false; - displayFullParamList = false; - displayFullParamTree = false; + displayFullParamList = true; + displayFullParamTree = true; displayParamCommitButton = false; displayBaudCMB = true; standardFlightModesOnly = false; @@ -322,10 +323,10 @@ public static DisplayView Basic(this DisplayView v) //config tuning displayBasicTuning = true, displayExtendedTuning = true, - displayStandardParams = true, + displayStandardParams = false, displayAdvancedParams = false, - displayFullParamList = false, - displayFullParamTree = false, + displayFullParamList = true, + displayFullParamTree = true, displayParamCommitButton = false, displayBaudCMB = true, displaySerialPortCMB = true, @@ -404,8 +405,8 @@ public static DisplayView Advanced(this DisplayView v) //config tuning displayBasicTuning = true, displayExtendedTuning = true, - displayStandardParams = true, - displayAdvancedParams = true, + displayStandardParams = false, + displayAdvancedParams = false, displayFullParamList = true, displayFullParamTree = true, displayParamCommitButton = false, diff --git a/GCSViews/SoftwareConfig.cs b/GCSViews/SoftwareConfig.cs index 764279f5c9..9cb0bf9199 100644 --- a/GCSViews/SoftwareConfig.cs +++ b/GCSViews/SoftwareConfig.cs @@ -94,7 +94,7 @@ private void SoftwareConfig_Load(object sender, EventArgs e) start = AddBackstageViewPage(typeof(ConfigAntennaTracker), Strings.ExtendedTuning); } - if (MainV2.DisplayConfiguration.displayBasicTuning) + if (MainV2.DisplayConfiguration.displayStandardParams) { AddBackstageViewPage(typeof(ConfigFriendlyParams), Strings.StandardParams); } @@ -122,7 +122,7 @@ private void SoftwareConfig_Load(object sender, EventArgs e) if (MainV2.DisplayConfiguration.displayFullParamList) { if(!MainV2.comPort.BaseStream.IsOpen || gotAllParams) - AddBackstageViewPage(typeof(ConfigRawParams), Strings.FullParameterList, null, true); + AddBackstageViewPage(typeof(ConfigRawParams), Strings.FullParameterList, null, false); } if (MainV2.comPort.BaseStream.IsOpen) { diff --git a/MainV2.cs b/MainV2.cs index d29e07f09e..1d9175092a 100644 --- a/MainV2.cs +++ b/MainV2.cs @@ -974,6 +974,10 @@ public MainV2() try { DisplayConfiguration = Settings.Instance.GetDisplayView("displayview"); + //Force new view in case of saved view in config.xml + DisplayConfiguration.displayAdvancedParams = false; + DisplayConfiguration.displayStandardParams = false; + DisplayConfiguration.displayFullParamList = true; } catch {