Merge branch 'master' into beta

DroidPlanner · Nov 20, 2014 · 4fff92c · 4fff92c
2 parents 5d2f3e6 + aa47024
commit 4fff92c
Show file tree

Hide file tree

Showing 493 changed files with 18,245 additions and 20,150 deletions.
diff --git a/Android/AndroidManifest.xml b/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="110"
+          android:versionCode="111"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk

diff --git a/Android/assets/CameraInfo/Canon S100.xml b/Android/assets/CameraInfo/Canon S100.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cameraInfo>
+    <Name>Canon S100</Name>
+    <SensorWidth>7.60</SensorWidth>
+    <SensorHeight>5.70</SensorHeight>
+    <SensorResolution>12.1</SensorResolution>
+    <FocalLength>5.2</FocalLength>
+    <Orientation>Portrait</Orientation>
+</cameraInfo>
diff --git a/Android/res/values-zh-rCN/strings.xml b/Android/res/values-zh-rCN/strings.xml
diff --git a/Android/res/xml-zh-rCN/checklist_default.xml b/Android/res/xml-zh-rCN/checklist_default.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<preflightcheck
+    title="Pre-Flight Checklist"
+    type="APM"
+    version="1" >
+
+    <category label="使用者检查清单" >
+        <check_item
+            description="确认相机已连接且打开电源"
+            editable="yes"
+            mandatory="yes"
+            title="相机已连接并打开电源" />
+    </category>
+    <category label="控制面板" >
+        <check_item
+            description="确认控制面板在正确的方向"
+            editable="yes"
+            mandatory="yes"
+            title="副翼(Aileron)" />
+        <check_item
+            description="确认控制面板在正确的方向"
+            editable="yes"
+            mandatory="yes"
+            title="升降舵(Elevator)" />
+        <check_item
+            description="确认控制面板在正确的方向"
+            editable="yes"
+            mandatory="yes"
+            title="方向舵(Rudder)" />
+    </category>
+    <category label="系统检查清单" >
+        <switch_item
+            description="数传连线状况"
+            editable="yes"
+            mandatory="yes"
+            system_tag="SYS_CONNECTION_STATE"
+            title="连接数传" />
+
+        <value_item
+            description="显示预设高度"
+            editable="yes"
+            mandatory="yes"
+            minimum_val="10"
+            nominal_val="20"
+            system_tag="SYS_DEF_ALT"
+            title="预设高度 "
+            unit="%0.2fm" />
+
+        <level_item
+            description="显示GPS卫星数量"
+            editable="no"
+            mandatory="yes"
+            maximum_val="8"
+            minimum_val="5"
+            nominal_val="6"
+            system_tag="SYS_GPS3D_LVL"
+            title="GPS(3D) Sats"
+            unit="%.0f Sats." />
+        <level_item
+            description="显示电池电量"
+            editable="no"
+            mandatory="yes"
+            maximum_val="100"
+            minimum_val="75"
+            nominal_val="80"
+            system_tag="SYS_BATTREM_LVL"
+            title="电池电量"
+            unit="%.1f%%" />
+        <level_item
+            description="显示电池电压数"
+            editable="no"
+            mandatory="yes"
+            maximum_val="13"
+            minimum_val="10.5"
+            nominal_val="11.1"
+            system_tag="SYS_BATTVOL_LVL"
+            title="电池电压数"
+            unit="%.1fV" />
+        <level_item
+            description="显示电池电流数"
+            editable="no"
+            mandatory="yes"
+            maximum_val="20"
+            minimum_val="5"
+            nominal_val="10"
+            system_tag="SYS_BATTCUR_LVL"
+            title="电池电流数"
+            unit="%.1fA" />
+    </category>
+
+</preflightcheck>
diff --git a/Android/res/xml-zh-rCN/checklist_full.xml b/Android/res/xml-zh-rCN/checklist_full.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<preflightcheck
+    title="Pre-Flight Checklist"
+    type="APM"
+    version="1" >
+
+    <category label="使用者检查清单" >
+        <check_item
+            description="确认相机已连接且打开电源"
+            editable="yes"
+            mandatory="yes"
+            title="相机已连接并打开电源" />
+    </category>
+    <category label="控制面板" >
+        <check_item
+            description="确认控制面板在正确的方向"
+            editable="yes"
+            mandatory="yes"
+            title="副翼(Aileron)" />
+        <check_item
+            description="确认控制面板在正确的方向"
+            editable="yes"
+            mandatory="yes"
+            title="升降舵(Elevator)" />
+        <check_item
+            description="确认控制面板在正确的方向"
+            editable="yes"
+            mandatory="yes"
+            title="方向舵(Rudder)" />
+    </category>
+    <category label="系统检查清单" >
+        <switch_item
+            description="数传连线状况"
+            editable="yes"
+            mandatory="yes"
+            system_tag="SYS_CONNECTION_STATE"
+            title="连接数传" />
+
+        <value_item
+            description="显示预设高度"
+            editable="yes"
+            mandatory="yes"
+            minimum_val="10"
+            nominal_val="20"
+            system_tag="SYS_DEF_ALT"
+            title="预设高度 "
+            unit="%0.2fm" />
+
+        <level_item
+            description="显示GPS卫星数"
+            editable="no"
+            mandatory="yes"
+            maximum_val="8"
+            minimum_val="5"
+            nominal_val="6"
+            system_tag="SYS_GPS3D_LVL"
+            title="GPS(3D) Sats"
+            unit="%.0f Sats." />
+        <level_item
+            description="显示电池电量"
+            editable="no"
+            mandatory="yes"
+            maximum_val="100"
+            minimum_val="75"
+            nominal_val="80"
+            system_tag="SYS_BATTREM_LVL"
+            title="电池电量"
+            unit="%.1f%%" />
+        <level_item
+            description="显示电池电压数"
+            editable="no"
+            mandatory="yes"
+            maximum_val="13"
+            minimum_val="10.5"
+            nominal_val="11.1"
+            system_tag="SYS_BATTVOL_LVL"
+            title="电池电压数"
+            unit="%.1fV" />
+        <level_item
+            description="显示电池电流"
+            editable="no"
+            mandatory="yes"
+            maximum_val="20"
+            minimum_val="5"
+            nominal_val="10"
+            system_tag="SYS_BATTCUR_LVL"
+            title="电池电流数"
+            unit="%.1fA" />
+    </category>
+    <category label="杂项" >
+        <select_item
+            description="选择连接类型"
+            mandatory="yes"
+            optionlist="蓝牙,USB,WiFi"
+            selectindex="0"
+            system_tag="SYS_TELEMETRY_TYPE"
+            title="数传连线类型 " />
+
+        <toggle_item
+            description="系统解锁或锁定开关"
+            editable="yes"
+            mandatory="yes"
+            system_tag="SYS_ARM_STATE"
+            title="系统解锁" />
+
+        <radio_item
+            description="选择连线状态"
+            editable="yes"
+            mandatory="yes"
+            optionlist="连接,断开"
+            selectindex="0"
+            system_tag="SYS_CONNECT_STATE"
+            title="数传连线状态" />
+        <radio_item
+            description="选择无人机类型"
+            editable="yes"
+            mandatory="yes"
+            optionlist="Quad+,Quadx,Hex+,HexX"
+            selectindex="0"
+            title="无人机类型" />
+    </category>
+
+</preflightcheck>
diff --git a/Android/src/org/droidplanner/android/activities/EditorActivity.java b/Android/src/org/droidplanner/android/activities/EditorActivity.java
@@ -49,7 +49,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.MAVLink.Messages.ardupilotmega.msg_mission_item;
+import com.MAVLink.common.msg_mission_item;
 import com.google.android.gms.analytics.HitBuilders;
 
 /**

diff --git a/Android/src/org/droidplanner/android/activities/LocatorActivity.java b/Android/src/org/droidplanner/android/activities/LocatorActivity.java
@@ -1,17 +1,7 @@
 package org.droidplanner.android.activities;
 
-import android.location.Location;
-import android.location.LocationListener;
-import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.MAVLink.Messages.ardupilotmega.msg_global_position_int;
+import java.util.LinkedList;
+import java.util.List;
 
 import org.droidplanner.R;
 import org.droidplanner.android.dialogs.openfile.OpenFileDialog;
@@ -23,8 +13,18 @@
 import org.droidplanner.core.helpers.coordinates.Coord2D;
 import org.droidplanner.core.helpers.geoTools.GeoTools;
 
-import java.util.LinkedList;
-import java.util.List;
+import android.location.Location;
+import android.location.LocationListener;
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.MAVLink.common.msg_global_position_int;
 
 /**
  * This implements the map locator activity. The map locator activity allows the user to find

diff --git a/Android/src/org/droidplanner/android/communication/connection/AndroidMavLinkConnection.java b/Android/src/org/droidplanner/android/communication/connection/AndroidMavLinkConnection.java
@@ -14,7 +14,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.MAVLink.Messages.MAVLinkPacket;
+import com.MAVLink.MAVLinkPacket;
 
 public abstract class AndroidMavLinkConnection extends MavLinkConnection {
 

diff --git a/Android/src/org/droidplanner/android/communication/service/MAVLinkClient.java b/Android/src/org/droidplanner/android/communication/service/MAVLinkClient.java
@@ -1,5 +1,7 @@
 package org.droidplanner.android.communication.service;
 
+import java.util.concurrent.atomic.AtomicReference;
+
 import org.droidplanner.R;
 import org.droidplanner.core.MAVLink.MAVLinkStreams;
 import org.droidplanner.core.MAVLink.connection.MavLinkConnection;
@@ -13,10 +15,8 @@
 import android.os.IBinder;
 import android.widget.Toast;
 
+import com.MAVLink.MAVLinkPacket;
 import com.MAVLink.Messages.MAVLinkMessage;
-import com.MAVLink.Messages.MAVLinkPacket;
-
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Provide a common class for some ease of use functionality

diff --git a/Android/src/org/droidplanner/android/communication/service/MAVLinkService.java b/Android/src/org/droidplanner/android/communication/service/MAVLinkService.java
@@ -15,7 +15,7 @@
 import android.os.IBinder;
 import android.util.Log;
 
-import com.MAVLink.Messages.MAVLinkPacket;
+import com.MAVLink.MAVLinkPacket;
 import com.google.android.gms.analytics.HitBuilders;
 
 /**

diff --git a/Android/src/org/droidplanner/android/dialogs/DroneshareDialog.java b/Android/src/org/droidplanner/android/dialogs/DroneshareDialog.java
@@ -14,7 +14,6 @@
 import android.view.View;
 import android.widget.EditText;
 import android.widget.RadioButton;
-import android.widget.Toast;
 
 import com.google.android.gms.analytics.HitBuilders;
 

diff --git a/Android/src/org/droidplanner/android/dialogs/EditInputDialog.java b/Android/src/org/droidplanner/android/dialogs/EditInputDialog.java
@@ -1,14 +1,14 @@
 package org.droidplanner.android.dialogs;
 
+import org.droidplanner.R;
+
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
 
-import org.droidplanner.R;
-
 /**
  * Created by fhuya on 10/14/14.
  */

