Merge branch 'master' into tmp

Author: arthurbenemann

Android/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
           package="org.droidplanner"
-          android:versionCode="96"
+          android:versionCode="97"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk

ChangeLog.md

@@ -8,6 +8,9 @@ Our convention for release control is the following (for a release like DPvA.B.C
 All the changes are logged below (preferable with the pull request numbers in parenteses):
 
 # Releases
+## Droidplanner v2.7.6
+* Warn user about all HIGH_SEVERITY messages from the drone (#1066)
+
 ## Droidplanner v2.7.5
 * Fix follow-me for "heading" related follow modes (#1065)
 * Complementing German translation (#1059)

Core/src/org/droidplanner/core/MAVLink/MavLinkMsgHandler.java

@@ -22,6 +22,7 @@
 
 public class MavLinkMsgHandler {
 
+	private static final byte SEVERITY_HIGH = 3;
 	private Drone drone;
 
 	public MavLinkMsgHandler(Drone drone) {
@@ -99,15 +100,13 @@ public void receiveData(MAVLinkMessage msg) {
 			//also less important things like "erasing logs" and "calibrating barometer"
 			msg_statustext msg_statustext = (msg_statustext) msg;
 			String message = msg_statustext.getText();
-			//TODO read anything that is "SEVERITY_HIGH", but only read certain "SEVERITY_LOW"s
-			if(message.equals("Low Battery!")){
+
+			if (msg_statustext.severity >= SEVERITY_HIGH) {
 				drone.getState().setWarning(message);
-			}
-			if (message.length() > 7) {
-				if (message.substring(0, 7).equals("PreArm:")
-						|| message.substring(0, 4).equals("Arm:")) {
-					drone.getState().setWarning(message);
-				}
+				break;
+			} else if (message.equals("Low Battery!")) {
+				drone.getState().setWarning(message);
+				break;
 			}
 			break;
 		}