Permalink
Browse files

The Great Gradle Refactoring

  • Loading branch information...
Maxcr1 committed Jul 17, 2018
1 parent a803d6d commit d5764b02da179bbb29c9f20c69a5459ea38d80f2
Showing with 310 additions and 61 deletions.
  1. +3 −1 .gitignore
  2. +0 −18 .project
  3. +46 −0 build.gradle
  4. +0 −4 build.properties
  5. +0 −30 build.xml
  6. +172 −0 gradlew
  7. +84 −0 gradlew.bat
  8. 0 src/{ → main/java}/com/team2169/robot/ActuatorMap.java
  9. 0 src/{ → main/java}/com/team2169/robot/Constants.java
  10. +1 −1 src/{ → main/java}/com/team2169/robot/ControlMap.java
  11. +0 −1 src/{ → main/java}/com/team2169/robot/Robot.java
  12. +1 −1 src/{ → main/java}/com/team2169/robot/RobotStates.java
  13. 0 src/{ → main/java}/com/team2169/robot/RobotWantedStates.java
  14. +0 −2 src/{ → main/java}/com/team2169/robot/StateManager.java
  15. +2 −2 src/{ → main/java}/com/team2169/robot/auto/AutoConstants.java
  16. 0 src/{ → main/java}/com/team2169/robot/auto/AutoManager.java
  17. 0 src/{ → main/java}/com/team2169/robot/auto/Paths.java
  18. 0 src/{ → main/java}/com/team2169/robot/auto/modes/AutoMode.java
  19. 0 src/{ → main/java}/com/team2169/robot/auto/modes/DoNothing.java
  20. 0 src/{ → main/java}/com/team2169/robot/auto/modes/FailureAuto.java
  21. 0 src/{ → main/java}/com/team2169/robot/auto/modes/SelfTest.java
  22. 0 src/{ → main/java}/com/team2169/robot/auto/modes/driveForward/DriveForwardAuto.java
  23. 0 src/{ → main/java}/com/team2169/robot/auto/modes/driveForward/OpenLoopDriveForward.java
  24. 0 src/{ → main/java}/com/team2169/robot/auto/modes/oneBlock/center/SwitchAuto.java
  25. 0 src/{ → main/java}/com/team2169/robot/auto/modes/oneBlock/side/OneBlockScaleCloseAuto.java
  26. 0 src/{ → main/java}/com/team2169/robot/auto/modes/oneBlock/side/OneBlockScaleFarAuto.java
  27. 0 src/{ → main/java}/com/team2169/robot/auto/modes/oneBlock/side/SwitchCloseAuto.java
  28. 0 src/{ → main/java}/com/team2169/robot/auto/modes/oneBlock/side/SwitchFarAuto.java
  29. 0 src/{ → main/java}/com/team2169/robot/auto/modes/twoBlock/center/TwoBlockSwitchAuto.java
  30. 0 src/{ → main/java}/com/team2169/robot/auto/modes/twoBlock/side/SwitchScaleCloseAuto.java
  31. 0 src/{ → main/java}/com/team2169/robot/auto/modes/twoBlock/side/SwitchScaleFarAuto.java
  32. 0 src/{ → main/java}/com/team2169/robot/auto/modes/twoBlock/side/TwoBlockScaleCloseAuto.java
  33. 0 src/{ → main/java}/com/team2169/robot/auto/modes/twoBlock/side/TwoBlockScaleFarAuto.java
  34. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/BlankTask.java
  35. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/DelayedTask.java
  36. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/NestedPathTask.java
  37. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/ParallelTask.java
  38. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/Task.java
  39. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/TimeTask.java
  40. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/arm/ArmExtend.java
  41. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/arm/ArmPID.java
  42. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/arm/ArmRetract.java
  43. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/arm/ArmStow.java
  44. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/arm/OpenLoopArmDown.java
  45. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/drive/DriveStraight.java
  46. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/drive/OpenLoopDrive.java
  47. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/drive/TurnInPlace.java
  48. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/elevator/ElevatorToGround.java
  49. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/elevator/ElevatorToScaleHigh.java
  50. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/elevator/ElevatorToScaleLow.java
  51. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/elevator/ElevatorToScaleMid.java
  52. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/elevator/ElevatorToSwitch.java
  53. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/intake/IntakeClampAction.java
  54. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/intake/IntakeExhaust.java
  55. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/intake/IntakeIdle.java
  56. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/intake/IntakeIn.java
  57. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/intake/IntakeOpen.java
  58. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/intake/IntakePin.java
  59. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/intake/IntakeUntilHeld.java
  60. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/timer/StartTimer.java
  61. 0 src/{ → main/java}/com/team2169/robot/auto/tasks/timer/StopTimer.java
  62. 0 src/{ → main/java}/com/team2169/robot/canCycles/CANCycleHandler.java
  63. 0 src/{ → main/java}/com/team2169/robot/canCycles/CanCycle.java
  64. 0 src/{ → main/java}/com/team2169/robot/canCycles/cycles/DropAndExhaust.java
  65. 0 src/{ → main/java}/com/team2169/robot/canCycles/cycles/SampleCANCycle.java
  66. 0 src/{ → main/java}/com/team2169/robot/subsystems/Arm.java
  67. 0 src/{ → main/java}/com/team2169/robot/subsystems/Climber.java
  68. 0 src/{ → main/java}/com/team2169/robot/subsystems/DriveTrain.java
  69. 0 src/{ → main/java}/com/team2169/robot/subsystems/Elevator.java
  70. 0 src/{ → main/java}/com/team2169/robot/subsystems/ElevatorArm.java
  71. 0 src/{ → main/java}/com/team2169/robot/subsystems/Intake.java
  72. 0 src/{ → main/java}/com/team2169/robot/subsystems/Subsystem.java
  73. 0 src/{ → main/java}/com/team2169/robot/subsystems/Superstructure.java
  74. +1 −1 src/{ → main/java}/com/team2169/util/AbsoluteEncoder.java
  75. 0 src/{ → main/java}/com/team2169/util/CameraManager.java
  76. 0 src/{ → main/java}/com/team2169/util/ColorData.java
  77. 0 src/{ → main/java}/com/team2169/util/Converter.java
  78. 0 src/{ → main/java}/com/team2169/util/DataSelector.java
  79. 0 src/{ → main/java}/com/team2169/util/DebugPrinter.java
  80. 0 src/{ → main/java}/com/team2169/util/DriveManager.java
  81. 0 src/{ → main/java}/com/team2169/util/DriveSignal.java
  82. 0 src/{ → main/java}/com/team2169/util/EncoderHealthChecker.java
  83. 0 src/{ → main/java}/com/team2169/util/FMSManager.java
  84. 0 src/{ → main/java}/com/team2169/util/FieldInterpreter.java
  85. 0 src/{ → main/java}/com/team2169/util/FlyByWireHandler.java
  86. 0 src/{ → main/java}/com/team2169/util/PIDF.java
  87. 0 src/{ → main/java}/com/team2169/util/SerialManager.java
  88. 0 src/{ → main/java}/com/team2169/util/ShuffleBoardManager.java
  89. 0 src/{ → main/java}/com/team2169/util/TalonMaker.java
  90. BIN src/team2169.lnk
