Skip to content

Commit d84d3a0

Browse files
committed
MainV2: better mavftp check and option param BG download
1 parent 12054b3 commit d84d3a0

File tree

9 files changed

+2498
-2528
lines changed

9 files changed

+2498
-2528
lines changed

Controls/ConnectionControl.Designer.cs

Lines changed: 3 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Controls/ConnectionControl.cs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ public ComboBox CMB_serialport
2828
get { return this.cmb_Connection; }
2929
}
3030

31-
public ComboBox TOOL_APMFirmware
32-
{
33-
get { return this.cmb_ConnectionType; }
34-
}
3531

3632
/// <summary>
3733
/// Called from the main form - set whether we are connected or not currently.
@@ -49,13 +45,7 @@ public void IsConnected(bool isConnected)
4945

5046
private void ConnectionControl_MouseClick(object sender, MouseEventArgs e)
5147
{
52-
if (e.X > cmb_ConnectionType.Location.X &&
53-
e.Y > cmb_ConnectionType.Location.Y &&
54-
e.X < cmb_ConnectionType.Right &&
55-
e.Y < cmb_ConnectionType.Bottom)
56-
{
57-
cmb_ConnectionType.Visible = true;
58-
}
48+
5949
}
6050

6151
private void cmb_Connection_DrawItem(object sender, DrawItemEventArgs e)

ExtLibs/ArduPilot/Mavlink/MAVLinkInterface.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,9 @@ public Bitmap getImage()
13581358
13591359
}
13601360
*/
1361-
1361+
/// <summary>
1362+
/// With GUI
1363+
/// </summary>
13621364
public void getParamList()
13631365
{
13641366
log.InfoFormat("getParamList {0} {1}", sysidcurrent, compidcurrent);
@@ -1382,7 +1384,12 @@ void FrmProgressReporterGetParams(IProgressReporterDialogue sender)
13821384
{
13831385
getParamList(MAV.sysid, MAV.compid);
13841386
}
1385-
1387+
/// <summary>
1388+
/// Without GUI
1389+
/// </summary>
1390+
/// <param name="sysid"></param>
1391+
/// <param name="compid"></param>
1392+
/// <returns></returns>
13861393
public MAVLinkParamList getParamList(byte sysid, byte compid)
13871394
{
13881395
return Task.Run(async () => await getParamListAsync(sysid, compid).ConfigureAwait(false)).Result;

GCSViews/ConfigurationView/ConfigPlanner.Designer.cs

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GCSViews/ConfigurationView/ConfigPlanner.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public void Activate()
122122
SetCheckboxFromConfig("showtfr", chk_tfr);
123123
SetCheckboxFromConfig("autoParamCommit", CHK_AutoParamCommit);
124124
SetCheckboxFromConfig("ShowNoFly", chk_shownofly);
125+
SetCheckboxFromConfig("Params_BG", CHK_params_bg);
125126

126127
// this can't fail because it set at startup
127128
NUM_tracklength.Value = Settings.Instance.GetInt32("NUM_tracklength", 200);
@@ -964,5 +965,10 @@ private void num_gcsid_ValueChanged(object sender, EventArgs e)
964965
MAVLinkInterface.gcssysid = (byte)num_gcsid.Value;
965966
Settings.Instance["gcsid"] = num_gcsid.Value.ToString();
966967
}
968+
969+
private void CHK_params_bg_CheckedChanged(object sender, EventArgs e)
970+
{
971+
Settings.Instance["Params_BG"] = CHK_params_bg.Checked.ToString();
972+
}
967973
}
968974
}

0 commit comments

Comments
 (0)