Merge pull request #1511 from squilter/update_kill_switch_for_AC3.3

Bring back kill switch
DroidPlanner · Jul 9, 2015 · 379c813 · 379c813
2 parents ea0c4ae + 356cb43
commit 379c813
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 34 deletions.
diff --git a/Android/build.gradle b/Android/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     compile 'com.android.support:cardview-v7:22.1.0'
     compile 'com.android.support:recyclerview-v7:22.1.0'
 
-    compile 'com.o3dr.android:dronekit-android:2.3.32'
+    compile 'com.o3dr.android:dronekit-android:2.3.34'
 
     compile 'me.grantland:autofittextview:0.2.1'
     compile(name:'shimmer-android-release', ext:'aar')

diff --git a/Android/res/menu/menu_super_activiy.xml b/Android/res/menu/menu_super_activiy.xml
@@ -20,22 +20,12 @@
             android:id="@+id/menu_download_mission"
             app:showAsAction="never"
             android:title="@string/download_mission"/>
-
         <item
-            android:id="@+id/menu_advanced"
+            android:id="@+id/menu_kill_switch"
+            app:showAsAction="never"
             android:enabled="false"
             android:visible="false"
-            android:title="@string/pref_advanced"
-            app:showAsAction="never">
-            <menu>
-                <item
-                    android:id="@+id/menu_kill_switch"
-                    app:showAsAction="never"
-                    android:enabled="false"
-                    android:visible="false"
-                    android:title="KILL SWITCH"/>
-            </menu>
-        </item>
+            android:title="Kill Switch"/>
 
     </group>
 

diff --git a/Android/res/values-de/strings.xml b/Android/res/values-de/strings.xml
@@ -367,7 +367,7 @@
     <string name="file_saved_success">Datei gespeichert</string>
     <string name="firmware_version">Firmware-Version</string>
     <string name="help_item_description">Wie man eine Mission plant und fliegt</string>
-    <string name="label_advaned">Erweitert</string>
+    <string name="label_advanced">Erweitert</string>
     <string name="label_altitude_step">Höhenschritt</string>
     <string name="label_enter_filename">Dateinamen eingeben</string>
     <string name="label_steps_count">Anzahl Schritte</string>

diff --git a/Android/res/values-it/strings.xml b/Android/res/values-it/strings.xml
@@ -363,7 +363,7 @@
     <string name="file_saved_success">File salvato</string>
     <string name="firmware_version">Versione Firmware</string>
     <string name="help_item_description">Come pianificare e avviare una missione</string>
-    <string name="label_advaned">Avanzate</string>
+    <string name="label_advanced">Avanzate</string>
     <string name="pref_title_mapbox">Preferenze MapBox</string>
     <string name="pref_tts_periodic_alt">Altezza</string>
     <string name="pref_tts_periodic_bat_volt">Voltaggio batteria</string>

diff --git a/Android/res/values-zh-rCN/strings.xml b/Android/res/values-zh-rCN/strings.xml
@@ -453,7 +453,7 @@
     <!-- Help -->
     <string name="help_item_description">如何规划和执行飞行任务</string>
 
-    <string name="label_advaned">高级设定</string>
+    <string name="label_advanced">高级设定</string>
     <string name="label_steps_count">步数</string>
     <string name="label_altitude_step">高度级别</string>
     <string name="menu_search_toggle">切换搜索</string>

diff --git a/Android/res/values-zh-rTW/strings.xml b/Android/res/values-zh-rTW/strings.xml
@@ -429,7 +429,7 @@
 
     <!-- Help -->
     <string name="help_item_description">如何設定和實際操作任務，請點我看影片</string>
-    <string name="label_advaned">進階設定</string>
+    <string name="label_advanced">進階設定</string>
     <string name="label_steps_count">階層數</string>
     <string name="label_altitude_step">階層高度</string>
     <string name="menu_search_toggle">切換搜尋</string>

diff --git a/Android/res/values/strings.xml b/Android/res/values/strings.xml
@@ -474,7 +474,7 @@
     <!-- Help -->
     <string name="help_item_description">How to plan and fly a mission</string>
 
-    <string name="label_advaned">Advanced</string>
+    <string name="label_advanced">Advanced</string>
     <string name="label_steps_count">Number of Steps</string>
     <string name="label_altitude_step">Altitude Step</string>
     <string name="menu_search_toggle">Toggle Search</string>
@@ -546,7 +546,7 @@
     <string name="pref_map_rotation_title">Enable map rotation</string>
     <string name="pref_map_rotation_summary">Check to enable the ability to rotate the map.</string>
     <string name="pref_advance_menu_title">Advanced Menu Options</string>
