Skip to content
This repository was archived by the owner on Sep 14, 2019. It is now read-only.

Commit d3337fd

Browse files
lhmcgannlhmcgann
authored
Merge pull request #1 from kevinzwang/master
minor initial project setup changes
2 parents 60f8007 + 31465eb commit d3337fd

8 files changed

Lines changed: 22 additions & 13 deletions

File tree

‎Robot2018/.classpath‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="var" path="wpilib" sourcepath="wpilib.sources"/>
5+
<classpathentry kind="var" path="networktables" sourcepath="networktables.sources"/>
6+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
7+
<classpathentry kind="var" path="opencv" sourcepath="opencv.sources"/>
8+
<classpathentry kind="var" path="cscore" sourcepath="cscore.sources"/>
9+
<classpathentry kind="var" path="wpiutil" sourcepath="wpiutil.sources"/>
10+
<classpathentry kind="output" path="bin"/>
11+
</classpath>

‎Robot2018/.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/bin/
22
/build/
33
/dist/
4-
.classpath
5-
.DS_Store
4+
.DS_Store

‎Robot2018/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Project specific information
2-
package=org.usfirst.frc.team199.robot
2+
package=org.usfirst.frc.team199.Robot2018
33
robot.class=${package}.Robot
44
simulation.world.file=/usr/share/frcsim/worlds/GearsBotDemo.world

Robot2018/src/org/usfirst/frc/team199/robot/OI.java renamed to Robot2018/src/org/usfirst/frc/team199/Robot2018/OI.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.usfirst.frc.team199.robot;
1+
package org.usfirst.frc.team199.Robot2018;
22

33
import edu.wpi.first.wpilibj.buttons.Button;
44

5-
import org.usfirst.frc.team199.robot.commands.ExampleCommand;
5+
import org.usfirst.frc.team199.Robot2018.commands.ExampleCommand;
66

77
/**
88
* This class is the glue that binds the controls on the physical operator

Robot2018/src/org/usfirst/frc/team199/robot/Robot.java renamed to Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
package org.usfirst.frc.team199.robot;
2+
package org.usfirst.frc.team199.Robot2018;
33

44
import edu.wpi.first.wpilibj.IterativeRobot;
55
import edu.wpi.first.wpilibj.command.Command;
@@ -8,8 +8,8 @@
88
import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
99
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
1010

11-
import org.usfirst.frc.team199.robot.commands.ExampleCommand;
12-
import org.usfirst.frc.team199.robot.subsystems.ExampleSubsystem;
11+
import org.usfirst.frc.team199.Robot2018.commands.ExampleCommand;
12+
import org.usfirst.frc.team199.Robot2018.subsystems.ExampleSubsystem;
1313

1414
/**
1515
* The VM is configured to automatically run this class, and to call the
@@ -111,6 +111,5 @@ public void teleopPeriodic() {
111111
*/
112112
@Override
113113
public void testPeriodic() {
114-
LiveWindow.run();
115114
}
116115
}

Robot2018/src/org/usfirst/frc/team199/robot/RobotMap.java renamed to Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.usfirst.frc.team199.robot;
1+
package org.usfirst.frc.team199.Robot2018;
22

33
/**
44
* The RobotMap is a mapping from the ports sensors and actuators are wired into

Robot2018/src/org/usfirst/frc/team199/robot/commands/ExampleCommand.java renamed to Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/ExampleCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.usfirst.frc.team199.robot.commands;
1+
package org.usfirst.frc.team199.Robot2018.commands;
22

33
import edu.wpi.first.wpilibj.command.Command;
44

5-
import org.usfirst.frc.team199.robot.Robot;
5+
import org.usfirst.frc.team199.Robot2018.Robot;
66

77
/**
88
*

Robot2018/src/org/usfirst/frc/team199/robot/subsystems/ExampleSubsystem.java renamed to Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ExampleSubsystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.usfirst.frc.team199.robot.subsystems;
1+
package org.usfirst.frc.team199.Robot2018.subsystems;
22

33
import edu.wpi.first.wpilibj.command.Subsystem;
44

0 commit comments

Comments
 (0)