Merge remote-tracking branch 'pedro-qs/master' into branch-silver-14493-v2
# Conflicts: # FtcRobotController/src/main/AndroidManifest.xml # FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptAprilTagLocalization.java # README.md # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/LOCALIZATION.md # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/OVERVIEW.md # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/TUNING.md # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/follower/DriveVectorScaler.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/follower/Follower.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/localization/Localizer.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/localization/Pose.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/localization/PoseUpdater.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/localization/localizers/ThreeWheelLocalizer.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/localization/tuning/LateralTuner.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/localization/tuning/LocalizationTest.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/pathGeneration/MathFunctions.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/pathGeneration/PathBuilder.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/pathGeneration/Point.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/tuning/FollowerConstants.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/tuning/ForwardVelocityTuner.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/tuning/ForwardZeroPowerAccelerationTuner.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/tuning/LateralZeroPowerAccelerationTuner.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/tuning/StrafeVelocityTuner.java # TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/util/Drawing.java # build.dependencies.gradle
This commit is contained in:
@ -6,14 +6,14 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'org.firstinspires.ftc:Inspection:10.1.0'
|
||||
implementation 'org.firstinspires.ftc:Blocks:10.1.0'
|
||||
implementation 'org.firstinspires.ftc:RobotCore:10.1.0'
|
||||
implementation 'org.firstinspires.ftc:RobotServer:10.1.0'
|
||||
implementation 'org.firstinspires.ftc:OnBotJava:10.1.0'
|
||||
implementation 'org.firstinspires.ftc:Hardware:10.1.0'
|
||||
implementation 'org.firstinspires.ftc:FtcCommon:10.1.0'
|
||||
implementation 'org.firstinspires.ftc:Vision:10.1.0'
|
||||
implementation 'org.firstinspires.ftc:Inspection:10.1.1'
|
||||
implementation 'org.firstinspires.ftc:Blocks:10.1.1'
|
||||
implementation 'org.firstinspires.ftc:RobotCore:10.1.1'
|
||||
implementation 'org.firstinspires.ftc:RobotServer:10.1.1'
|
||||
implementation 'org.firstinspires.ftc:OnBotJava:10.1.1'
|
||||
implementation 'org.firstinspires.ftc:Hardware:10.1.1'
|
||||
implementation 'org.firstinspires.ftc:FtcCommon:10.1.1'
|
||||
implementation 'org.firstinspires.ftc:Vision:10.1.1'
|
||||
implementation 'androidx.appcompat:appcompat:1.2.0'
|
||||
|
||||
implementation "com.acmerobotics.roadrunner:ftc:0.1.14"
|
||||
|
Reference in New Issue
Block a user