Merge pull request #25 from blabel3/world

Merging World with Master
MICDSRobotics-5190 · Apr 13, 2017 · f2bd959 · f2bd959
2 parents 0a9658f + 32eb55f
commit f2bd959
Show file tree

Hide file tree

Showing 248 changed files with 867 additions and 38,990 deletions.
diff --git a/ftc_app-master/FtcRobotController/build.gradle b/ftc_app-master/FtcRobotController/build.gradle
@@ -1,8 +1,10 @@
 import java.util.regex.Pattern
+
 //
 // build.gradle in FtcRobotController
 //
 apply plugin: 'com.android.library'
+
 android {
 
     defaultConfig {
@@ -11,19 +13,17 @@ android {
     }
 
     compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    buildToolsVersion '25.0.0'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
 }
+
 repositories {
     flatDir {
         dirs '../libs'
     }
 }
-apply from: 'build.release.gradle'
 
-dependencies {
-    compile project(':opencv-java')
-}
+apply from: 'build.release.gradle'
diff --git a/ftc_app-master/FtcRobotController/build.release.gradle b/ftc_app-master/FtcRobotController/build.release.gradle
@@ -7,5 +7,4 @@ dependencies {
     compile (name:'ModernRobotics-release', ext:'aar')
     compile (name:'Analytics-release', ext:'aar')
     compile (name:'WirelessP2p-release', ext:'aar')
-    compile project(':ftc-visionlib')
 }
diff --git a/ftc_app-master/FtcRobotController/src/main/AndroidManifest.xml b/ftc_app-master/FtcRobotController/src/main/AndroidManifest.xml
@@ -5,8 +5,8 @@
           android:versionCode="15"
           android:versionName="2.4">
 
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
   <application
     android:allowBackup="true"

diff --git a/ftc_app-master/FtcRobotController/src/main/assets/SizedVelocityVortexTargets.dat b/ftc_app-master/FtcRobotController/src/main/assets/SizedVelocityVortexTargets.dat
diff --git a/ftc_app-master/FtcRobotController/src/main/assets/SizedVelocityVortexTargets.xml b/ftc_app-master/FtcRobotController/src/main/assets/SizedVelocityVortexTargets.xml
diff --git a/ftc_app-master/FtcRobotController/src/main/assets/VelocityVortexTargets.dat b/ftc_app-master/FtcRobotController/src/main/assets/VelocityVortexTargets.dat
diff --git a/ftc_app-master/FtcRobotController/src/main/assets/VelocityVortexTargets.xml b/ftc_app-master/FtcRobotController/src/main/assets/VelocityVortexTargets.xml
diff --git a/...c/main/java/org/firstinspires/ftc/robotcontroller/external/samples/BasicVisionSample.java b/...c/main/java/org/firstinspires/ftc/robotcontroller/external/samples/BasicVisionSample.java
diff --git a/...java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptVuforiaNavigation.java b/...java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptVuforiaNavigation.java
@@ -45,7 +45,6 @@ are permitted (subject to the limitations in the disclaimer below) provided that
 import org.firstinspires.ftc.robotcore.external.navigation.AxesOrder;
 import org.firstinspires.ftc.robotcore.external.navigation.AxesReference;
 import org.firstinspires.ftc.robotcore.external.navigation.Orientation;
-import org.firstinspires.ftc.robotcore.external.navigation.Position;
 import org.firstinspires.ftc.robotcore.external.navigation.VuforiaLocalizer;
 import org.firstinspires.ftc.robotcore.external.navigation.VuforiaTrackable;
 import org.firstinspires.ftc.robotcore.external.navigation.VuforiaTrackableDefaultListener;

diff --git a/.../main/java/org/firstinspires/ftc/robotcontroller/external/samples/LinearVisionSample.java b/.../main/java/org/firstinspires/ftc/robotcontroller/external/samples/LinearVisionSample.java