Skip to content

Commit 27b1b33

Browse files
committed
updated everything to 2024 and removed trajectory following
1 parent a8dd25a commit 27b1b33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+154
-538
lines changed

.github/workflows/gradle.yml

-34
This file was deleted.

.gitignore

+19
Original file line numberDiff line numberDiff line change
@@ -166,3 +166,22 @@ gradle-app.setting
166166
.project
167167
.settings/
168168
bin/
169+
170+
# IntelliJ
171+
*.iml
172+
*.ipr
173+
*.iws
174+
.idea/
175+
out/
176+
177+
# Fleet
178+
.fleet
179+
180+
# Simulation GUI and other tools window save file
181+
*-window.json
182+
183+
# Simulation data log directory
184+
logs/
185+
186+
# Folder that has CTRE Phoenix Sim device config storage
187+
ctre_sim/

.pathplanner/settings.json

-7
This file was deleted.

.wpilib/wpilib_preferences.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"enableCppIntellisense": false,
33
"currentLanguage": "java",
4-
"projectYear": "2023",
4+
"projectYear": "2024beta",
55
"teamNumber": 9038
66
}

2023-chargedup.json

-19
This file was deleted.

2023-field.png

-1.09 MB
Binary file not shown.

README.md

-2
This file was deleted.

WPILib-License.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2009-2021 FIRST and other WPILib contributors
1+
Copyright (c) 2009-2023 FIRST and other WPILib contributors
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

build.gradle

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "2023.4.3"
3+
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-4"
44
}
55

6-
sourceCompatibility = JavaVersion.VERSION_11
7-
targetCompatibility = JavaVersion.VERSION_11
6+
java {
7+
sourceCompatibility = JavaVersion.VERSION_17
8+
targetCompatibility = JavaVersion.VERSION_17
9+
}
810

911
def ROBOT_MAIN_CLASS = "frc.robot.Main"
1012

@@ -85,6 +87,7 @@ wpi.sim.addDriverstation()
8587
// knows where to look for our Robot Class.
8688
jar {
8789
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
90+
from sourceSets.main.allSource
8891
manifest edu.wpi.first.gradlerio.GradleRIOPlugin.javaManifest(ROBOT_MAIN_CLASS)
8992
duplicatesStrategy = DuplicatesStrategy.INCLUDE
9093
}

gradle/wrapper/gradle-wrapper.jar

-16.9 KB
Binary file not shown.
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=permwrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=permwrapper/dists

gradlew

+22-13
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
147+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148+
# shellcheck disable=SC2039,SC3045
146149
MAX_FD=$( ulimit -H -n ) ||
147150
warn "Could not query maximum file descriptor limit"
148151
esac
149152
case $MAX_FD in #(
150153
'' | soft) :;; #(
151154
*)
155+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156+
# shellcheck disable=SC2039,SC3045
152157
ulimit -n "$MAX_FD" ||
153158
warn "Could not set maximum file descriptor limit to $MAX_FD"
154159
esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
193198
done
194199
fi
195200

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
201210

202211
set -- \
203212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
2828
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

maven/com/ctre/phoenix/api-cpp/5.30.4/api-cpp-5.30.4.pom

-9
This file was deleted.

maven/com/ctre/phoenix/api-cpp/maven-metadata.xml

-12
This file was deleted.

maven/com/ctre/phoenix/api-java/5.30.4/api-java-5.30.4.pom

-8
This file was deleted.

maven/com/ctre/phoenix/api-java/maven-metadata.xml

-12
This file was deleted.

maven/com/ctre/phoenix/cci/5.30.4/cci-5.30.4.pom

-9
This file was deleted.

maven/com/ctre/phoenix/cci/maven-metadata.xml

-12
This file was deleted.

maven/com/ctre/phoenix/sim/api-cpp-sim/5.30.4/api-cpp-sim-5.30.4.pom

-9
This file was deleted.

maven/com/ctre/phoenix/sim/api-cpp-sim/maven-metadata.xml

-12
This file was deleted.

maven/com/ctre/phoenix/sim/cci-sim/5.30.4/cci-sim-5.30.4.pom

-9
This file was deleted.

maven/com/ctre/phoenix/sim/cci-sim/maven-metadata.xml

-12
This file was deleted.

maven/com/ctre/phoenix/sim/wpiapi-cpp-sim/5.30.4/wpiapi-cpp-sim-5.30.4.pom

-9
This file was deleted.

maven/com/ctre/phoenix/sim/wpiapi-cpp-sim/maven-metadata.xml

-12
This file was deleted.

maven/com/ctre/phoenix/wpiapi-cpp/5.30.4/wpiapi-cpp-5.30.4.pom

-9
This file was deleted.

maven/com/ctre/phoenix/wpiapi-cpp/maven-metadata.xml

-12
This file was deleted.

maven/com/ctre/phoenix/wpiapi-java/5.30.4/wpiapi-java-5.30.4.pom

-8
This file was deleted.

0 commit comments

Comments
 (0)