diff --git a/Android/src/org/droidplanner/android/dialogs/YesNoDialog.java b/Android/src/org/droidplanner/android/dialogs/YesNoDialog.java
@@ -1,5 +1,7 @@
 package org.droidplanner.android.dialogs;
 
+import org.droidplanner.R;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -9,8 +11,6 @@
 import android.view.View;
 import android.widget.TextView;
 
-import org.droidplanner.R;
-
 public class YesNoDialog extends DialogFragment {
 
     protected final static String EXTRA_TITLE = "title";

diff --git a/Android/src/org/droidplanner/android/dialogs/YesNoWithPrefsDialog.java b/Android/src/org/droidplanner/android/dialogs/YesNoWithPrefsDialog.java
@@ -1,21 +1,20 @@
 package org.droidplanner.android.dialogs;
 
+import org.droidplanner.R;
+import org.droidplanner.android.utils.analytics.GAUtils;
+import org.droidplanner.android.utils.prefs.DroidPlannerPrefs;
+
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.Preference;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toast;
 
 import com.google.android.gms.analytics.HitBuilders;
 
-import org.droidplanner.R;
-import org.droidplanner.android.utils.analytics.GAUtils;
-import org.droidplanner.android.utils.prefs.DroidPlannerPrefs;
-
 /**
  * Provides a yes/no (ok/cancel) dialog with the option to permanently disable
  * the dialog with a checkbox.