Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit b5e3dd5
Author: Michael Oborne <mich146@hotmail.com>
Date:   Mon Mar 20 11:26:29 2023 +1100

    Mission Planner 1.3.80

commit 57857b7
Author: Michael Oborne <mich146@hotmail.com>
Date:   Mon Mar 20 08:42:22 2023 +1100

    MAVFtp: fix locker static

commit 77b9c30
Author: Michael Oborne <mich146@hotmail.com>
Date:   Fri Mar 17 12:05:27 2023 +1100

    MAVFtp: add lock on dir list

commit c8108d4
Author: Michael Oborne <mich146@hotmail.com>
Date:   Wed Mar 15 21:15:17 2023 +1100

    Graphs: update

commit 2322a4a
Author: Michael Oborne <mich146@hotmail.com>
Date:   Wed Mar 15 21:09:38 2023 +1100

    Mavlink: update

commit 4778ffc
Author: Michael Oborne <mich146@hotmail.com>
Date:   Tue Mar 14 21:36:39 2023 +1100

    FlightPlanner: populate wps fro mavftp read

commit 3e2d41e
Author: Michael Oborne <mich146@hotmail.com>
Date:   Fri Mar 10 16:22:05 2023 +1100

    ULog: fix parser error

commit 767b0cc
Author: Henry Wurzburg <hwurzburg@yahoo.com>
Date:   Tue Mar 7 19:03:07 2023 -0600

    add DO_GRIPPER to Plane

commit 63b440b
Author: Henry Wurzburg <hwurzburg@yahoo.com>
Date:   Tue Mar 7 19:15:53 2023 -0600

    Clarify setup helper name

commit f616f88
Author: Randy Mackay <rmackay9@yahoo.com>
Date:   Wed Mar 8 20:38:04 2023 +0900

    mavcmd: add image start capture

commit d2157fb
Author: Bob Long <robertlong13@gmail.com>
Date:   Thu Mar 2 09:05:41 2023 +1100

    ConfigAdvanced: add support.ardupilot.org proxy

commit cf28cce
Author: Tatsuya Yamaguchi <susumu-336@hotmail.co.jp>
Date:   Wed Mar 1 10:42:14 2023 +0900

    GMapProvider: add Empty check for RefererUrl

commit 820ab90
Author: Bob Long <robertlong13@gmail.com>
Date:   Sun Mar 5 09:33:53 2023 +1100

    Xamarin: change http handler

    Fixes Android build

commit be68229
Author: Michael Oborne <mich146@hotmail.com>
Date:   Thu Feb 23 16:32:32 2023 +1100

    UdpSerialConnect: tweak connect to no defined source

commit 04a36ab
Author: Bob Long <robertlong13@gmail.com>
Date:   Mon Feb 20 16:12:08 2023 -0500

    temp: ForceCalibration buttons

commit 47490a8
Author: Michael Oborne <mich146@hotmail.com>
Date:   Sat Feb 18 17:05:29 2023 +1100

    Grid: fix spiral start location

commit 7b08dbc
Author: Michael Oborne <mich146@hotmail.com>
Date:   Sat Feb 18 08:56:46 2023 +1100

    Xamarin: add BLUETOOTH_CONNECT

commit 41f61b0
Author: Bob Long <robertlong13@gmail.com>
Date:   Sun Jan 1 11:09:13 2023 -0500

    MAVLink: add support for EFI fuel pressure

commit 9f339ff
Author: Tatsuya Yamaguchi <susumu-336@hotmail.co.jp>
Date:   Sat Dec 17 11:15:14 2022 +0900

    LogBrowse: use int.TryParse instead of int.Parse

commit 63c0e01
Author: Peter Hall <33176108+IamPete1@users.noreply.github.com>
Date:   Sun Jan 1 18:35:23 2023 +0000

    ArduPilot: MavLink: Param fetch: fix getting stuck with missing params

commit 53fb15b
Author: Peter Hall <33176108+IamPete1@users.noreply.github.com>
Date:   Sat Feb 11 15:03:18 2023 +0000

    Log: LogBrowse: allow ploting bit mask feilds individualy

commit c9fbd45
Author: Peter Hall <33176108+IamPete1@users.noreply.github.com>
Date:   Sat Feb 11 15:03:12 2023 +0000

    Extlibs: ArduPilot: LogMetaData: Parse bitmasks

