v4.1 changes.

ftctechnh · Sep 24, 2018 · 58d723a · 58d723a
1 parent 612f456
commit 58d723a
Show file tree

Hide file tree

Showing 28 changed files with 27 additions and 871 deletions.
diff --git a/FtcRobotController/build.release.gradle b/FtcRobotController/build.release.gradle
@@ -1,8  1,8 @@
 dependencies {
-    compile (name:'Inspection-release', ext: 'aar')
-    compile (name:'Blocks-release', ext: 'aar')
-    compile (name:'RobotCore-release', ext: 'aar')
-    compile (name:'Hardware-release', ext: 'aar')
-    compile (name:'FtcCommon-release', ext: 'aar')
-    compile (name:'WirelessP2p-release', ext:'aar')
     implementation (name:'Inspection-release', ext: 'aar')
     implementation (name:'Blocks-release', ext: 'aar')
     implementation (name:'RobotCore-release', ext: 'aar')
     implementation (name:'Hardware-release', ext: 'aar')
     implementation (name:'FtcCommon-release', ext: 'aar')
     implementation (name:'WirelessP2p-release', ext:'aar')
 }
diff --git a/FtcRobotController/src/main/AndroidManifest.xml b/FtcRobotController/src/main/AndroidManifest.xml
@@ -2,8  2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.qualcomm.ftcrobotcontroller"
-          android:versionCode="28"
-          android:versionName="4.0">
           android:versionCode="29"
           android:versionName="4.1">
 
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
@@ -33,6  33,11 @@
       <meta-data
         android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
         android:resource="@xml/device_filter" />
 
       <meta-data
           android:name="org.firstinspires.main.entry"
           android:value="true"
           />
     </activity>
 
     <!-- The robot controller service in which most of the robot functionality is managed -->

diff --git a/...n/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptRegisterOpModes.java b/...n/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptRegisterOpModes.java
diff --git a/...r/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/HardwareK9bot.java b/...r/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/HardwareK9bot.java
diff --git a/...in/java/org/firstinspires/ftc/robotcontroller/external/samples/HardwarePushbotMatrix.java b/...in/java/org/firstinspires/ftc/robotcontroller/external/samples/HardwarePushbotMatrix.java