Team4388/RiseOfRidgebotics2020
1
0
Fork 0
mirror of https://github.com/Team4388/RiseOfRidgebotics2020.git synced 2026-06-09 00:38:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add-falcon-500-motion-magic

Browse Source
This commit is contained in:
aarav18
2020-02-07 16:47:56 -07:00
committed by GitHub
parent b7dfaf0248 0762e5db67
commit 033af31c96
9 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc4388/robot/RobotContainer.java
+10 -4
View File
@@ -110,14 +110,16 @@ public class RobotContainer {
}
/**
* Add your docs here.
* Used for analog inputs like triggers and axises.
* @return IHandController interface for the Driver Controller.
*/
public IHandController getDriverController() {
return m_driverXbox;
}
/**
* Add your docs here.
* Used for analog inputs like triggers and axises.
* @return The IHandController interface for the Operator Controller.
*/
public IHandController getOperatorController()
{
@@ -125,7 +127,9 @@ public class RobotContainer {
}
/**
* Add your docs here.
* Gets the {@link edu.wpi.first.wpilibj.GenericHID#GenericHID(int) Generic HID} for the Operator Xbox Controller.
* Generic HIDs/Joysticks can be used to set up JoystickButtons.
* @return The IHandController interface for the Operator Controller.
*/
public Joystick getOperatorJoystick()
{
@@ -133,7 +137,9 @@ public class RobotContainer {
}
/**
* Add your docs here.
* Gets the {@link edu.wpi.first.wpilibj.GenericHID#GenericHID(int) Generic HID} for the Driver Xbox Controller.
* Generic HIDs/Joysticks can be used to set up JoystickButtons.
* @return The IHandController interface for the Driver Controller.
*/
public Joystick getDriverJoystick()
{