commit 7850bd8
Author: Andrew Tridgell <andrew@tridgell.net>
Date:   Thu Feb 9 07:46:26 2023 +1100

    magcal: note that heading is true, not magnetic

    some users were putting in a magnetic heading

commit 32738c0
Author: Bob Long <robertlong13@gmail.com>
Date:   Wed Feb 15 05:03:02 2023 +0200

    HUD prearm status (ArduPilot#3057)

    * HUD: add prearm status indicator

commit 5dbaa51
Author: Michael Oborne <mich146@hotmail.com>
Date:   Wed Feb 15 08:40:29 2023 +1100

    Plugins: fix usings

commit 48700fd
Author: Michael Oborne <mich146@hotmail.com>
Date:   Wed Feb 15 08:39:42 2023 +1100

    Settings: dedupe list

commit 5851582
Author: Michael Oborne <mich146@hotmail.com>
Date:   Tue Feb 14 19:36:12 2023 +1100

    Plugins: example update

commit 278364d
Author: Michael Oborne <mich146@hotmail.com>
Date:   Wed Feb 8 09:54:02 2023 +1100

    nuget: update

commit fa78307
Author: Michael Oborne <mich146@hotmail.com>
Date:   Sun Feb 5 08:43:02 2023 +1100

    Image Match

commit 34bdf12
Author: Michael Oborne <mich146@hotmail.com>
Date:   Wed Feb 8 08:35:21 2023 +1100

    Nuget: DotSpatial.Projections to 3.0.1

commit fad1593
Author: Michael Oborne <mich146@hotmail.com>
Date:   Mon Feb 6 19:26:46 2023 +1100

    nuget: Newtonsoft.Json update

commit 8c3028b
Author: Michael Oborne <mich146@hotmail.com>
Date:   Mon Feb 6 19:22:56 2023 +1100

    Example: update externalapi

commit 5d4502b
Author: Michael Oborne <mich146@hotmail.com>
Date:   Mon Feb 6 13:31:33 2023 +1100

    example: update herelink example for recording to sdcard and photo to sdcard. (must have started video already)

commit 7a985cc
Author: Michael Oborne <mich146@hotmail.com>
Date:   Tue Jan 31 20:39:56 2023 +1100

    USBSerialForAndroid: fix sdk31 mutable

commit c5b005b
Author: Michael Oborne <mich146@hotmail.com>
Date:   Tue Jan 31 08:24:17 2023 +1100

    Drawing: add bitmap clone

commit a32b966
Author: Michael Oborne <mich146@hotmail.com>
Date:   Mon Jan 16 16:40:44 2023 +1100

    ConfigSecureAP: Add new securefw generator

commit 162801e
Author: Michael Oborne <mich146@hotmail.com>
Date:   Fri Jan 27 16:40:02 2023 +1100

    BouncyCastle: move to nuget

commit a1d3e93
Author: Michael Oborne <mich146@hotmail.com>
Date:   Sat Jan 28 21:54:58 2023 +1100

    Xamarin: fix api31 export requirement

commit bdba2d5
Author: Michael Oborne <mich146@hotmail.com>
Date:   Mon Jan 16 16:40:18 2023 +1100

    fft3: another method

commit eb09d34
Author: Bob Long <robertlong13@gmail.com>
Date:   Wed Feb 1 20:50:39 2023 -0500

    GithubActions: force Xcode 14.0.1

    The Xamarin version in macos-latest is not compatible with Xcode 14.2

commit f3aed96
Author: Peter Hall <33176108+IamPete1@users.noreply.github.com>
Date:   Sun Oct 9 22:30:50 2022 +0100

    ExtLibs: ArduPilot: Mavlink: try and pull AP firmware type from version string
  • Loading branch information
@LEGIONBOSS
LEGIONBOSS committed May 2, 2023
1 parent b2c44ce commit 7976e02
Show file tree
Hide file tree
Showing 2,837 changed files with 4,763 additions and 389,064 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/mac.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ jobs:
with:
submodules: true
fetch-depth: 10

- name: Set default Xcode 14.0.1
run: |
XCODE_ROOT=/Applications/Xcode_14.0.1.app
echo "MD_APPLE_SDK_ROOT=$XCODE_ROOT" >> $GITHUB_ENV
sudo xcode-select -s $XCODE_ROOT
- name: Cache multiple paths
uses: actions/cache@v2
Expand Down
93 changes: 86 additions & 7 deletions ChangeLog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,92 @@
*Mission Planner 1.3.79 - 06-12-2022
*Mission Planner 1.3.80 - 20-03-2023
MAVFtp: fix locker static
MAVFtp: add lock on dir list
Graphs: update
Mavlink: update
FlightPlanner: populate wps fro mavftp read
ULog: fix parser error
add DO_GRIPPER to Plane
Clarify setup helper name
mavcmd: add image start capture
ConfigAdvanced: add support.ardupilot.org proxy
GMapProvider: add Empty check for RefererUrl
Xamarin: change http handler
Fixes Android build
UdpSerialConnect: tweak connect to no defined source
temp: ForceCalibration buttons
Grid: fix spiral start location
Xamarin: add BLUETOOTH_CONNECT
MAVLink: add support for EFI fuel pressure
LogBrowse: use int.TryParse instead of int.Parse
ArduPilot: MavLink: Param fetch: fix getting stuck with missing params
Log: LogBrowse: allow ploting bit mask feilds individualy
Extlibs: ArduPilot: LogMetaData: Parse bitmasks
magcal: note that heading is true, not magnetic
HUD prearm status (#3057)
HUD: add prearm status indicator
Plugins: fix usings
Settings: dedupe list
Plugins: example update
nuget: update
Image Match
Nuget: DotSpatial.Projections to 3.0.1
nuget: Newtonsoft.Json update
Example: update externalapi
example: update herelink example for recording to sdcard and photo to sdcard. (must have started video already)
USBSerialForAndroid: fix sdk31 mutable
Drawing: add bitmap clone
ConfigSecureAP: Add new securefw generator
BouncyCastle: move to nuget
Xamarin: fix api31 export requirement
fft3: another method
GithubActions: force Xcode 14.0.1
ExtLibs: ArduPilot: Mavlink: try and pull AP firmware type from version string
Xamarin: fix api level to 31
Uploader: fix order of commands, to prevent bricking.
ConfigFirmware: allow offline access to certain parts
MAVFtp: fix single read mode after burst
MAVLinkInterface: add reparse to crc fail packets
MAVFtp: handle missing parts via single read
support PAYLOAD_PLACE on planes
ExtLibs: Allow for special characters in NTRIP connection string
HUD: use nofix icon for "no fix" instead of nogps
MissionPlannerLib: add GDALProvider shim
FlightPlanner: expose gdal opacity (map tools)
GDAL: support other linear projections
GDAL: init SpatialReference at startup
GDALProvider: add opacity option backend
AutoConnect: fix pipeline
Mavlink: update
GeoRef: add OpenDroneMap format *.geo
GeoRef: add min shutter drop, fix text console, show cam msgs
JpegSegmentReader: increase buffer size
ImageLabel: remove unused
Android: SDK 31
Parameters: added Blimp
fixes: "ERROR MissionPlanner.Utilities.ParameterMetaDataParser - Invalid MetaFrame Blimp"
ParameterMetaDataRepositoryAPMpdef: add blimp and heli as valid targets
GithubActions: cache glob
MapTool: use OpenStreetMap to zoom to locations
SRTM: migrate to terrain.ardupilot.org
FlightData: Add action for MAV_CMD_CONTROL_HIGH_LATENCY
AppX: update
MAVFTP params: use MAV's sysid/compid in tlog
SITL: add missing file after move to 64bit
Update generator.cs
There was a bug (actually wrong equation) on generator run_time print on the UI.
MyButton: add disabled text color
mavcmd: update description of CONDITION_YAW parameters
ConfigMount: remove pan stabilize checkbox
ConfigMount: remove mount Control parameter fields
Dotspatial: update
param: fixed exclusions for change of GND_ params to BARO params
MissionPlanner: revert dotspatial.projection version
HUD: add CPU on 100% #3011

*Mission Planner 1.3.79 - 06-12-2022
HttpClient: change timeouts
ConfigFirmwareManifest: fix timeout download bug
Linux: skip port detection via exist check

*Mission Planner 1.3.78 - 05-12-2022
ConfigMotorTest: update to use non obsolete
OSDConfigurator: tweak sizes
Expand Down Expand Up @@ -457,7 +541,6 @@ MainV2: remove tcpconsole
FlightData: order icons
Resources: shrink boat
fix filter param in the extended tuning page

*Mission Planner 1.3.77 - 16-03-2022
LowBrowse: sort instance numbers #2817
UdpSerialConnect: 30 second multicast join
Expand Down Expand Up @@ -553,7 +636,6 @@ Drawing: null checks
Xamarin: usbdevice null check
display DO_AUX_FUNCTION in mission editor
Update Czech map provider for the new api format.

*Mission Planner 1.3.76 - 25-12-2021
Vario: move to async
FlightPlanner: clear mavmarkers every 10 seconds
Expand Down Expand Up @@ -716,7 +798,6 @@ ConfigADSB: disable custom adsb config
Mavlink: upstream update
ConfigRawParam: fix offline local conversion
DisplayView: add more disable options

*Mission Planner 1.3.75 - 1-08-2021
Xamarin: api 30
Xamarin: remove GDAL
Expand Down Expand Up @@ -1319,7 +1400,6 @@ HUD message color depends on severity
Xamarin: picturerecorder
HUD: invalidate on resize
Xamarin: fix ref

*Mission Planner 1.3.74 - 15-09-2020
ConfigHWCompass2: fix orient display
LogBrowse: tooltips for msgs
Expand Down Expand Up @@ -1413,7 +1493,6 @@ FlightData: map - used planned home if real home is 0 (no gps)
plugin : example8 fix cross thread call
FlightData: fix distancebar with takeoff as first cmd
Generator: fix scope issue

*Mission Planner 1.3.73 - 13-08-2020
UAVCAN update, bps stats, performance
Drawing: change name
Expand Down
77 changes: 77 additions & 0 deletions Controls/PrearmStatus.Designer.cs
View file

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

79 changes: 79 additions & 0 deletions Controls/PrearmStatus.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
using log4net;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace MissionPlanner.Controls
{
public partial class PrearmStatus : Form
{
private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

private DateTime lastRequestTime = DateTime.MinValue;
private DateTime searchTime = DateTime.MinValue;
public PrearmStatus()
{
InitializeComponent();

Utilities.ThemeManager.ApplyThemeTo(this);

updatetexttimer.Start();
requestchecktimer.Start();
requestchecktimer_Tick(null, null);
}

private void requestchecktimer_Tick(object sender, EventArgs e)
{
if (MainV2.comPort.MAV.cs.prearmstatus) return; // Don't request prearm checks if we are ready to arm

try
{
// Request prearm checks to be performed
MainV2.comPort.doCommand(
(byte)MainV2.comPort.sysidcurrent, (byte)MainV2.comPort.compidcurrent,
MAVLink.MAV_CMD.RUN_PREARM_CHECKS,
0, 0, 0, 0, 0, 0, 0,
false // don't require ack
);

lastRequestTime = DateTime.Now;

}
catch (Exception ex)
{
log.Error(ex.Message);
}
}

private void updatetexttimer_Tick(object sender, EventArgs e)
{
// If armed, close the form
if(MainV2.comPort.MAV.cs.armed) this.Close();

// If prearm prearm checks are passing, display a message
if (MainV2.comPort.MAV.cs.prearmstatus)
{
TXT_PrearmErrors.Text = "Ready to Arm";
return;
}

// If it has been at least 1 second since the last request, search for all messages since the last request
if (DateTime.Now > lastRequestTime.AddSeconds(1))
searchTime = lastRequestTime;

// Fill text box with all unique messages since searchTime that start with "PreArm:"
var prearmMessages = MainV2.comPort.MAV.cs.messages.Where(m => m.time > searchTime && m.message.ToLower().StartsWith("prearm:")).Select(m => m.message).Distinct();
// If there are no messages, inform the user
if (!prearmMessages.Any())
prearmMessages = new[] { "Prearm checks failing", "Waiting for error messages..." };
TXT_PrearmErrors.Text = string.Join(Environment.NewLine, prearmMessages);
}
}
}
Loading

0 comments on commit 7976e02

Please sign in to comment.