From 5f80ca8098c4eea2d6e5f18739cbbac71f9fbd14 Mon Sep 17 00:00:00 2001 From: Kevin Wang <20215378+kevinzwang@users.noreply.github.com> Date: Sun, 7 Jan 2018 20:38:21 -0800 Subject: [PATCH 1/3] preserve 2017 project structure - move package from org.usfirst.frc.team199.robot to org.usfirst.frc.team199.Robot2018 - remove new WPILib deprications --- .../org/usfirst/frc/team199/{robot => Robot2018}/OI.java | 4 ++-- .../usfirst/frc/team199/{robot => Robot2018}/Robot.java | 7 +++---- .../usfirst/frc/team199/{robot => Robot2018}/RobotMap.java | 2 +- .../{robot => Robot2018}/commands/ExampleCommand.java | 4 ++-- .../{robot => Robot2018}/subsystems/ExampleSubsystem.java | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) rename Robot2018/src/org/usfirst/frc/team199/{robot => Robot2018}/OI.java (92%) rename Robot2018/src/org/usfirst/frc/team199/{robot => Robot2018}/Robot.java (94%) rename Robot2018/src/org/usfirst/frc/team199/{robot => Robot2018}/RobotMap.java (94%) rename Robot2018/src/org/usfirst/frc/team199/{robot => Robot2018}/commands/ExampleCommand.java (89%) rename Robot2018/src/org/usfirst/frc/team199/{robot => Robot2018}/subsystems/ExampleSubsystem.java (86%) diff --git a/Robot2018/src/org/usfirst/frc/team199/robot/OI.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/OI.java similarity index 92% rename from Robot2018/src/org/usfirst/frc/team199/robot/OI.java rename to Robot2018/src/org/usfirst/frc/team199/Robot2018/OI.java index b152dca..0907cd1 100644 --- a/Robot2018/src/org/usfirst/frc/team199/robot/OI.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/OI.java @@ -1,8 +1,8 @@ -package org.usfirst.frc.team199.robot; +package org.usfirst.frc.team199.Robot2018; import edu.wpi.first.wpilibj.buttons.Button; -import org.usfirst.frc.team199.robot.commands.ExampleCommand; +import org.usfirst.frc.team199.Robot2018.commands.ExampleCommand; /** * This class is the glue that binds the controls on the physical operator diff --git a/Robot2018/src/org/usfirst/frc/team199/robot/Robot.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java similarity index 94% rename from Robot2018/src/org/usfirst/frc/team199/robot/Robot.java rename to Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java index ddd5af5..c5d60de 100644 --- a/Robot2018/src/org/usfirst/frc/team199/robot/Robot.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java @@ -1,5 +1,5 @@ -package org.usfirst.frc.team199.robot; +package org.usfirst.frc.team199.Robot2018; import edu.wpi.first.wpilibj.IterativeRobot; import edu.wpi.first.wpilibj.command.Command; @@ -8,8 +8,8 @@ import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; -import org.usfirst.frc.team199.robot.commands.ExampleCommand; -import org.usfirst.frc.team199.robot.subsystems.ExampleSubsystem; +import org.usfirst.frc.team199.Robot2018.commands.ExampleCommand; +import org.usfirst.frc.team199.Robot2018.subsystems.ExampleSubsystem; /** * The VM is configured to automatically run this class, and to call the @@ -111,6 +111,5 @@ public void teleopPeriodic() { */ @Override public void testPeriodic() { - LiveWindow.run(); } } diff --git a/Robot2018/src/org/usfirst/frc/team199/robot/RobotMap.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java similarity index 94% rename from Robot2018/src/org/usfirst/frc/team199/robot/RobotMap.java rename to Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java index 5a84e8b..89d004b 100644 --- a/Robot2018/src/org/usfirst/frc/team199/robot/RobotMap.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team199.robot; +package org.usfirst.frc.team199.Robot2018; /** * The RobotMap is a mapping from the ports sensors and actuators are wired into diff --git a/Robot2018/src/org/usfirst/frc/team199/robot/commands/ExampleCommand.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/ExampleCommand.java similarity index 89% rename from Robot2018/src/org/usfirst/frc/team199/robot/commands/ExampleCommand.java rename to Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/ExampleCommand.java index aef651f..3d44681 100644 --- a/Robot2018/src/org/usfirst/frc/team199/robot/commands/ExampleCommand.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/ExampleCommand.java @@ -1,8 +1,8 @@ -package org.usfirst.frc.team199.robot.commands; +package org.usfirst.frc.team199.Robot2018.commands; import edu.wpi.first.wpilibj.command.Command; -import org.usfirst.frc.team199.robot.Robot; +import org.usfirst.frc.team199.Robot2018.Robot; /** * diff --git a/Robot2018/src/org/usfirst/frc/team199/robot/subsystems/ExampleSubsystem.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ExampleSubsystem.java similarity index 86% rename from Robot2018/src/org/usfirst/frc/team199/robot/subsystems/ExampleSubsystem.java rename to Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ExampleSubsystem.java index 6e5d6e4..fb64793 100644 --- a/Robot2018/src/org/usfirst/frc/team199/robot/subsystems/ExampleSubsystem.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ExampleSubsystem.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team199.robot.subsystems; +package org.usfirst.frc.team199.Robot2018.subsystems; import edu.wpi.first.wpilibj.command.Subsystem; From 1b275a511fa5edaced47f87d533ce8507a3a598c Mon Sep 17 00:00:00 2001 From: Kevin Wang <20215378+kevinzwang@users.noreply.github.com> Date: Sun, 7 Jan 2018 21:14:56 -0800 Subject: [PATCH 2/3] Add .classpath also remove gitignore for the classpath file. classpath is important for being able to build the code --- Robot2018/.classpath | 11 +++++++++++ Robot2018/.gitignore | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 Robot2018/.classpath diff --git a/Robot2018/.classpath b/Robot2018/.classpath new file mode 100644 index 0000000..31c9d63 --- /dev/null +++ b/Robot2018/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Robot2018/.gitignore b/Robot2018/.gitignore index e98b718..8470e34 100644 --- a/Robot2018/.gitignore +++ b/Robot2018/.gitignore @@ -1,5 +1,4 @@ /bin/ /build/ /dist/ -.classpath -.DS_Store \ No newline at end of file +.DS_Store From 31465eb57c026a9c7083d1cdaa4e17bb32a8759b Mon Sep 17 00:00:00 2001 From: Kevin Wang <20215378+kevinzwang@users.noreply.github.com> Date: Sun, 7 Jan 2018 21:27:31 -0800 Subject: [PATCH 3/3] aah missed changing robot to Robot2018 in build.properties --- Robot2018/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Robot2018/build.properties b/Robot2018/build.properties index 95d84e9..6e4c329 100644 --- a/Robot2018/build.properties +++ b/Robot2018/build.properties @@ -1,4 +1,4 @@ # Project specific information -package=org.usfirst.frc.team199.robot +package=org.usfirst.frc.team199.Robot2018 robot.class=${package}.Robot simulation.world.file=/usr/share/frcsim/worlds/GearsBotDemo.world \ No newline at end of file