Skip to content

Teleop drive #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pidatpre000 wants to merge 41 commits into
base: master
Choose a base branch
from
Open

Teleop drive #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ce2c43d
Joysticks
marcelnerd Jan 16, 2018
a62ef3b
dsjlkf
marcelnerd Jan 18, 2018
1b3422d
Gyro and drive train is working
marcelnerd Jan 20, 2018
299c399
Joysticks are working
marcelnerd Jan 20, 2018
2e88e92
Gyro and drive train are working
marcelnerd Jan 20, 2018
199f3f5
Delete DriveTrain.java
marcelnerd Jan 20, 2018
8b51580
Correction
marcelnerd Jan 20, 2018
0ea06f2
Gyro updates with teleop
marcelnerd Jan 20, 2018
8858060
Merge branch 'teleop-drive' of https://github.com/Wayzata/robot2018 i…
marcelnerd Jan 20, 2018
7578ee2
RuntimeException thrown when Gyro is not plugged in
marcelnerd Jan 20, 2018
a65118d
Add checks for which robot and if gyro is plugged in
marcelnerd Jan 20, 2018
4c7f878
adds utilities
pidatpre000 Jan 20, 2018
ced11f4
adds class
marcelnerd Jan 20, 2018
7c520f2
Add enum variable
marcelnerd Jan 20, 2018
95921c6
Adds better handling for the Gyro not being plugged in
marcelnerd Jan 25, 2018
749c914
TeleOp is functional, drive power is at 60%
marcelnerd Jan 26, 2018
4d3076f
Bug fixes
marcelnerd Jan 27, 2018
260b578
Adds Talon options for 2018 Robot
marcelnerd Jan 27, 2018
d60636a
Supports 4-motor drive train
marcelnerd Jan 27, 2018
344451a
Declare Talons for other parts of robot
marcelnerd Jan 27, 2018
38eb600
Sync with Master code
marcelnerd Jan 27, 2018
98e01d7
Sync with Master code
marcelnerd Jan 27, 2018
2564543
Add functionality for other parts of the robot, including activation …
marcelnerd Jan 27, 2018
a43dabf
merged code draft 1
pidatpre000 Jan 29, 2018
fc67b55
Fix enum
marcelnerd Jan 29, 2018
7568808
Merge branch 'teleop-drive' of https://github.com/Wayzata/robot2018 i…
marcelnerd Jan 29, 2018
f8ba7c4
merge for Robot and Variable class
pidatpre000 Jan 29, 2018
3d183a0
This One Preeti
marcelnerd Jan 30, 2018
1738744
Merge branch 'teleop-drive' of https://github.com/Wayzata/robot2018 i…
marcelnerd Jan 30, 2018
efb38f0
Okay It's Actually This One, Preeti
marcelnerd Jan 30, 2018
bdffe00
adds elevator class
pidatpre000 Feb 2, 2018
5d21395
Add Elevator code
marcelnerd Feb 2, 2018
15a25d6
Fix file tracking.
marcelnerd Feb 2, 2018
9ec3c66
git thinks these changed
marcelnerd Feb 2, 2018
d4328f2
Add Elevator Gyro and Compressor object
marcelnerd Feb 3, 2018
cce54f1
Air push thing
marcelnerd Feb 3, 2018
19845a9
Piston pneumatics works
marcelnerd Feb 3, 2018
8e4598d
*WORKING* adds arm controls and all pneumatic ontrols
marcelnerd Feb 3, 2018
d5cd9ec
Pre-Final code
marcelnerd Feb 6, 2018
6096d50
Comments code ///WE NEED TO SET MOTOR SPEEDS IN VARIABLES CLASS///
marcelnerd Feb 7, 2018
3931e69
Consistant with master
marcelnerd Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="var" path="wpilib" sourcepath="wpilib.sources"/>
<classpathentry kind="var" path="networktables" sourcepath="networktables.sources"/>
<classpathentry kind="var" path="networktables" sourcepath="ntcore.sources"/>
<classpathentry kind="var" path="opencv" sourcepath="opencv.sources"/>
<classpathentry kind="var" path="cscore" sourcepath="cscore.sources"/>
<classpathentry kind="var" path="wpiutil" sourcepath="wpiutil.sources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="var" path="USERLIBS_DIR/CTRLib.jar"/>
<classpathentry kind="var" path="USERLIBS_DIR/CTRE_Phoenix-sources.jar"/>
<classpathentry kind="var" path="USERLIBS_DIR/CTRE_Phoenix.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
6 changes: 3 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

*.class

*.properties

*.xml
build
/bin/
dist
4 changes: 4 additions & 0 deletions build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Project specific information
package=org.usfirst.frc.team2264.robot
robot.class=${package}.Robot
simulation.world.file=/usr/share/frcsim/worlds/GearsBotDemo.world
30 changes: 30 additions & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>

<project name="FRC Deployment" default="deploy">

<!--
The following properties can be defined to override system level
settings. These should not be touched unless you know what you're
doing. The primary use is to override the wpilib version when
working with older robots that can't compile with the latest
libraries.
-->

<!-- By default the system version of WPI is used -->
<!-- <property name="version" value=""/> -->

<!-- By default the system team number is used -->
<!-- <property name="team-number" value=""/> -->

<!-- By default the target is set to 10.TE.AM.2 -->
<!-- <property name="target" value=""/> -->

<!-- Any other property in build.properties can also be overridden. -->

<property file="${user.home}/wpilib/wpilib.properties"/>
<property file="build.properties"/>
<property file="${user.home}/wpilib/java/${version}/ant/build.properties"/>

<import file="${wpilib.ant.dir}/build.xml"/>

</project>
Loading