Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GCSVews: Configuration: Compass2: support new compass param names #2726

Merged
merged 2 commits into from
Nov 23, 2021
Merged

GCSVews: Configuration: Compass2: support new compass param names #2726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2798c2
MavLink ParamList: accept array of parameter names
IamPete1 Nov 19, 2021
d6275bf
GCSVews: Configuration: Compass2: support new compass param names
IamPete1 Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions ExtLibs/Mavlink/MAVLinkParamList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,40 @@ public MAVLinkParam this[string name]
}
}

// Only works if one param from the name list if found, will fail if multiple list items are found
// for use in cases of param conversion where the two names will not coexist
public MAVLinkParam this[string[] names]
{
get
{
MAVLinkParam item = null;
foreach (var s in names)
{
MAVLinkParam new_item = this[s];
if (new_item != null)
{
if (item != null)
{
// found multiple items in list
return null;
}
item = new_item;
}
}
return item;
}

set
{
MAVLinkParam item = this[names];
if (item != null)
{
item = value;
}
}

}

public IEnumerable<string> Keys
{
get
Expand Down
29 changes: 15 additions & 14 deletions GCSViews/ConfigurationView/ConfigHWCompass2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ public class CompassDeviceInfo : DeviceInfo
public CompassDeviceInfo(int index, string ParamName, uint id) : base(index, ParamName, id)
{
//set initial state
var id1 = MainV2.comPort.MAV.param["COMPASS_DEV_ID"];
var id2 = MainV2.comPort.MAV.param["COMPASS_DEV_ID2"];
var id3 = MainV2.comPort.MAV.param["COMPASS_DEV_ID3"];
var id1 = MainV2.comPort.MAV.param[new[] { "COMPASS_DEV_ID", "COMPASS1_DEV_ID"}];
var id2 = MainV2.comPort.MAV.param[new[] { "COMPASS_DEV_ID2", "COMPASS2_DEV_ID"}];
var id3 = MainV2.comPort.MAV.param[new[] { "COMPASS_DEV_ID3", "COMPASS3_DEV_ID"}];

var idO1 = MainV2.comPort.MAV.param["COMPASS_ORIENT"];
var idO2 = MainV2.comPort.MAV.param["COMPASS_ORIENT2"];
var idO3 = MainV2.comPort.MAV.param["COMPASS_ORIENT3"];
var idO1 = MainV2.comPort.MAV.param[new[] { "COMPASS_ORIENT", "COMPASS1_ORIENT"}];
var idO2 = MainV2.comPort.MAV.param[new[] { "COMPASS_ORIENT2", "COMPASS2_ORIENT"}];
var idO3 = MainV2.comPort.MAV.param[new[] { "COMPASS_ORIENT3", "COMPASS3_ORIENT"}];

var idE1 = MainV2.comPort.MAV.param["COMPASS_EXTERNAL"];
var idE2 = MainV2.comPort.MAV.param["COMPASS_EXTERN2"];
var idE3 = MainV2.comPort.MAV.param["COMPASS_EXTERN3"];
var idE1 = MainV2.comPort.MAV.param[new[] { "COMPASS_EXTERNAL", "COMPASS1_EXTERN"}];
var idE2 = MainV2.comPort.MAV.param[new[] { "COMPASS_EXTERN2", "COMPASS2_EXTERN"}];
var idE3 = MainV2.comPort.MAV.param[new[] { "COMPASS_EXTERN3", "COMPASS3_EXTERN"}];

if (id1 != null && id1?.Value == id)
{
Expand Down Expand Up @@ -86,7 +86,7 @@ public ConfigHWCompass2()
public void Activate()
{
// COMPASS_DEV_ID get a list of all connected devices
list = MainV2.comPort.MAV.param.Where(a => a.Name.StartsWith("COMPASS_DEV_ID") && a.Value != 0)
list = MainV2.comPort.MAV.param.Where(a => a.Name.StartsWith("COMPASS") && a.Name.Contains("DEV_ID") && a.Value != 0)
.Select((a, b) => new CompassDeviceInfo(b, a.Name, (uint) a.Value))
.OrderBy((a) => a.ParamName).ToList();

Expand Down Expand Up @@ -121,15 +121,16 @@ public void Activate()
mavlinkComboBoxfitness.setup(ParameterMetaDataRepository.GetParameterOptionsInt("COMPASS_CAL_FIT",
MainV2.comPort.MAV.cs.firmware.ToString()), "COMPASS_CAL_FIT", MainV2.comPort.MAV.param);

mavlinkCheckBoxUseCompass1.setup(1, 0, "COMPASS_USE", MainV2.comPort.MAV.param);
mavlinkCheckBoxUseCompass2.setup(1, 0, "COMPASS_USE2", MainV2.comPort.MAV.param);
mavlinkCheckBoxUseCompass3.setup(1, 0, "COMPASS_USE3", MainV2.comPort.MAV.param);
mavlinkCheckBoxUseCompass1.setup(1, 0, new[] { "COMPASS_USE", "COMPASS1_USE"}, MainV2.comPort.MAV.param);
mavlinkCheckBoxUseCompass2.setup(1, 0, new[] { "COMPASS_USE2", "COMPASS2_USE"}, MainV2.comPort.MAV.param);
mavlinkCheckBoxUseCompass3.setup(1, 0, new[] { "COMPASS_USE3", "COMPASS3_USE"}, MainV2.comPort.MAV.param);

CHK_compass_learn.setup(1, 0, "COMPASS_LEARN", MainV2.comPort.MAV.param);

{
// set the default items
var source = ParameterMetaDataRepository.GetParameterOptionsInt("COMPASS_ORIENT",
var orient_param = MainV2.comPort.MAV.param[new[] { "COMPASS_ORIENT", "COMPASS1_ORIENT"}];
var source = ParameterMetaDataRepository.GetParameterOptionsInt(orient_param.Name,
MainV2.comPort.MAV.cs.firmware.ToString())
.Select(a => new KeyValuePair<string, string>(a.Key.ToString(), a.Value)).ToList();
Orientation.DataSource = source;
Expand Down