diff --git a/.gradle/6.0.1/executionHistory/executionHistory.bin b/.gradle/6.0.1/executionHistory/executionHistory.bin index e5566ef..b1d1d6e 100644 Binary files a/.gradle/6.0.1/executionHistory/executionHistory.bin and b/.gradle/6.0.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/6.0.1/executionHistory/executionHistory.lock b/.gradle/6.0.1/executionHistory/executionHistory.lock index 8a9b81c..70ecc5b 100644 Binary files a/.gradle/6.0.1/executionHistory/executionHistory.lock and b/.gradle/6.0.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/6.0.1/fileHashes/fileHashes.bin b/.gradle/6.0.1/fileHashes/fileHashes.bin index 3499f40..3bcdaeb 100644 Binary files a/.gradle/6.0.1/fileHashes/fileHashes.bin and b/.gradle/6.0.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/6.0.1/fileHashes/fileHashes.lock b/.gradle/6.0.1/fileHashes/fileHashes.lock index 7d4248e..1a5a805 100644 Binary files a/.gradle/6.0.1/fileHashes/fileHashes.lock and b/.gradle/6.0.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/6.0.1/javaCompile/javaCompile.lock b/.gradle/6.0.1/javaCompile/javaCompile.lock index a0da2e9..9490f15 100644 Binary files a/.gradle/6.0.1/javaCompile/javaCompile.lock and b/.gradle/6.0.1/javaCompile/javaCompile.lock differ diff --git a/.gradle/6.0.1/javaCompile/taskHistory.bin b/.gradle/6.0.1/javaCompile/taskHistory.bin index e60111a..03ade66 100644 Binary files a/.gradle/6.0.1/javaCompile/taskHistory.bin and b/.gradle/6.0.1/javaCompile/taskHistory.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b7fff16..1571dda 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 414e3c3..9ace313 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/build/libs/2020Robot.jar b/build/libs/2020Robot.jar index e3741b3..6470795 100644 Binary files a/build/libs/2020Robot.jar and b/build/libs/2020Robot.jar differ diff --git a/build/tmp/expandedArchives/SparkMax-driver-1.5.1-linuxathena.zip_720f144c6120693f94d3d8bf7b40351d/linux/athena/shared/libSparkMaxDriver.so b/build/tmp/expandedArchives/SparkMax-driver-1.5.1-linuxathena.zip_720f144c6120693f94d3d8bf7b40351d/linux/athena/shared/libSparkMaxDriver.so deleted file mode 100644 index bb69112..0000000 Binary files a/build/tmp/expandedArchives/SparkMax-driver-1.5.1-linuxathena.zip_720f144c6120693f94d3d8bf7b40351d/linux/athena/shared/libSparkMaxDriver.so and /dev/null differ diff --git a/build/tmp/expandedArchives/SparkMax-driver-1.5.1-windowsx86-64.zip_9140066d72c716986ad7b6fb4d585e87/windows/x86-64/shared/SparkMaxDriver.dll b/build/tmp/expandedArchives/SparkMax-driver-1.5.1-windowsx86-64.zip_9140066d72c716986ad7b6fb4d585e87/windows/x86-64/shared/SparkMaxDriver.dll deleted file mode 100644 index 18edb68..0000000 Binary files a/build/tmp/expandedArchives/SparkMax-driver-1.5.1-windowsx86-64.zip_9140066d72c716986ad7b6fb4d585e87/windows/x86-64/shared/SparkMaxDriver.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/canutils-5.17.4-windowsx86-64.zip_414a12d5d8a1680253c49012af76d274/windows/x86-64/shared/CTRE_PhoenixCanutils.dll b/build/tmp/expandedArchives/canutils-5.17.4-windowsx86-64.zip_414a12d5d8a1680253c49012af76d274/windows/x86-64/shared/CTRE_PhoenixCanutils.dll deleted file mode 100644 index cc2fec7..0000000 Binary files a/build/tmp/expandedArchives/canutils-5.17.4-windowsx86-64.zip_414a12d5d8a1680253c49012af76d274/windows/x86-64/shared/CTRE_PhoenixCanutils.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/canutils-5.17.6-windowsx86-64.zip_cba10a701162fcb5b92ec9342a548f38/windows/x86-64/shared/CTRE_PhoenixCanutils.dll b/build/tmp/expandedArchives/canutils-5.17.6-windowsx86-64.zip_cba10a701162fcb5b92ec9342a548f38/windows/x86-64/shared/CTRE_PhoenixCanutils.dll deleted file mode 100644 index e59dd0e..0000000 Binary files a/build/tmp/expandedArchives/canutils-5.17.6-windowsx86-64.zip_cba10a701162fcb5b92ec9342a548f38/windows/x86-64/shared/CTRE_PhoenixCanutils.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/cci-5.17.4-linuxathena.zip_8747bbcaba0ee81706027befd047fc7e/linux/athena/shared/libCTRE_PhoenixCCI.so b/build/tmp/expandedArchives/cci-5.17.4-linuxathena.zip_8747bbcaba0ee81706027befd047fc7e/linux/athena/shared/libCTRE_PhoenixCCI.so deleted file mode 100644 index af5acd0..0000000 Binary files a/build/tmp/expandedArchives/cci-5.17.4-linuxathena.zip_8747bbcaba0ee81706027befd047fc7e/linux/athena/shared/libCTRE_PhoenixCCI.so and /dev/null differ diff --git a/build/tmp/expandedArchives/cci-5.17.4-windowsx86-64.zip_d01747af166ea62b754b07121cd29388/windows/x86-64/shared/CTRE_PhoenixCCI.dll b/build/tmp/expandedArchives/cci-5.17.4-windowsx86-64.zip_d01747af166ea62b754b07121cd29388/windows/x86-64/shared/CTRE_PhoenixCCI.dll deleted file mode 100644 index 13ef089..0000000 Binary files a/build/tmp/expandedArchives/cci-5.17.4-windowsx86-64.zip_d01747af166ea62b754b07121cd29388/windows/x86-64/shared/CTRE_PhoenixCCI.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/cci-5.17.6-linuxathena.zip_f3f3fec4d7f3d671d3e1317be806e0e6/linux/athena/shared/libCTRE_PhoenixCCI.so b/build/tmp/expandedArchives/cci-5.17.6-linuxathena.zip_f3f3fec4d7f3d671d3e1317be806e0e6/linux/athena/shared/libCTRE_PhoenixCCI.so deleted file mode 100644 index eafd967..0000000 Binary files a/build/tmp/expandedArchives/cci-5.17.6-linuxathena.zip_f3f3fec4d7f3d671d3e1317be806e0e6/linux/athena/shared/libCTRE_PhoenixCCI.so and /dev/null differ diff --git a/build/tmp/expandedArchives/cci-5.17.6-windowsx86-64.zip_118dea5e72c698e1b12033804282c706/windows/x86-64/shared/CTRE_PhoenixCCI.dll b/build/tmp/expandedArchives/cci-5.17.6-windowsx86-64.zip_118dea5e72c698e1b12033804282c706/windows/x86-64/shared/CTRE_PhoenixCCI.dll deleted file mode 100644 index b8fe3b8..0000000 Binary files a/build/tmp/expandedArchives/cci-5.17.6-windowsx86-64.zip_118dea5e72c698e1b12033804282c706/windows/x86-64/shared/CTRE_PhoenixCCI.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/core-5.17.4-linuxathena.zip_cb1c17b615073face10d8667f13967af/linux/athena/shared/libCTRE_PhoenixCore.so b/build/tmp/expandedArchives/core-5.17.4-linuxathena.zip_cb1c17b615073face10d8667f13967af/linux/athena/shared/libCTRE_PhoenixCore.so deleted file mode 100644 index af5d663..0000000 Binary files a/build/tmp/expandedArchives/core-5.17.4-linuxathena.zip_cb1c17b615073face10d8667f13967af/linux/athena/shared/libCTRE_PhoenixCore.so and /dev/null differ diff --git a/build/tmp/expandedArchives/core-5.17.4-windowsx86-64.zip_6eea97c558ff6ee0178e909e6fda4f22/windows/x86-64/shared/CTRE_PhoenixCore.dll b/build/tmp/expandedArchives/core-5.17.4-windowsx86-64.zip_6eea97c558ff6ee0178e909e6fda4f22/windows/x86-64/shared/CTRE_PhoenixCore.dll deleted file mode 100644 index b840339..0000000 Binary files a/build/tmp/expandedArchives/core-5.17.4-windowsx86-64.zip_6eea97c558ff6ee0178e909e6fda4f22/windows/x86-64/shared/CTRE_PhoenixCore.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/core-5.17.6-linuxathena.zip_4a5b558db7964ceb12377a5dca2cb16e/linux/athena/shared/libCTRE_PhoenixCore.so b/build/tmp/expandedArchives/core-5.17.6-linuxathena.zip_4a5b558db7964ceb12377a5dca2cb16e/linux/athena/shared/libCTRE_PhoenixCore.so deleted file mode 100644 index af5d663..0000000 Binary files a/build/tmp/expandedArchives/core-5.17.6-linuxathena.zip_4a5b558db7964ceb12377a5dca2cb16e/linux/athena/shared/libCTRE_PhoenixCore.so and /dev/null differ diff --git a/build/tmp/expandedArchives/core-5.17.6-windowsx86-64.zip_3fc89949810b545d683e87d127791227/windows/x86-64/shared/CTRE_PhoenixCore.dll b/build/tmp/expandedArchives/core-5.17.6-windowsx86-64.zip_3fc89949810b545d683e87d127791227/windows/x86-64/shared/CTRE_PhoenixCore.dll deleted file mode 100644 index 5a95c6b..0000000 Binary files a/build/tmp/expandedArchives/core-5.17.6-windowsx86-64.zip_3fc89949810b545d683e87d127791227/windows/x86-64/shared/CTRE_PhoenixCore.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/cscore-cpp-2020.1.2-linuxathena.zip_fffb88f803a9e9685b164d4a1d7b1b84/linux/athena/shared/libcscore.so b/build/tmp/expandedArchives/cscore-cpp-2020.1.2-linuxathena.zip_fffb88f803a9e9685b164d4a1d7b1b84/linux/athena/shared/libcscore.so deleted file mode 100644 index 889b063..0000000 Binary files a/build/tmp/expandedArchives/cscore-cpp-2020.1.2-linuxathena.zip_fffb88f803a9e9685b164d4a1d7b1b84/linux/athena/shared/libcscore.so and /dev/null differ diff --git a/build/tmp/expandedArchives/cscore-cpp-2020.1.2-linuxathena.zip_fffb88f803a9e9685b164d4a1d7b1b84/linux/athena/shared/libcscorejni.so b/build/tmp/expandedArchives/cscore-cpp-2020.1.2-linuxathena.zip_fffb88f803a9e9685b164d4a1d7b1b84/linux/athena/shared/libcscorejni.so deleted file mode 100644 index 937eed5..0000000 Binary files a/build/tmp/expandedArchives/cscore-cpp-2020.1.2-linuxathena.zip_fffb88f803a9e9685b164d4a1d7b1b84/linux/athena/shared/libcscorejni.so and /dev/null differ diff --git a/build/tmp/expandedArchives/cscore-cpp-2020.1.2-windowsx86-64.zip_d95cc832546557d1474e75fdf1868b56/windows/x86-64/shared/cscore.dll b/build/tmp/expandedArchives/cscore-cpp-2020.1.2-windowsx86-64.zip_d95cc832546557d1474e75fdf1868b56/windows/x86-64/shared/cscore.dll deleted file mode 100644 index 81e7984..0000000 Binary files a/build/tmp/expandedArchives/cscore-cpp-2020.1.2-windowsx86-64.zip_d95cc832546557d1474e75fdf1868b56/windows/x86-64/shared/cscore.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/cscore-cpp-2020.1.2-windowsx86-64.zip_d95cc832546557d1474e75fdf1868b56/windows/x86-64/shared/cscorejni.dll b/build/tmp/expandedArchives/cscore-cpp-2020.1.2-windowsx86-64.zip_d95cc832546557d1474e75fdf1868b56/windows/x86-64/shared/cscorejni.dll deleted file mode 100644 index 775ffbf..0000000 Binary files a/build/tmp/expandedArchives/cscore-cpp-2020.1.2-windowsx86-64.zip_d95cc832546557d1474e75fdf1868b56/windows/x86-64/shared/cscorejni.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/diagnostics-5.17.4-linuxathena.zip_e9ccdddc505d90c2e8944bfbc31733ba/linux/athena/shared/libCTRE_PhoenixDiagnostics.so b/build/tmp/expandedArchives/diagnostics-5.17.4-linuxathena.zip_e9ccdddc505d90c2e8944bfbc31733ba/linux/athena/shared/libCTRE_PhoenixDiagnostics.so deleted file mode 100644 index 8af034c..0000000 Binary files a/build/tmp/expandedArchives/diagnostics-5.17.4-linuxathena.zip_e9ccdddc505d90c2e8944bfbc31733ba/linux/athena/shared/libCTRE_PhoenixDiagnostics.so and /dev/null differ diff --git a/build/tmp/expandedArchives/diagnostics-5.17.4-windowsx86-64.zip_f2dd8e63c53dc415363af2015f65a2b2/windows/x86-64/shared/CTRE_PhoenixDiagnostics.dll b/build/tmp/expandedArchives/diagnostics-5.17.4-windowsx86-64.zip_f2dd8e63c53dc415363af2015f65a2b2/windows/x86-64/shared/CTRE_PhoenixDiagnostics.dll deleted file mode 100644 index c0fe640..0000000 Binary files a/build/tmp/expandedArchives/diagnostics-5.17.4-windowsx86-64.zip_f2dd8e63c53dc415363af2015f65a2b2/windows/x86-64/shared/CTRE_PhoenixDiagnostics.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/diagnostics-5.17.6-linuxathena.zip_04184deb40ebceb60c95a00ce0aef22f/linux/athena/shared/libCTRE_PhoenixDiagnostics.so b/build/tmp/expandedArchives/diagnostics-5.17.6-linuxathena.zip_04184deb40ebceb60c95a00ce0aef22f/linux/athena/shared/libCTRE_PhoenixDiagnostics.so deleted file mode 100644 index 732ff5a..0000000 Binary files a/build/tmp/expandedArchives/diagnostics-5.17.6-linuxathena.zip_04184deb40ebceb60c95a00ce0aef22f/linux/athena/shared/libCTRE_PhoenixDiagnostics.so and /dev/null differ diff --git a/build/tmp/expandedArchives/diagnostics-5.17.6-windowsx86-64.zip_f7830bee568d44b25ff27b593de1abda/windows/x86-64/shared/CTRE_PhoenixDiagnostics.dll b/build/tmp/expandedArchives/diagnostics-5.17.6-windowsx86-64.zip_f7830bee568d44b25ff27b593de1abda/windows/x86-64/shared/CTRE_PhoenixDiagnostics.dll deleted file mode 100644 index 987242f..0000000 Binary files a/build/tmp/expandedArchives/diagnostics-5.17.6-windowsx86-64.zip_f7830bee568d44b25ff27b593de1abda/windows/x86-64/shared/CTRE_PhoenixDiagnostics.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/hal-cpp-2020.1.2-linuxathena.zip_2ea52601ed94abd62ff18abb7005e2a4/linux/athena/shared/libwpiHal.so b/build/tmp/expandedArchives/hal-cpp-2020.1.2-linuxathena.zip_2ea52601ed94abd62ff18abb7005e2a4/linux/athena/shared/libwpiHal.so deleted file mode 100644 index 2afb363..0000000 Binary files a/build/tmp/expandedArchives/hal-cpp-2020.1.2-linuxathena.zip_2ea52601ed94abd62ff18abb7005e2a4/linux/athena/shared/libwpiHal.so and /dev/null differ diff --git a/build/tmp/expandedArchives/hal-cpp-2020.1.2-linuxathena.zip_2ea52601ed94abd62ff18abb7005e2a4/linux/athena/shared/libwpiHaljni.so b/build/tmp/expandedArchives/hal-cpp-2020.1.2-linuxathena.zip_2ea52601ed94abd62ff18abb7005e2a4/linux/athena/shared/libwpiHaljni.so deleted file mode 100644 index 86ea51e..0000000 Binary files a/build/tmp/expandedArchives/hal-cpp-2020.1.2-linuxathena.zip_2ea52601ed94abd62ff18abb7005e2a4/linux/athena/shared/libwpiHaljni.so and /dev/null differ diff --git a/build/tmp/expandedArchives/hal-cpp-2020.1.2-windowsx86-64.zip_b5b3a6300d05f22f8343c493c66dc3e8/windows/x86-64/shared/wpiHal.dll b/build/tmp/expandedArchives/hal-cpp-2020.1.2-windowsx86-64.zip_b5b3a6300d05f22f8343c493c66dc3e8/windows/x86-64/shared/wpiHal.dll deleted file mode 100644 index 473056f..0000000 Binary files a/build/tmp/expandedArchives/hal-cpp-2020.1.2-windowsx86-64.zip_b5b3a6300d05f22f8343c493c66dc3e8/windows/x86-64/shared/wpiHal.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/hal-cpp-2020.1.2-windowsx86-64.zip_b5b3a6300d05f22f8343c493c66dc3e8/windows/x86-64/shared/wpiHaljni.dll b/build/tmp/expandedArchives/hal-cpp-2020.1.2-windowsx86-64.zip_b5b3a6300d05f22f8343c493c66dc3e8/windows/x86-64/shared/wpiHaljni.dll deleted file mode 100644 index 21f5b03..0000000 Binary files a/build/tmp/expandedArchives/hal-cpp-2020.1.2-windowsx86-64.zip_b5b3a6300d05f22f8343c493c66dc3e8/windows/x86-64/shared/wpiHaljni.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/halsim_gui-2020.1.2-windowsx86-64.zip_0ded91afab576f356c80ba4c4e7b8310/windows/x86-64/shared/halsim_gui.dll b/build/tmp/expandedArchives/halsim_gui-2020.1.2-windowsx86-64.zip_0ded91afab576f356c80ba4c4e7b8310/windows/x86-64/shared/halsim_gui.dll deleted file mode 100644 index d9d3fd3..0000000 Binary files a/build/tmp/expandedArchives/halsim_gui-2020.1.2-windowsx86-64.zip_0ded91afab576f356c80ba4c4e7b8310/windows/x86-64/shared/halsim_gui.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-linuxathena.zip_230ce3f1532b4765cea0f4ae5fe31717/linux/athena/shared/libntcore.so b/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-linuxathena.zip_230ce3f1532b4765cea0f4ae5fe31717/linux/athena/shared/libntcore.so deleted file mode 100644 index 61bb679..0000000 Binary files a/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-linuxathena.zip_230ce3f1532b4765cea0f4ae5fe31717/linux/athena/shared/libntcore.so and /dev/null differ diff --git a/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-linuxathena.zip_230ce3f1532b4765cea0f4ae5fe31717/linux/athena/shared/libntcorejni.so b/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-linuxathena.zip_230ce3f1532b4765cea0f4ae5fe31717/linux/athena/shared/libntcorejni.so deleted file mode 100644 index 86a8def..0000000 Binary files a/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-linuxathena.zip_230ce3f1532b4765cea0f4ae5fe31717/linux/athena/shared/libntcorejni.so and /dev/null differ diff --git a/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-windowsx86-64.zip_6e96ee7675225f760f7f64f0c5a3e8e7/windows/x86-64/shared/ntcore.dll b/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-windowsx86-64.zip_6e96ee7675225f760f7f64f0c5a3e8e7/windows/x86-64/shared/ntcore.dll deleted file mode 100644 index cbec63e..0000000 Binary files a/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-windowsx86-64.zip_6e96ee7675225f760f7f64f0c5a3e8e7/windows/x86-64/shared/ntcore.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-windowsx86-64.zip_6e96ee7675225f760f7f64f0c5a3e8e7/windows/x86-64/shared/ntcorejni.dll b/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-windowsx86-64.zip_6e96ee7675225f760f7f64f0c5a3e8e7/windows/x86-64/shared/ntcorejni.dll deleted file mode 100644 index 424280a..0000000 Binary files a/build/tmp/expandedArchives/ntcore-cpp-2020.1.2-windowsx86-64.zip_6e96ee7675225f760f7f64f0c5a3e8e7/windows/x86-64/shared/ntcorejni.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_calib3d.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_calib3d.so.3.4 deleted file mode 100644 index 4469dc4..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_calib3d.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_core.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_core.so.3.4 deleted file mode 100644 index fe1c401..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_core.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_features2d.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_features2d.so.3.4 deleted file mode 100644 index 720b46c..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_features2d.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_flann.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_flann.so.3.4 deleted file mode 100644 index 2a09197..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_flann.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_highgui.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_highgui.so.3.4 deleted file mode 100644 index ee59497..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_highgui.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_imgcodecs.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_imgcodecs.so.3.4 deleted file mode 100644 index 9013dab..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_imgcodecs.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_imgproc.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_imgproc.so.3.4 deleted file mode 100644 index b068f4f..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_imgproc.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_java347.so b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_java347.so deleted file mode 100644 index f46b48c..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_java347.so and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_ml.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_ml.so.3.4 deleted file mode 100644 index 9ae330f..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_ml.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_objdetect.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_objdetect.so.3.4 deleted file mode 100644 index 3409fad..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_objdetect.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_photo.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_photo.so.3.4 deleted file mode 100644 index c980d8f..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_photo.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_shape.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_shape.so.3.4 deleted file mode 100644 index bac0639..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_shape.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_stitching.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_stitching.so.3.4 deleted file mode 100644 index 00f1050..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_stitching.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_superres.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_superres.so.3.4 deleted file mode 100644 index 093a540..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_superres.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_video.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_video.so.3.4 deleted file mode 100644 index 4a3ae71..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_video.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_videoio.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_videoio.so.3.4 deleted file mode 100644 index f61e1a8..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_videoio.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_videostab.so.3.4 b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_videostab.so.3.4 deleted file mode 100644 index e8bf839..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-linuxathena.zip_cdac89b3de9eb20812a0da59c2a33aaa/linux/athena/shared/libopencv_videostab.so.3.4 and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_calib3d347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_calib3d347.dll deleted file mode 100644 index debb19c..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_calib3d347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_core347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_core347.dll deleted file mode 100644 index ae197e9..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_core347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_features2d347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_features2d347.dll deleted file mode 100644 index d3ae22c..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_features2d347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_flann347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_flann347.dll deleted file mode 100644 index a530f37..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_flann347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_highgui347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_highgui347.dll deleted file mode 100644 index 2c39cb9..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_highgui347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_imgcodecs347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_imgcodecs347.dll deleted file mode 100644 index e352c69..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_imgcodecs347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_imgproc347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_imgproc347.dll deleted file mode 100644 index f49f04b..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_imgproc347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_java347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_java347.dll deleted file mode 100644 index 468f122..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_java347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_ml347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_ml347.dll deleted file mode 100644 index afb6259..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_ml347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_objdetect347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_objdetect347.dll deleted file mode 100644 index 996b42b..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_objdetect347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_photo347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_photo347.dll deleted file mode 100644 index 8b08ffb..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_photo347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_shape347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_shape347.dll deleted file mode 100644 index 0c501bb..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_shape347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_stitching347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_stitching347.dll deleted file mode 100644 index ca8c1ac..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_stitching347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_superres347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_superres347.dll deleted file mode 100644 index 7988098..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_superres347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_video347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_video347.dll deleted file mode 100644 index b90c8f0..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_video347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_videoio347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_videoio347.dll deleted file mode 100644 index ae3db1a..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_videoio347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_videostab347.dll b/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_videostab347.dll deleted file mode 100644 index 87a5c9f..0000000 Binary files a/build/tmp/expandedArchives/opencv-cpp-3.4.7-2-windowsx86-64.zip_c1b4afe02f1d1728ff01a21481793f4b/windows/x86-64/shared/opencv_videostab347.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/platform-stub-5.17.4-windowsx86-64.zip_d40fd929e2f06297600fa767307844aa/windows/x86-64/shared/CTRE_PhoenixPlatform.dll b/build/tmp/expandedArchives/platform-stub-5.17.4-windowsx86-64.zip_d40fd929e2f06297600fa767307844aa/windows/x86-64/shared/CTRE_PhoenixPlatform.dll deleted file mode 100644 index 213ac79..0000000 Binary files a/build/tmp/expandedArchives/platform-stub-5.17.4-windowsx86-64.zip_d40fd929e2f06297600fa767307844aa/windows/x86-64/shared/CTRE_PhoenixPlatform.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/platform-stub-5.17.6-windowsx86-64.zip_40a7e97a19f5a72a079773d2ceea61bf/windows/x86-64/shared/CTRE_PhoenixPlatform.dll b/build/tmp/expandedArchives/platform-stub-5.17.6-windowsx86-64.zip_40a7e97a19f5a72a079773d2ceea61bf/windows/x86-64/shared/CTRE_PhoenixPlatform.dll deleted file mode 100644 index 16ebe4d..0000000 Binary files a/build/tmp/expandedArchives/platform-stub-5.17.6-windowsx86-64.zip_40a7e97a19f5a72a079773d2ceea61bf/windows/x86-64/shared/CTRE_PhoenixPlatform.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-linuxathena.zip_ced5cd18547f69d04217b8a2b99b1cda/linux/athena/shared/libwpiutil.so b/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-linuxathena.zip_ced5cd18547f69d04217b8a2b99b1cda/linux/athena/shared/libwpiutil.so deleted file mode 100644 index 78da22d..0000000 Binary files a/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-linuxathena.zip_ced5cd18547f69d04217b8a2b99b1cda/linux/athena/shared/libwpiutil.so and /dev/null differ diff --git a/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-linuxathena.zip_ced5cd18547f69d04217b8a2b99b1cda/linux/athena/shared/libwpiutiljni.so b/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-linuxathena.zip_ced5cd18547f69d04217b8a2b99b1cda/linux/athena/shared/libwpiutiljni.so deleted file mode 100644 index 8cbef26..0000000 Binary files a/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-linuxathena.zip_ced5cd18547f69d04217b8a2b99b1cda/linux/athena/shared/libwpiutiljni.so and /dev/null differ diff --git a/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-windowsx86-64.zip_ef35bcf6b53dd3a26ed285017b559cd8/windows/x86-64/shared/wpiutil.dll b/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-windowsx86-64.zip_ef35bcf6b53dd3a26ed285017b559cd8/windows/x86-64/shared/wpiutil.dll deleted file mode 100644 index 7e0e0e0..0000000 Binary files a/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-windowsx86-64.zip_ef35bcf6b53dd3a26ed285017b559cd8/windows/x86-64/shared/wpiutil.dll and /dev/null differ diff --git a/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-windowsx86-64.zip_ef35bcf6b53dd3a26ed285017b559cd8/windows/x86-64/shared/wpiutiljni.dll b/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-windowsx86-64.zip_ef35bcf6b53dd3a26ed285017b559cd8/windows/x86-64/shared/wpiutiljni.dll deleted file mode 100644 index 4f58a5a..0000000 Binary files a/build/tmp/expandedArchives/wpiutil-cpp-2020.1.2-windowsx86-64.zip_ef35bcf6b53dd3a26ed285017b559cd8/windows/x86-64/shared/wpiutiljni.dll and /dev/null differ diff --git a/build/tmp/jar/MANIFEST.MF b/build/tmp/jar/MANIFEST.MF deleted file mode 100644 index 5c77096..0000000 --- a/build/tmp/jar/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: frc.robot.Main - diff --git a/build/tmp/jniExtractDir/CTRE_PhoenixCCI.dll b/build/tmp/jniExtractDir/CTRE_PhoenixCCI.dll deleted file mode 100644 index 13ef089..0000000 Binary files a/build/tmp/jniExtractDir/CTRE_PhoenixCCI.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/CTRE_PhoenixCanutils.dll b/build/tmp/jniExtractDir/CTRE_PhoenixCanutils.dll deleted file mode 100644 index cc2fec7..0000000 Binary files a/build/tmp/jniExtractDir/CTRE_PhoenixCanutils.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/CTRE_PhoenixCore.dll b/build/tmp/jniExtractDir/CTRE_PhoenixCore.dll deleted file mode 100644 index b840339..0000000 Binary files a/build/tmp/jniExtractDir/CTRE_PhoenixCore.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/CTRE_PhoenixDiagnostics.dll b/build/tmp/jniExtractDir/CTRE_PhoenixDiagnostics.dll deleted file mode 100644 index c0fe640..0000000 Binary files a/build/tmp/jniExtractDir/CTRE_PhoenixDiagnostics.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/CTRE_PhoenixPlatform.dll b/build/tmp/jniExtractDir/CTRE_PhoenixPlatform.dll deleted file mode 100644 index 213ac79..0000000 Binary files a/build/tmp/jniExtractDir/CTRE_PhoenixPlatform.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/SparkMaxDriver.dll b/build/tmp/jniExtractDir/SparkMaxDriver.dll deleted file mode 100644 index 18edb68..0000000 Binary files a/build/tmp/jniExtractDir/SparkMaxDriver.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/cscore.dll b/build/tmp/jniExtractDir/cscore.dll deleted file mode 100644 index 81e7984..0000000 Binary files a/build/tmp/jniExtractDir/cscore.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/cscorejni.dll b/build/tmp/jniExtractDir/cscorejni.dll deleted file mode 100644 index 775ffbf..0000000 Binary files a/build/tmp/jniExtractDir/cscorejni.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/ntcore.dll b/build/tmp/jniExtractDir/ntcore.dll deleted file mode 100644 index cbec63e..0000000 Binary files a/build/tmp/jniExtractDir/ntcore.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/ntcorejni.dll b/build/tmp/jniExtractDir/ntcorejni.dll deleted file mode 100644 index 424280a..0000000 Binary files a/build/tmp/jniExtractDir/ntcorejni.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_calib3d347.dll b/build/tmp/jniExtractDir/opencv_calib3d347.dll deleted file mode 100644 index debb19c..0000000 Binary files a/build/tmp/jniExtractDir/opencv_calib3d347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_core347.dll b/build/tmp/jniExtractDir/opencv_core347.dll deleted file mode 100644 index ae197e9..0000000 Binary files a/build/tmp/jniExtractDir/opencv_core347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_features2d347.dll b/build/tmp/jniExtractDir/opencv_features2d347.dll deleted file mode 100644 index d3ae22c..0000000 Binary files a/build/tmp/jniExtractDir/opencv_features2d347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_flann347.dll b/build/tmp/jniExtractDir/opencv_flann347.dll deleted file mode 100644 index a530f37..0000000 Binary files a/build/tmp/jniExtractDir/opencv_flann347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_highgui347.dll b/build/tmp/jniExtractDir/opencv_highgui347.dll deleted file mode 100644 index 2c39cb9..0000000 Binary files a/build/tmp/jniExtractDir/opencv_highgui347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_imgcodecs347.dll b/build/tmp/jniExtractDir/opencv_imgcodecs347.dll deleted file mode 100644 index e352c69..0000000 Binary files a/build/tmp/jniExtractDir/opencv_imgcodecs347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_imgproc347.dll b/build/tmp/jniExtractDir/opencv_imgproc347.dll deleted file mode 100644 index f49f04b..0000000 Binary files a/build/tmp/jniExtractDir/opencv_imgproc347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_java347.dll b/build/tmp/jniExtractDir/opencv_java347.dll deleted file mode 100644 index 468f122..0000000 Binary files a/build/tmp/jniExtractDir/opencv_java347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_ml347.dll b/build/tmp/jniExtractDir/opencv_ml347.dll deleted file mode 100644 index afb6259..0000000 Binary files a/build/tmp/jniExtractDir/opencv_ml347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_objdetect347.dll b/build/tmp/jniExtractDir/opencv_objdetect347.dll deleted file mode 100644 index 996b42b..0000000 Binary files a/build/tmp/jniExtractDir/opencv_objdetect347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_photo347.dll b/build/tmp/jniExtractDir/opencv_photo347.dll deleted file mode 100644 index 8b08ffb..0000000 Binary files a/build/tmp/jniExtractDir/opencv_photo347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_shape347.dll b/build/tmp/jniExtractDir/opencv_shape347.dll deleted file mode 100644 index 0c501bb..0000000 Binary files a/build/tmp/jniExtractDir/opencv_shape347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_stitching347.dll b/build/tmp/jniExtractDir/opencv_stitching347.dll deleted file mode 100644 index ca8c1ac..0000000 Binary files a/build/tmp/jniExtractDir/opencv_stitching347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_superres347.dll b/build/tmp/jniExtractDir/opencv_superres347.dll deleted file mode 100644 index 7988098..0000000 Binary files a/build/tmp/jniExtractDir/opencv_superres347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_video347.dll b/build/tmp/jniExtractDir/opencv_video347.dll deleted file mode 100644 index b90c8f0..0000000 Binary files a/build/tmp/jniExtractDir/opencv_video347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_videoio347.dll b/build/tmp/jniExtractDir/opencv_videoio347.dll deleted file mode 100644 index ae3db1a..0000000 Binary files a/build/tmp/jniExtractDir/opencv_videoio347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/opencv_videostab347.dll b/build/tmp/jniExtractDir/opencv_videostab347.dll deleted file mode 100644 index 87a5c9f..0000000 Binary files a/build/tmp/jniExtractDir/opencv_videostab347.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/wpiHal.dll b/build/tmp/jniExtractDir/wpiHal.dll deleted file mode 100644 index 473056f..0000000 Binary files a/build/tmp/jniExtractDir/wpiHal.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/wpiHaljni.dll b/build/tmp/jniExtractDir/wpiHaljni.dll deleted file mode 100644 index 21f5b03..0000000 Binary files a/build/tmp/jniExtractDir/wpiHaljni.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/wpiutil.dll b/build/tmp/jniExtractDir/wpiutil.dll deleted file mode 100644 index 7e0e0e0..0000000 Binary files a/build/tmp/jniExtractDir/wpiutil.dll and /dev/null differ diff --git a/build/tmp/jniExtractDir/wpiutiljni.dll b/build/tmp/jniExtractDir/wpiutiljni.dll deleted file mode 100644 index 4f58a5a..0000000 Binary files a/build/tmp/jniExtractDir/wpiutiljni.dll and /dev/null differ diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java index 94e0949..539d6b8 100644 --- a/src/main/java/frc/robot/Constants.java +++ b/src/main/java/frc/robot/Constants.java @@ -16,6 +16,7 @@ import frc.robot.core751.subsystems.DifferentialDriveTrain; import frc.robot.core751.subsystems.DifferentialDriveTrain.driveMotor; import frc.robot.core751.subsystems.LightStrip.Orientation; +import frc.robot.core751.wrappers.OverrideableJoystick; /** * The Constants class provides a convenient place for teams to hold robot-wide @@ -48,7 +49,7 @@ public int getButtonMapping() { } - public static Joystick driverStick = new Joystick(Constants.driveStickPort); + public static OverrideableJoystick driverStick = new OverrideableJoystick(Constants.driveStickPort); /*================================/ /===========Drive Train===========/ diff --git a/src/main/java/frc/robot/Replay.java b/src/main/java/frc/robot/Replay.java new file mode 100644 index 0000000..05422c8 --- /dev/null +++ b/src/main/java/frc/robot/Replay.java @@ -0,0 +1,16 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +package frc.robot; + +/** + * Add your docs here. + */ +public class Replay { + public static Double[][] array = {{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.15748031437397003D},{0.4330708682537079D,0.15748031437397003D},{0.4330708682537079D,0.15748031437397003D},{0.4330708682537079D,0.15748031437397003D},{0.4330708682537079D,0.17322835326194763D},{0.4330708682537079D,0.18110236525535583D},{0.4330708682537079D,0.18110236525535583D},{0.4330708682537079D,0.18110236525535583D},{0.4330708682537079D,0.18110236525535583D},{0.4330708682537079D,0.18897637724876404D},{0.4330708682537079D,0.18897637724876404D},{0.4330708682537079D,0.18897637724876404D},{0.4330708682537079D,0.18110236525535583D},{0.4330708682537079D,0.18110236525535583D},{0.4330708682537079D,0.18110236525535583D},{0.4330708682537079D,0.16535432636737823D},{0.4330708682537079D,0.14960630238056183D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.14173229038715363D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.12598425149917603D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11811023950576782D},{0.4330708682537079D,0.11023622006177902D},{0.4330708682537079D,0.11023622006177902D},{0.4330708682537079D,0.11023622006177902D},{0.4330708682537079D,0.09448818862438202D},{0.4251968562602997D,0.07086614519357681D},{0.4251968562602997D,0.06299212574958801D},{0.4251968562602997D,0.05511811003088951D},{0.4251968562602997D,0.05511811003088951D},{0.4251968562602997D,0.05511811003088951D},{0.4173228442668915D,0.05511811003088951D},{0.4173228442668915D,0.05511811003088951D},{0.4094488322734833D,0.05511811003088951D},{0.4094488322734833D,0.05511811003088951D},{0.4094488322734833D,0.05511811003088951D},{0.4094488322734833D,0.05511811003088951D},{0.4094488322734833D,0.05511811003088951D},{0.4094488322734833D,0.05511811003088951D},{0.4015747904777527D,0.07874015718698502D},{0.3937007784843445D,0.10236220806837082D},{0.3858267664909363D,0.11023622006177902D},{0.3779527544975281D,0.12598425149917603D},{0.3779527544975281D,0.12598425149917603D},{0.3779527544975281D,0.12598425149917603D},{0.3779527544975281D,0.12598425149917603D},{0.3779527544975281D,0.12598425149917603D},{0.3700787425041199D,0.14173229038715363D,1D},{0.3700787425041199D,0.14173229038715363D,1D},{0.3700787425041199D,0.14173229038715363D,1D},{0.3700787425041199D,0.14173229038715363D,1D},{0.3700787425041199D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3779527544975281D,0.14173229038715363D,1D},{0.3858267664909363D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3937007784843445D,0.14173229038715363D,1D},{0.3779527544975281D,0.11023622006177902D,1D},{0.3385826647281647D,0.08661417663097382D,1D},{0.3385826647281647D,0.08661417663097382D,1D},{0.10236220806837082D,0.0D,1D},{0.007874015718698502D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D},{-0.015625D,0.0D,1D}}; + +} diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 7ec7dfe..e2962e9 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -23,6 +23,8 @@ import frc.robot.core751.subsystems.LightStrip; import frc.robot.subsystems.*; import frc.robot.commands.SimpleAuton; +import frc.robot.core751.commands.JoystickPlayer; +import frc.robot.core751.commands.JoystickRecorder; /** * This class is where the bulk of the robot should be declared. Since Command-based is a @@ -40,7 +42,7 @@ public class RobotContainer { private final DifferentialDriveTrain differentialDriveTrain = new DifferentialDriveTrain(Constants.leftDrivetrainIDs, Constants.rightDrivetrainIDs, Constants.driveTrainMotorType, Constants.driveMotorProfile, Constants.driveInvertLeft, Constants.driveInvertRight); private final ReversableArcadeDrive reversableArcadeDrive = new ReversableArcadeDrive(Constants.driverStick, differentialDriveTrain); - private final SwitchDriveDirection switchDriveDirection = new SwitchDriveDirection(differentialDriveTrain); + private final SwitchDriveDirection switchDriveDirection = new SwitchDriveDirection(differentialDriveTrain, 0, 1); private final LightStrip[] lightStrips = new LightStrip[] { new LightStrip(Constants.FTLEDstart, Constants.FTLEDLength, Constants.FTLEDOrientation), @@ -55,22 +57,21 @@ public class RobotContainer { private final RotateThenSelect rotateThenSelect = new RotateThenSelect(panel, lightStrips); private final TogglePanelPosition togglePanelPosition = new TogglePanelPosition(panel); - private Camera camera; + private final Camera camera0 = new Camera(0); + private final Camera camera1 = new Camera(1); private final Ball ball = new Ball(Constants.ballIntakeMotorID, Constants.ballPolycordMotorID, Constants.ballOutakeMotorID); private final DefaultBall defaultBall = new DefaultBall(ball, Constants.driverStick, Constants.ballLBumper, Constants.ballRBumper, Constants.ballOutButton, Constants.ballReverseOutButton); private final PowerDistributionPanel pdp = new PowerDistributionPanel(); + + private final JoystickRecorder joystickRecorder = new JoystickRecorder(Constants.driverStick); + private final JoystickPlayer joystickPlayer = new JoystickPlayer(Replay.array, Constants.driverStick); /** * The container for the robot. Contains subsystems, OI devices, and commands. */ public RobotContainer() { - try { - this.camera = new Camera(0); - } catch (Exception e) { - System.out.println(e); - } //Configure the button bindings configureButtonBindings(); } @@ -101,6 +102,8 @@ private void configureButtonBindings() { SmartDashboard.putData(goToColor); SmartDashboard.putData(rotateWheel); SmartDashboard.putData(rotateThenSelect); + SmartDashboard.putData(joystickRecorder); + SmartDashboard.putData(joystickPlayer); } @@ -114,4 +117,4 @@ public Command getAutonomousCommand() { //TODO: Add auto command return new SimpleAuton(differentialDriveTrain, ball); } -} \ No newline at end of file +} diff --git a/src/main/java/frc/robot/core751 b/src/main/java/frc/robot/core751 index 6e65a18..c2032c1 160000 --- a/src/main/java/frc/robot/core751 +++ b/src/main/java/frc/robot/core751 @@ -1 +1 @@ -Subproject commit 6e65a187811cab44b0d92f200c4ab4a6b10a97df +Subproject commit c2032c11793fd8232b095cb936b36d42241bd13c