diff --git a/DroneAppController.rar b/DroneAppController.rar
new file mode 100644
index 0000000..8f4389a
Binary files /dev/null and b/DroneAppController.rar differ
diff --git a/DroneAppController/.idea/.name b/DroneAppController/.idea/.name
index f1f4cb3..18d4670 100644
--- a/DroneAppController/.idea/.name
+++ b/DroneAppController/.idea/.name
@@ -1 +1 @@
-Drone App Controller
\ No newline at end of file
+DroneAppController
\ No newline at end of file
diff --git a/DroneAppController/.idea/gradle.xml b/DroneAppController/.idea/gradle.xml
index d57b206..2cbb09b 100644
--- a/DroneAppController/.idea/gradle.xml
+++ b/DroneAppController/.idea/gradle.xml
@@ -5,11 +5,11 @@
-
+
diff --git a/DroneAppController/.idea/misc.xml b/DroneAppController/.idea/misc.xml
index 34d4245..9076de5 100644
--- a/DroneAppController/.idea/misc.xml
+++ b/DroneAppController/.idea/misc.xml
@@ -3,39 +3,8 @@
-
-
-
-
-
-
-
-
-
-
- Abstraction issues
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/DroneAppController/.idea/modules.xml b/DroneAppController/.idea/modules.xml
index abb38fc..1fca609 100644
--- a/DroneAppController/.idea/modules.xml
+++ b/DroneAppController/.idea/modules.xml
@@ -2,7 +2,8 @@
-
+
+
diff --git a/DroneAppController/DroneAppController.iml b/DroneAppController/DroneAppController.iml
new file mode 100644
index 0000000..2a02201
--- /dev/null
+++ b/DroneAppController/DroneAppController.iml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DroneAppController/app/app.iml b/DroneAppController/app/app.iml
index 2731357..313241b 100644
--- a/DroneAppController/app/app.iml
+++ b/DroneAppController/app/app.iml
@@ -1,5 +1,5 @@
-
+
@@ -84,9 +84,9 @@
-
-
+
+
diff --git a/DroneAppController/app/build.gradle b/DroneAppController/app/build.gradle
index 587bf0b..22dbafc 100644
--- a/DroneAppController/app/build.gradle
+++ b/DroneAppController/app/build.gradle
@@ -3,10 +3,9 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
-
defaultConfig {
applicationId "pt.isep.mei.simov.droneappcontroller"
- minSdkVersion 15
+ minSdkVersion 16
targetSdkVersion 21
versionCode 1
versionName "1.0"
@@ -17,9 +16,11 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ productFlavors {
+ }
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:21.0.3'
}
diff --git a/DroneAppController/app/src/main/AndroidManifest.xml b/DroneAppController/app/src/main/AndroidManifest.xml
index 1c28655..108209a 100644
--- a/DroneAppController/app/src/main/AndroidManifest.xml
+++ b/DroneAppController/app/src/main/AndroidManifest.xml
@@ -35,6 +35,10 @@
android:name=".ListOfDrones"
android:label="@string/title_activity_list_of_drones" >
+
+
diff --git a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/CalibrationActivity.java b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/CalibrationActivity.java
index 117811a..00bd58a 100644
--- a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/CalibrationActivity.java
+++ b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/CalibrationActivity.java
@@ -1,7 +1,6 @@
package pt.isep.mei.simov.droneappcontroller;
import android.app.Activity;
-import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
diff --git a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/Connection.java b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/Connection.java
index cdfb6f1..e9f72b8 100644
--- a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/Connection.java
+++ b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/Connection.java
@@ -1,7 +1,6 @@
package pt.isep.mei.simov.droneappcontroller;
import android.util.Log;
-import android.widget.Toast;
import org.jivesoftware.smack.AccountManager;
import org.jivesoftware.smack.ConnectionConfiguration;
@@ -10,11 +9,7 @@ import org.jivesoftware.smack.RosterEntry;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.Presence;
-import java.lang.InterruptedException;
-import java.lang.Runnable;
-import java.lang.String;
-import java.lang.System;
-import java.lang.Thread;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.concurrent.CountDownLatch;
diff --git a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ControllerActivity.java b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ControllerActivity.java
index 402074e..b9172ec 100644
--- a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ControllerActivity.java
+++ b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ControllerActivity.java
@@ -138,7 +138,7 @@ public class ControllerActivity extends Activity {
public void onClick(DialogInterface dialog,int id) {
// if this button is clicked, close
// current activity
- Intent i = new Intent(getApplicationContext(), CalibrationActivity.class);
+ Intent i = new Intent(getApplicationContext(), ExpertMode.class);
startActivity(i);
}
})
diff --git a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ExpertMode.java b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ExpertMode.java
new file mode 100644
index 0000000..86db95d
--- /dev/null
+++ b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ExpertMode.java
@@ -0,0 +1,85 @@
+package pt.isep.mei.simov.droneappcontroller;
+
+import android.app.Activity;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import org.jivesoftware.smack.packet.Message;
+
+/**
+ * Created by João on 30-12-2014.
+ */
+public class ExpertMode extends Activity implements SensorEventListener {
+
+
+ private SensorManager sensorManager;
+
+ TextView x_tilt;
+ TextView y_tilt;
+
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_expert_mode);
+
+ x_tilt=(TextView)findViewById(R.id.x_tilt);
+ y_tilt=(TextView)findViewById(R.id.y_tilt);
+
+ sensorManager=(SensorManager)getSystemService(SENSOR_SERVICE);
+
+ // add listener. The listener will be HelloAndroid (this) class
+ sensorManager.registerListener(this,
+ sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
+ SensorManager.SENSOR_DELAY_GAME);
+ }
+
+
+ @Override
+ public void onSensorChanged(SensorEvent event) {
+
+ if(event.sensor.getType()==Sensor.TYPE_ACCELEROMETER){
+
+ // assign directions
+ float x=event.values[0];
+ float y=event.values[1];
+
+
+ if(x > 1){
+ x_tilt.setText("Trás");
+ } else if(x < -1) {
+ x_tilt.setText("Frente");
+ }
+
+ if(y > 1){
+ y_tilt.setText("Direita");
+ }else if(y < -1){
+ y_tilt.setText("Esquerda");
+ }
+
+
+
+ }
+
+ }
+ public void senMessage(String message) {
+ Message msg = new Message(to, Message.Type.chat);
+
+ msg.setBody(message);
+ if (connection != null) {
+ connection.sendPacket(msg);
+ messages.add(connection.getUser() + ":");
+ messages.add(message);
+ }
+ }
+
+ @Override
+ public void onAccuracyChanged(Sensor sensor, int accuracy) {
+
+ }
+}
diff --git a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ListOfDrones.java b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ListOfDrones.java
index f5ad37c..7f2e2b4 100644
--- a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ListOfDrones.java
+++ b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/ListOfDrones.java
@@ -3,8 +3,6 @@ package pt.isep.mei.simov.droneappcontroller;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
diff --git a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/LoginActivity.java b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/LoginActivity.java
index 2da1e78..251f28e 100644
--- a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/LoginActivity.java
+++ b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/LoginActivity.java
@@ -1,13 +1,11 @@
package pt.isep.mei.simov.droneappcontroller;
-import android.os.Bundle;
-
import android.app.Activity;
-
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
+import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
diff --git a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/RegisterActivity.java b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/RegisterActivity.java
index 779e4f8..e560648 100644
--- a/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/RegisterActivity.java
+++ b/DroneAppController/app/src/main/java/pt/isep/mei/simov/droneappcontroller/RegisterActivity.java
@@ -1,17 +1,12 @@
package pt.isep.mei.simov.droneappcontroller;
import android.app.Activity;
-import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
-import org.jivesoftware.smack.ConnectionConfiguration;
-
/**
* Created by almeida on 18-12-2014.
*/
diff --git a/DroneAppController/app/src/main/res/layout/activity_expert_mode.xml b/DroneAppController/app/src/main/res/layout/activity_expert_mode.xml
new file mode 100644
index 0000000..2420da6
--- /dev/null
+++ b/DroneAppController/app/src/main/res/layout/activity_expert_mode.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/DroneAppController/app/src/main/res/layout/activity_login.xml b/DroneAppController/app/src/main/res/layout/activity_login.xml
index 1b1a482..50f323d 100644
--- a/DroneAppController/app/src/main/res/layout/activity_login.xml
+++ b/DroneAppController/app/src/main/res/layout/activity_login.xml
@@ -1,7 +1,8 @@
Controlo
Calibração
Lista de drones
+ X Tilt:
+ Y Tilt:
\ No newline at end of file
diff --git a/DroneAppController/app/src/main/res/values/strings.xml b/DroneAppController/app/src/main/res/values/strings.xml
index e0a7b25..5f34d2d 100644
--- a/DroneAppController/app/src/main/res/values/strings.xml
+++ b/DroneAppController/app/src/main/res/values/strings.xml
@@ -8,5 +8,7 @@
Controlo
Calibration Activity
List Of Drones
+ X Tilt:
+ Y Tilt: