Merge branch 'release/v1.1.0'

fewlaps · Feb 7, 2016 · c069331 · c069331
2 parents 53e9303 + 953cf48
commit c069331
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.fewlaps.flone"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 7
-        versionName "1.0"
+        versionCode 8
+        versionName "1.1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {

diff --git a/app/src/main/java/com/fewlaps/flone/io/bean/UserTouchModeChangedEvent.java b/app/src/main/java/com/fewlaps/flone/io/bean/UserTouchModeChangedEvent.java
@@ -0,0 +1,13 @@
+package com.fewlaps.flone.io.bean;
+
+public class UserTouchModeChangedEvent {
+    private boolean isTouching = false;
+
+    public UserTouchModeChangedEvent(boolean isTouching) {
+        this.isTouching = isTouching;
+    }
+
+    public boolean isTouching() {
+        return isTouching;
+    }
+}
diff --git a/app/src/main/java/com/fewlaps/flone/service/DroneService.java b/app/src/main/java/com/fewlaps/flone/service/DroneService.java
@@ -19,6 +19,7 @@
 import com.fewlaps.flone.io.bean.DroneConnectionStatusChanged;
 import com.fewlaps.flone.io.bean.DroneSensorData;
 import com.fewlaps.flone.io.bean.MultiWiiValues;
+import com.fewlaps.flone.io.bean.UserTouchModeChangedEvent;
 import com.fewlaps.flone.io.bean.UsingRawDataChangeRequest;
 import com.fewlaps.flone.io.communication.Bluetooth;
 import com.fewlaps.flone.io.communication.Communication;
@@ -61,6 +62,7 @@ public class DroneService extends BaseService {
     public MultirotorData protocol;
 
     public boolean running = false;
+    public boolean isUserTouching = false;
 
     private Handler connectTask = new Handler();
     private Handler telemetryTask = new Handler();
@@ -155,6 +157,10 @@ public void onEventMainThread(CalibrateDroneMagnetometerRequest event) {
         protocol.SendRequestMSP_MAG_CALIBRATION();
     }
 
+    public void onEventMainThread(UserTouchModeChangedEvent event) {
+        isUserTouching = event.isTouching();
+    }
+
     private final Runnable reconnectRunnable = new Runnable() {
         public void run() {
             Log.d("RUNNABLE", "reconnectRunnable.run()");
@@ -217,6 +223,13 @@ private void updateRcWithInputData() {
         } else {
             if (armed) {
                 rc.set(RCSignals.AUX1, RCSignals.RC_MAX);
+                if (isUserTouching) {
+                    rc.set(RCSignals.AUX2, RCSignals.RC_MIN);
+                } else {
+                    rc.set(RCSignals.AUX2, RCSignals.RC_MAX);
+                }
+                Log.i("AUX2", "" + rc.get(RCSignals.AUX2));
+
                 rc.setThrottle((int) phoneSensorsInput.getThrottle());
 
                 yaw = RCSignals.RC_MID + ((int) yawCalculator.getYaw(droneSensorInput.getHeading() + headingDifference, phoneSensorsInput.getHeading()));

diff --git a/app/src/main/java/com/fewlaps/flone/view/activity/FlyActivity.java b/app/src/main/java/com/fewlaps/flone/view/activity/FlyActivity.java
@@ -23,6 +23,7 @@
 import com.fewlaps.flone.io.bean.ArmedDataChangeRequest;
 import com.fewlaps.flone.io.bean.DelayData;
 import com.fewlaps.flone.io.bean.DroneSensorData;
+import com.fewlaps.flone.io.bean.UserTouchModeChangedEvent;
 import com.fewlaps.flone.io.communication.RCSignals;
 import com.fewlaps.flone.io.input.phone.PhoneOutputData;
 import com.fewlaps.flone.io.input.phone.ScreenThrottleData;
@@ -93,7 +94,10 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
                 int action = event.getAction();
-                if (action == MotionEvent.ACTION_MOVE || action == MotionEvent.ACTION_DOWN) {
+                if (action == MotionEvent.ACTION_DOWN) {
+                    ScreenThrottleData.instance.setThrottle((int) event.getY());
+                    EventBus.getDefault().post(new UserTouchModeChangedEvent(true));
+                } else if (action == MotionEvent.ACTION_MOVE) {
                     ScreenThrottleData.instance.setThrottle((int) event.getY());
                 } else if (action == MotionEvent.ACTION_UP) {
                     if (ScreenThrottleData.instance.getThrottlePorcentage() < 90) {
@@ -103,6 +107,7 @@ public boolean onTouch(View v, MotionEvent event) {
                             ScreenThrottleData.instance.setThrottleAtMid();
                         }
                     }
+                    EventBus.getDefault().post(new UserTouchModeChangedEvent(false));
                 }
 
                 updateThrottleLabel();