Skip to content

Commit

Permalink
DisplayView : Add missing configuration bits tabs in FlightData, Conf…
Browse files Browse the repository at this point in the history 
…ig tuning, Initial Setup

FlightData :
Add contextMenuStripactionstab to SubMainLeft.Panel2 in case no tab is visible
Make some tab public
Add show/hide tabs with display configuration : displayTransponderTab & displayAuxFunctionTab & displayPayloadTab

Initial Setup :
Add show/hide tabs with display configuration : displayTerminal & displayREPL

Software Config:
Add show/hide tabs with display configuration : displayGeoFence & displayMavFTP
  • Loading branch information
@Godeffroy @meee1
Godeffroy authored and meee1 committed May 4, 2024
1 parent 3794894 commit 9514d83
Show file tree
Hide file tree
Showing 5 changed files with 282 additions and 211 deletions.
40 changes: 30 additions & 10 deletions ExtLibs/Utilities/DisplayView.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ public class DisplayView
public Boolean displayTelemetryTab { get; set; }
public Boolean displayDataflashTab { get; set; }
public Boolean displayMessagesTab { get; set; }
public Boolean displayTransponderTab { get; set; }
public Boolean displayAuxFunctionTab { get; set; }
public Boolean displayPayloadTab { get; set; }

//flight plan
public Boolean displayRallyPointsMenu { get; set; }
Expand Down Expand Up @@ -100,10 +103,12 @@ public class DisplayView


//config tuning
public Boolean displayGeoFence { get; set; }
public Boolean displayBasicTuning { get; set; }
public Boolean displayExtendedTuning { get; set; }
public Boolean displayStandardParams { get; set; }
public Boolean displayAdvancedParams { get; set; }
public Boolean displayMavFTP { get; set; }
public Boolean displayFullParamList { get; set; }
public Boolean displayFullParamTree { get; set; }
public Boolean displayParamCommitButton { get; set; }
Expand All @@ -113,6 +118,7 @@ public class DisplayView
public Boolean autoHideMenuForce { get; set; }
public Boolean displayInitialParams { get; set; }
public bool isAdvancedMode { get; set; }
public Boolean displayREPL { get; set; }
public bool displayServoOutput { get; set; } = true;
public bool displayJoystick { get; set; } = true;
public bool displayOSD { get; set; } = true;
Expand All @@ -129,11 +135,9 @@ public DisplayView()
// default to basic.
//also when a new field is added/created this defines the template for missing options
displayName = DisplayNames.Basic;


//MainV2 buttons
displaySimulation = false;
displayTerminal = false;
displayDonate = true;
displayHelp = true;

Expand All @@ -150,6 +154,9 @@ public DisplayView()
displayTelemetryTab = true;
displayDataflashTab = true;
displayMessagesTab = true;
displayTransponderTab = true;
displayAuxFunctionTab = true;
displayPayloadTab = true;

//flight plan
displayRallyPointsMenu = true;
Expand Down Expand Up @@ -192,13 +199,16 @@ public DisplayView()
displayRTKInject = true;
displayJoystick = true;
displaySerialPorts = true;

displayREPL = true;
displayTerminal = true;

//config tuning
displayGeoFence = true;
displayBasicTuning = true;
displayExtendedTuning = true;
displayStandardParams = false;
displayAdvancedParams = false;
displayMavFTP = true;
displayFullParamList = true;
displayFullParamTree = true;
displayParamCommitButton = false;
Expand Down Expand Up @@ -261,7 +271,6 @@ public static DisplayView Basic(this DisplayView v)
displayName = DisplayNames.Basic,
//MainV2 buttons
displaySimulation = true,
displayTerminal = false,
displayDonate = true,
displayHelp = true,

Expand All @@ -278,13 +287,16 @@ public static DisplayView Basic(this DisplayView v)
displayTelemetryTab = true,
displayDataflashTab = true,
displayMessagesTab = true,
displayTransponderTab = true,
displayAuxFunctionTab = true,
displayPayloadTab = true,

//flight plan
displayRallyPointsMenu = true,
displayGeoFenceMenu = true,
displaySplineCircleAutoWp = true,
displayCircleSurveyAutoWp = true,
displayTextAutoWp = true,
displayCircleSurveyAutoWp = true,
displayPoiMenu = true,
displayTrackerHomeMenu = true,
displayCheckHeightBox = true,
Expand Down Expand Up @@ -318,13 +330,16 @@ public static DisplayView Basic(this DisplayView v)
displayAntennaTracker = true,
displayRTKInject = true,
displayJoystick = true,
displayREPL = true,
displayTerminal = false,


//config tuning
//config tuning
displayGeoFence = true,
displayBasicTuning = true,
displayExtendedTuning = true,
displayStandardParams = false,
displayAdvancedParams = false,
displayMavFTP = true,
displayFullParamList = true,
displayFullParamTree = true,
displayParamCommitButton = false,
Expand All @@ -343,7 +358,6 @@ public static DisplayView Advanced(this DisplayView v)
displayName = DisplayNames.Advanced,
//MainV2 buttons
displaySimulation = true,
displayTerminal = true,
displayDonate = true,
displayHelp = true,

Expand All @@ -360,6 +374,9 @@ public static DisplayView Advanced(this DisplayView v)
displayTelemetryTab = true,
displayDataflashTab = true,
displayMessagesTab = true,
displayTransponderTab = true,
displayAuxFunctionTab = true,
displayPayloadTab = true,

//flight plan
displayRallyPointsMenu = true,
Expand Down Expand Up @@ -400,19 +417,22 @@ public static DisplayView Advanced(this DisplayView v)
displayAntennaTracker = true,
displayRTKInject = true,
displayJoystick = true,

displayREPL = true,
displayTerminal = true,

//config tuning
displayGeoFence = true,
displayBasicTuning = true,
displayExtendedTuning = true,
displayStandardParams = false,
displayAdvancedParams = false,
displayMavFTP = true,
displayFullParamList = true,
displayFullParamTree = true,
displayParamCommitButton = false,
displayBaudCMB = true,
displaySerialPortCMB = true,
standardFlightModesOnly = false,
standardFlightModesOnly = false,
displayOSD = true,
autoHideMenuForce = false,
isAdvancedMode = true
Expand Down
5 changes: 3 additions & 2 deletions GCSViews/FlightData.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions GCSViews/InitialSetup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,15 @@ private void HardwareConfig_Load(object sender, EventArgs e)
{
var adv = AddBackstageViewPage(typeof(ConfigAdvanced), "Advanced");

AddBackstageViewPage(typeof(ConfigTerminal), "Terminal", true, adv);
if (MainV2.DisplayConfiguration.displayTerminal)
{
AddBackstageViewPage(typeof(ConfigTerminal), "Terminal", true, adv);
}

AddBackstageViewPage(typeof(ConfigREPL), "Script REPL", isConnected, adv);
if (MainV2.DisplayConfiguration.displayREPL)
{
AddBackstageViewPage(typeof(ConfigREPL), "Script REPL", isConnected, adv);
}
}

// remeber last page accessed
Expand Down

0 comments on commit 9514d83

Please sign in to comment.