FtcRobotController Diffs - RobotGirls/FTC-Team-25 GitHub Wiki

Cindy and Lindsay diffed the master-25-rr and master-5218-rr branches on FtcRobotController to try to determine what is different between the two branches.

Team 25 FTCRobotControllerActivity:

• line 130: add FTCDashboard (Craig)
• 413/414: add FTCDashboard helper functions (Craig)

Team 5218 Roadrunner: build.gradle

• line 13: Roadrunner differences present at the point where both teams introduced roadrunner
• team 25 is newer so we will keep those changes.

DriveConstants.java is different between the two repos but this is expected because this file should be changed to work with each individual robot.

SampleMecanumDrive.java also has a difference in the remapping of the axes for the REV Hubs. Also fine to be different per robot.

TeamCode build.gradle is different but that also makes sense. They point to different TeamCode files.

build.common.gradle:

• line 96 and 103: add comment of the original line with a comment noting that the second library needs to be removed so that openCV will load

build.dependencies.gradle:

• line 23-24: team 25 has a newer version of tensorflow-lite - want to add into Team-5218

top level build.gradle:

• line 15: version is 7.2.2 in 25 and 7.2.0 in 5218. There is a note that says for teams to not change it themselves (Audrey)

team 25 gradle.properties:

• extra line on line 9. Delete it.

team 25 settings.gradle:

• added meepmeeptesting (Audrey)
• commented it out to get the build to complete (Lindsay)