merge 1.5.2.beta++ -> master

Former-commit-id: 32c6f43 Former-commit-id: 41905f8
cswelch · Jun 24, 2016 · a227754 · a227754
2 parents 48a9692 + 88afa2f
commit a227754
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 3 deletions.
diff --git a/FtcRobotController/libs/FtcCommon-release.aar b/FtcRobotController/libs/FtcCommon-release.aar
diff --git a/FtcRobotController/libs/Hardware-release.aar b/FtcRobotController/libs/Hardware-release.aar
diff --git a/FtcRobotController/libs/RobotCore-release.aar b/FtcRobotController/libs/RobotCore-release.aar
diff --git a/SwerveRoboticsLibrary/doc/reference/BST_BNO055_DS000_13.pdf b/SwerveRoboticsLibrary/doc/reference/BST_BNO055_DS000_13.pdf
diff --git a/SwerveRoboticsLibrary/doc/reference/BST_BNO055_DS000_13.pdf.REMOVED.git-id b/SwerveRoboticsLibrary/doc/reference/BST_BNO055_DS000_13.pdf.REMOVED.git-id
diff --git a/...RoboticsLibrary/src/main/java/org/swerverobotics/library/internal/tests/LongInitTest.java b/...RoboticsLibrary/src/main/java/org/swerverobotics/library/internal/tests/LongInitTest.java
@@ -0,0 +1,30 @@
+package org.swerverobotics.library.internal.tests;
+
+import com.qualcomm.robotcore.eventloop.opmode.OpMode;
+
+import org.swerverobotics.library.interfaces.Disabled;
+import org.swerverobotics.library.interfaces.TeleOp;
+
+@TeleOp(name="Long Init Test (Loop)", group="Swerve Tests")
+@Disabled
+public class LongInitTest extends OpMode
+    {
+    int counter = 0;
+
+    @Override
+    public void init()
+        {
+        try {
+            Thread.sleep(3000);
+            }
+        catch (InterruptedException ignored)
+            {
+            }
+        }
+
+    @Override
+    public void loop()
+        {
+        telemetry.addData("counter", counter++);
+        }
+    }
diff --git a/doc/tutorial/Build guide for k9bot.pdf b/doc/tutorial/Build guide for k9bot.pdf
diff --git a/doc/tutorial/Build guide for k9bot.pdf.REMOVED.git-id b/doc/tutorial/Build guide for k9bot.pdf.REMOVED.git-id
diff --git a/doc/tutorial/FTCTraining_Manual.pdf b/doc/tutorial/FTCTraining_Manual.pdf
diff --git a/doc/tutorial/FTCTraining_Manual.pdf.REMOVED.git-id b/doc/tutorial/FTCTraining_Manual.pdf.REMOVED.git-id