-    <string name="pref_enable_kill_switch_summary">If enabled, a Kill Switch option will appear under the Advanced section in the menu, allowing to disarm the vehicle immediately.</string>
+    <string name="pref_enable_kill_switch_summary">If enabled, a Kill Switch option will appear in the menu, allowing immediate vehicle disarming.</string>
     <string name="pref_enable_kill_switch_title">Enable Kill Switch</string>
     <string name="pref_enable_udp_server_title">Enable UDP server ping</string>
     <string name="pref_udp_server_ping_summary">Enable to allow the app to periodically ping the udp server.</string>

diff --git a/Android/res/xml/preferences.xml b/Android/res/xml/preferences.xml
@@ -297,7 +297,6 @@
 
             </PreferenceCategory>
 
-            <!-- Disabling kill switch until arducopter v3.3 is out.
             <PreferenceCategory
                 android:title="@string/pref_advance_menu_title">
 
@@ -307,7 +306,7 @@
                     android:summary="@string/pref_enable_kill_switch_summary"
                     android:title="@string/pref_enable_kill_switch_title"/>
 
-            </PreferenceCategory>-->
+            </PreferenceCategory>
         </PreferenceScreen>
     </PreferenceCategory>
 

diff --git a/Android/src/org/droidplanner/android/activities/helpers/SuperUI.java b/Android/src/org/droidplanner/android/activities/helpers/SuperUI.java
@@ -14,7 +14,11 @@
 import android.view.MenuItem;
 
 import com.o3dr.android.client.Drone;
+import com.o3dr.android.client.apis.drone.DroneStateApi;
 import com.o3dr.services.android.lib.drone.attribute.AttributeEvent;
+import com.o3dr.services.android.lib.drone.attribute.AttributeType;
+import com.o3dr.services.android.lib.drone.property.Type;
+import com.o3dr.services.android.lib.drone.property.VehicleMode;
 
 import org.droidplanner.android.DroidPlannerApp;
 import org.droidplanner.android.R;
@@ -175,12 +179,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
             menu.setGroupEnabled(R.id.menu_group_connected, true);
             menu.setGroupVisible(R.id.menu_group_connected, true);
 
-            final boolean isAdvancedEnabled = mAppPrefs.isAdvancedMenuEnabled();
-            final MenuItem advancedSubMenu = menu.findItem(R.id.menu_advanced);
-            advancedSubMenu.setEnabled(isAdvancedEnabled);
-            advancedSubMenu.setVisible(isAdvancedEnabled);
-
-            //Enable specific sub items within the advanced menu section.
             final MenuItem killSwitchItem = menu.findItem(R.id.menu_kill_switch);
             final boolean isKillEnabled = mAppPrefs.isKillSwitchEnabled();
             killSwitchItem.setEnabled(isKillEnabled);
@@ -256,7 +254,7 @@ public void onNo() {
                 SlideToUnlockDialog unlockDialog = SlideToUnlockDialog.newInstance("disable vehicle", new Runnable() {
                     @Override
                     public void run() {
-                        dpApp.getDrone().arm(false);
+                        DroneStateApi.arm(dpApp.getDrone(), false, true);
                     }
                 });
                 unlockDialog.show(getSupportFragmentManager(), "Slide to use the Kill Switch");

diff --git a/Android/src/org/droidplanner/android/fragments/SettingsFragment.java b/Android/src/org/droidplanner/android/fragments/SettingsFragment.java
@@ -261,7 +261,6 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 }
             });
         }
-
         final CheckBoxPreference killSwitch = (CheckBoxPreference) findPreference(DroidPlannerPrefs.PREF_ENABLE_KILL_SWITCH);
         if(killSwitch != null) {
             killSwitch.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {

diff --git a/Android/src/org/droidplanner/android/utils/prefs/DroidPlannerPrefs.java b/Android/src/org/droidplanner/android/utils/prefs/DroidPlannerPrefs.java
@@ -418,10 +418,6 @@ public boolean isMapRotationEnabled(){
         return prefs.getBoolean(PREF_ENABLE_MAP_ROTATION, DEFAULT_ENABLE_MAP_ROTATION);
     }
 
-    public boolean isAdvancedMenuEnabled(){
-        return isKillSwitchEnabled();
-    }
-
     public boolean isKillSwitchEnabled(){
 		return prefs.getBoolean(PREF_ENABLE_KILL_SWITCH, DEFAULT_ENABLE_KILL_SWITCH);
 	}
@@ -433,6 +429,7 @@ public int getMaxAltitude(){
 		return getAltitudePreference(PREF_ALT_MAX_VALUE, DEFAULT_MAX_ALT);
 	}
 
+
 	/**
 	 * @return the min altitude in meters
 	 */
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 });
             }
             final CheckBoxPreference killSwitch = (CheckBoxPreference) findPreference(DroidPlannerPrefs.PREF_ENABLE_KILL_SWITCH);
             if(killSwitch != null) {
                 killSwitch.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@@ Expand Down @@