Skip to content

Commit

Permalink
Disable ConfigStandardParams and ConfigAdvancedParams pages and enabl…
Browse files Browse the repository at this point in the history
…e ConfigFullParamList.
  • Loading branch information
EosBandi authored and meee1 committed Feb 24, 2024
1 parent 1e820e7 commit ed086e6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
19 changes: 10 additions & 9 deletions ExtLibs/Utilities/DisplayView.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using org.mariuszgromada.math.mxparser.mathcollection;
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions GCSViews/SoftwareConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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)
{
Expand Down
4 changes: 4 additions & 0 deletions MainV2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down

0 comments on commit ed086e6

Please sign in to comment.