diff --git a/FtcRobotController/src/main/AndroidManifest.xml b/FtcRobotController/src/main/AndroidManifest.xml index f051d4f63d8..04946e1e8f8 100644 --- a/FtcRobotController/src/main/AndroidManifest.xml +++ b/FtcRobotController/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="15" + android:versionName="2.4"> Configure Your Build * @see Versioning Your App */ - def manifestFile = file('../FtcRobotController/src/main/AndroidManifest.xml'); + def manifestFile = project(':FtcRobotController').file('src/main/AndroidManifest.xml'); def manifestText = manifestFile.getText() // def vCodePattern = Pattern.compile("versionCode=\"(\\d+(\\.\\d+)*)\"") @@ -91,13 +91,13 @@ android { sourceSets.main { jni.srcDirs = [] - jniLibs.srcDir "../libs" + jniLibs.srcDir rootProject.file('libs') } } repositories { flatDir { - dirs '../libs' + dirs rootProject.file('libs') } } diff --git a/doc/apk/FtcDriverStation-release.apk b/doc/apk/FtcDriverStation-release.apk index e13db4fbddc..da91d0622f9 100644 Binary files a/doc/apk/FtcDriverStation-release.apk and b/doc/apk/FtcDriverStation-release.apk differ diff --git a/doc/apk/FtcRobotController-release.apk b/doc/apk/FtcRobotController-release.apk index 849a091ee99..81319015be3 100644 Binary files a/doc/apk/FtcRobotController-release.apk and b/doc/apk/FtcRobotController-release.apk differ diff --git a/doc/javadoc/com/qualcomm/ftccommon/package-tree.html b/doc/javadoc/com/qualcomm/ftccommon/package-tree.html index d64029be73b..71252b54136 100644 --- a/doc/javadoc/com/qualcomm/ftccommon/package-tree.html +++ b/doc/javadoc/com/qualcomm/ftccommon/package-tree.html @@ -87,27 +87,27 @@