@@ -28,5 +28,7 @@ bin/
\.idea/

*.iml

.gradle/
gradle/
build/
\.settings/

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,46 @@
plugins {
id "java"
id "eclipse"
id "idea"
id "jaci.openrio.gradle.GradleRIO" version "2018.01.22"
}

def TEAM = 2169
def ROBOT_CLASS = "com.team2169.robot.Robot"

// Define my targets (RoboRIO) and artifacts (deployable files)
// This is added by GradleRIO's backing project EmbeddedTools.
deploy {
targets {
target("roborio", jaci.openrio.gradle.frc.RoboRIO) {
team = TEAM
}
}
artifacts {
artifact('frcJava', jaci.openrio.gradle.frc.FRCJavaArtifact) {
targets << "roborio"
}
}
}

// Defining my dependencies. In this case, WPILib (+ friends), CTRE Phoenix (Talon SRX)
// and NavX.
dependencies {
compile wpilib()
compile ctre()
compile navx()
compile openrio.powerup.matchData()
compile pathfinder()
}

// Setting up my Jar File. In this case, adding all libraries into the main jar ('fat jar')
// in order to make them all available at runtime. Also adding the manifest so WPILib
// knows where to look for our Robot Class.
jar {
from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
manifest jaci.openrio.gradle.GradleRIOPlugin.javaManifest(ROBOT_CLASS)
}

task wrapper(type: Wrapper) {
gradleVersion = '4.4'
}

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
172 gradlew
@@ -0,0 +1,172 @@
#!/usr/bin/env sh

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
echo "$*"
}

die () {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "$@"
@@ -0,0 +1,84 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
@@ -34,7 +34,7 @@
private static int bMacroScaleMid = 4;
private static int bMacroScaleHigh = 5;
private static int bMacroHang = 6;

public static int operatorBlockRelease = 1;

// Intake Keys
@@ -18,7 +18,6 @@
private static Superstructure superStructure;
public static FMSManager fms;
private static ShuffleBoardManager shuffle;
boolean lastConnected = true;

@Override
public void robotInit() {
@@ -110,7 +110,7 @@

}

public static enum ElevatorDirection {
public enum ElevatorDirection {
UP, DOWN
}

Oops, something went wrong.

0 comments on commit d5764b0

Please sign in to comment.