Merge branch 'master' into beta

Author: arthurbenemann

Android/res/values/preferences_keys.xml

@@ -26,6 +26,7 @@ This file is used to store the preferences keys so that it's accessible and modi
     <string name="pref_storage_key">pref_storage</string>
     <string name="pref_rc_mode_key">pref_rc_mode</string>
     <string name="pref_mavlink_version_key">pref_mavlink_version</string>
+    <string name="pref_firmware_version_key">pref_firmware_version</string>    
     <string name="pref_usage_statistics_key">pref_usage_statistics</string>
     <string name="pref_version_key">pref_version</string>
     <string name="pref_request_max_volume_key">pref_request_max_volume</string>

Android/res/values/strings.xml

@@ -450,6 +450,7 @@
     <string name="normal_waypoint_toggle">Normal</string>
     <string name="spline_waypoint_toggle">Spline</string>
     <string name="mavlink_version">Mavlink Version</string>
+    <string name="firmware_version">Firmware Version</string>    
     <string name="empty_content">--</string>
     <string name="usage_statistics">Usage Statistics</string>
     <string name="pref_usage_statistics_title">Send usage statistics</string>

Android/res/xml/preferences.xml

@@ -415,6 +415,13 @@
             android:selectable="false"
             android:shouldDisableView="false"
             android:title="@string/version" />
+        <Preference
+            android:enabled="false"
+            android:key="@string/pref_firmware_version_key"
+            android:persistent="false"
+            android:selectable="false"
+            android:shouldDisableView="false"
+            android:title="@string/firmware_version" />
         <Preference
             android:enabled="false"
             android:key="@string/pref_mavlink_version_key"

Android/src/org/droidplanner/android/fragments/SettingsFragment.java

@@ -349,6 +349,17 @@ private void updateMavlinkVersionPreference(String version) {
 		}
 	}
 
+	private void updateFirmwareVersionPreference(String firmwareVersion) {
+		final Preference firmwareVersionPref = findPreference(getString(R.string.pref_firmware_version_key));
+		if (firmwareVersionPref != null) {
+			if (firmwareVersion == null) {
+				firmwareVersionPref.setSummary(getString(R.string.empty_content));
+			} else {
+				firmwareVersionPref.setSummary(firmwareVersion);
+			}
+		}
+	}
+
 	private boolean updateMapSettingsPreference(final String mapProviderName) {
 		final DPMapProvider mapProvider = DPMapProvider.getMapProvider(mapProviderName);
 		if (mapProvider == null)
@@ -447,6 +458,8 @@ public void onStart() {
 		} else {
 			updateMavlinkVersionPreference(null);
 		}
+		
+		updateFirmwareVersionPreference(drone.getFirmwareVersion());
 
 		drone.addDroneListener(this);
 	}
@@ -477,12 +490,16 @@ public void onDroneEvent(DroneEventsType event, Drone drone) {
 		switch (event) {
 		case DISCONNECTED:
 			updateMavlinkVersionPreference(null);
+			updateFirmwareVersionPreference(null);
 			break;
 
 		case HEARTBEAT_FIRST:
 		case HEARTBEAT_RESTORED:
 			updateMavlinkVersionPreference(String.valueOf(drone.getMavlinkVersion()));
 			break;
+		case FIRMWARE:
+			updateFirmwareVersionPreference(drone.getFirmwareVersion());
+			break;
 		default:
 			break;
 		}

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

@@ -107,6 +107,9 @@ public void receiveData(MAVLinkMessage msg) {
 			} else if (message.equals("Low Battery!")) {
 				drone.getState().setWarning(message);
 				break;
+			} else if (message.contains("ArduCopter")){
+				drone.setFirmwareVersion(message);
+				break;
 			}
 			break;
 		}

Core/src/org/droidplanner/core/drone/DroneImpl.java

@@ -233,4 +233,14 @@ public GuidedPoint getGuidedPoint() {
 	public Calibration getCalibrationSetup() {
 		return calibrationSetup;
 	}
+
+	@Override
+	public String getFirmwareVersion() {
+		return type.getFirmwareVersion();
+	}
+
+	@Override
+	public void setFirmwareVersion(String message) {
+		type.setFirmwareVersion(message);		
+	}
 }

Core/src/org/droidplanner/core/drone/DroneInterfaces.java

@@ -200,7 +200,11 @@ public enum DroneEventsType {
 		/**
 		 *
 		 */
-		WARNING_SIGNAL_WEAK,
+		WARNING_SIGNAL_WEAK, 
+		/**
+		 * Announces that a new version for the firmware has been received
+		 */
+		FIRMWARE,
 	}
 
 	public interface OnDroneListener {

Core/src/org/droidplanner/core/drone/variables/Type.java

@@ -10,6 +10,7 @@
 public class Type extends DroneVariable {
 
 	private int type = MAV_TYPE.MAV_TYPE_GENERIC;
+	private String firmwareVersion = null;
 
 	public Type(Drone myDrone) {
 		super(myDrone);
@@ -55,4 +56,13 @@ public FirmwareType getFirmwareType() {
 															// unsupported
 	}
 
+	public String getFirmwareVersion() {
+		return firmwareVersion ;
+	}
+
+	public void setFirmwareVersion(String message) {
+		firmwareVersion = message;
+		myDrone.notifyDroneEvent(DroneEventsType.FIRMWARE);
+	}
+
 }

Core/src/org/droidplanner/core/model/Drone.java

@@ -91,4 +91,8 @@ public void setAltitudeGroundAndAirSpeeds(double altitude, double groundSpeed, d
 			double climb);
 
 	public void setDisttowpAndSpeedAltErrors(double disttowp, double alt_error, double aspd_error);
+
+	public String getFirmwareVersion();
+
+	public void setFirmwareVersion(String message);
 }