Class Hierarchy

  • Activity
  • Activity
  • Activity
  • Activity
  • Activity
  • Binder diff --git a/doc/javadoc/com/qualcomm/robotcore/eventloop/opmode/package-tree.html b/doc/javadoc/com/qualcomm/robotcore/eventloop/opmode/package-tree.html index 4206eb1bb82..ffe97683166 100644 --- a/doc/javadoc/com/qualcomm/robotcore/eventloop/opmode/package-tree.html +++ b/doc/javadoc/com/qualcomm/robotcore/eventloop/opmode/package-tree.html @@ -101,10 +101,10 @@

    Interface Hierarchy

    Annotation Type Hierarchy

      +
    • com.qualcomm.robotcore.eventloop.opmode.OpModeRegistrar (implements java.lang.annotation.Annotation)
    • com.qualcomm.robotcore.eventloop.opmode.Autonomous (implements java.lang.annotation.Annotation)
    • com.qualcomm.robotcore.eventloop.opmode.Disabled (implements java.lang.annotation.Annotation)
    • com.qualcomm.robotcore.eventloop.opmode.TeleOp (implements java.lang.annotation.Annotation)
      • -
    • com.qualcomm.robotcore.eventloop.opmode.OpModeRegistrar (implements java.lang.annotation.Annotation)

    Enum Hierarchy

    @@ -122,39 +131,30 @@

    Field Summary

    -AxesOrder -axesOrder -
    the order of axes around which our three rotations occur
    - - - -AxesReference -axesReference -
    whether we have extrinsic or intrinsic rotations
    - - - -float -firstAngleRate -
    the chronologically first rotation made in the AxesOrder
    +AngleUnit +unit +
    the angular unit in which angular rates are expressed.
    float -secondAngleRate -
    the chronologically second rotation made in the AxesOrder
    +xRotationRate +
    the instantaneous body-referenced rotation rate about the x-axis in units + of "units per second".
    float -thirdAngleRate -
    the chronologically third rotation made in the AxesOrder
    +yRotationRate +
    the instantaneous body-referenced rotation rate about the y-axis in units + of "units per second".
    -AngleUnit -unit -
    the angular unit in which angular rates are expressed.
    +float +zRotationRate +
    the instantaneous body-referenced rotation rate about the z-axis in units + of "units per second".
    @@ -175,12 +175,10 @@

    Constructor Summary

    AngularVelocity()  -AngularVelocity(AxesReference axesReference, - AxesOrder axesOrder, - AngleUnit unit, - float firstAngle, - float secondAngle, - float thirdAngle, +AngularVelocity(AngleUnit unit, + float xRotationRate, + float yRotationRate, + float zRotationRate, long acquisitionTime)  @@ -204,12 +202,6 @@

    Method Summary

    Converts this AngularVelocity to one with the indicated angular units.
    - -AngularVelocity -toAxesReference(AxesReference axesReference) -
    Converts the AngularVelocity to an equivalent one with the indicted point of view.
    - - - +
    • -

      firstAngleRate

      -
      public float firstAngleRate
      -
      the chronologically first rotation made in the AxesOrder
      +

      xRotationRate

      +
      public float xRotationRate
      +
      the instantaneous body-referenced rotation rate about the x-axis in units + of "units per second".
    - +
    • -

      secondAngleRate

      -
      public float secondAngleRate
      -
      the chronologically second rotation made in the AxesOrder
      +

      yRotationRate

      +
      public float yRotationRate
      +
      the instantaneous body-referenced rotation rate about the y-axis in units + of "units per second".
    - +
    • -

      thirdAngleRate

      -
      public float thirdAngleRate
      -
      the chronologically third rotation made in the AxesOrder
      +

      zRotationRate

      +
      public float zRotationRate
      +
      the instantaneous body-referenced rotation rate about the z-axis in units + of "units per second".
    @@ -323,18 +296,16 @@

    AngularVelocity

    public AngularVelocity()
    • - +

    • AngularVelocity

      -
      public AngularVelocity(AxesReference axesReference,
-               AxesOrder axesOrder,
-               AngleUnit unit,
-               float firstAngle,
-               float secondAngle,
-               float thirdAngle,
+
      public AngularVelocity(AngleUnit unit,
+               float xRotationRate,
+               float yRotationRate,
+               float zRotationRate,
                long acquisitionTime)
    @@ -349,7 +320,7 @@

    Method Detail

    -
      +

      • toAngleUnit

        public AngularVelocity toAngleUnit(AngleUnit unit)
        @@ -358,18 +329,6 @@

        toAngleUnit

        Returns:
        a new [@link AngularVelocity} with the same data but in the indicated units
      - - - -
        -
      • -

        toAxesReference

        -
        public AngularVelocity toAxesReference(AxesReference axesReference)
        -
        Converts the AngularVelocity to an equivalent one with the indicted point of view.
        -
        Parameters:
        axesReference - whether we wish to consider rotations from an extrinsic or intrinsic point of view
        -
        Returns:
        an equivalent [@link AngularVelocity} but with the indicated point of view.
        -
        • -
    diff --git a/doc/javadoc/org/firstinspires/ftc/robotcore/external/navigation/package-summary.html b/doc/javadoc/org/firstinspires/ftc/robotcore/external/navigation/package-summary.html index 6305c29a800..9b42ea1f787 100644 --- a/doc/javadoc/org/firstinspires/ftc/robotcore/external/navigation/package-summary.html +++ b/doc/javadoc/org/firstinspires/ftc/robotcore/external/navigation/package-summary.html @@ -115,7 +115,7 @@

    Package org.firstinspires.ftc.robotcore.e AngularVelocity -
    Instances of AngularVelocity represent a rotation rate about a set of three axes.
    +
    Instances of AngularVelocity represent an instantaneous body-referenced 3D rotation rate.
    diff --git a/doc/javadoc/org/firstinspires/ftc/robotcore/external/navigation/package-tree.html b/doc/javadoc/org/firstinspires/ftc/robotcore/external/navigation/package-tree.html index 106db230615..f756e9afa84 100644 --- a/doc/javadoc/org/firstinspires/ftc/robotcore/external/navigation/package-tree.html +++ b/doc/javadoc/org/firstinspires/ftc/robotcore/external/navigation/package-tree.html @@ -115,14 +115,14 @@

    Enum Hierarchy

    diff --git a/libs/Blocks-release-sources.jar b/libs/Blocks-release-sources.jar index 7baa01ac0ba..16c4f6773ed 100644 Binary files a/libs/Blocks-release-sources.jar and b/libs/Blocks-release-sources.jar differ diff --git a/libs/Blocks-release.aar b/libs/Blocks-release.aar index d2bc5e3462f..4ccd6dd8990 100644 Binary files a/libs/Blocks-release.aar and b/libs/Blocks-release.aar differ diff --git a/libs/FtcCommon-release-sources.jar b/libs/FtcCommon-release-sources.jar index 4d760143563..726c4d5440d 100644 Binary files a/libs/FtcCommon-release-sources.jar and b/libs/FtcCommon-release-sources.jar differ diff --git a/libs/FtcCommon-release.aar b/libs/FtcCommon-release.aar index 6d65d82c36d..a427560e1ca 100644 Binary files a/libs/FtcCommon-release.aar and b/libs/FtcCommon-release.aar differ diff --git a/libs/Hardware-release-sources.jar b/libs/Hardware-release-sources.jar index e762893b809..b163e4f9510 100644 Binary files a/libs/Hardware-release-sources.jar and b/libs/Hardware-release-sources.jar differ diff --git a/libs/Hardware-release.aar b/libs/Hardware-release.aar index 12929d21e79..2a75c3c8dbb 100644 Binary files a/libs/Hardware-release.aar and b/libs/Hardware-release.aar differ diff --git a/libs/Inspection-release.aar b/libs/Inspection-release.aar index 83f149bad7d..3f49fe289ef 100644 Binary files a/libs/Inspection-release.aar and b/libs/Inspection-release.aar differ diff --git a/libs/RobotCore-release-sources.jar b/libs/RobotCore-release-sources.jar index b0b392fcd69..1464fa18809 100644 Binary files a/libs/RobotCore-release-sources.jar and b/libs/RobotCore-release-sources.jar differ diff --git a/libs/RobotCore-release.aar b/libs/RobotCore-release.aar index 5c3e51a0368..0f50afe0b58 100644 Binary files a/libs/RobotCore-release.aar and b/libs/RobotCore-release.aar differ