Skip to content

Commit 01b0726

Browse files
committed
Update examples for the 2024 kickoff
1 parent 19ea9b1 commit 01b0726

File tree

1,140 files changed

+58385
-48779
lines changed

Some content is hidden

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

1,140 files changed

+58385
-48779
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"enableCppIntellisense": true,
33
"currentLanguage": "cpp",
4-
"projectYear": "2023",
4+
"projectYear": "2024",
55
"teamNumber": 7762
6-
}
6+
}

C++ General/CANCoder/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "cpp"
33
id "google-test-test-suite"
4-
id "edu.wpi.first.GradleRIO" version "2023.3.2"
4+
id "edu.wpi.first.GradleRIO" version "2024.1.1"
55
}
66

77
// Define my targets (RoboRIO) and artifacts (deployable files)
-15.7 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
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.3.3-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

C++ General/CANCoder/gradlew

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
3232
# Busybox and similar reduced shells will NOT work, because this script
3333
# requires all of these POSIX shell features:
3434
# * functions;
35-
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36-
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37-
# * compound commands having a testable exit status, especially «case»;
38-
# * various built-in commands including «command», «set», and «ulimit».
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
3939
#
4040
# Important for patching:
4141
#
@@ -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,18 +198,28 @@ 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" \
204213
-classpath "$CLASSPATH" \
205214
org.gradle.wrapper.GradleWrapperMain \
206215
"$@"
207216

217+
# Stop when "xargs" is not available.
218+
if ! command -v xargs >/dev/null 2>&1
219+
then
220+
die "xargs is not available"
221+
fi
222+
208223
# Use "xargs" to parse quoted args.
209224
#
210225
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

C++ General/CANCoder/gradlew.bat

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

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

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4041

4142
set JAVA_EXE=java.exe
4243
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44+
if %ERRORLEVEL% equ 0 goto execute
4445

4546
echo.
4647
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7576

7677
:end
7778
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
if %ERRORLEVEL% equ 0 goto mainEnd
7980

8081
:fail
8182
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8283
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
8588

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

C++ General/CANCoder/settings.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pluginManagement {
44
repositories {
55
mavenLocal()
66
gradlePluginPortal()
7-
String frcYear = '2023'
7+
String frcYear = '2024'
88
File frcHome
99
if (OperatingSystem.current().isWindows()) {
1010
String publicFolder = System.getenv('PUBLIC')
@@ -25,3 +25,6 @@ pluginManagement {
2525
}
2626
}
2727
}
28+
29+
Properties props = System.getProperties();
30+
props.setProperty("org.gradle.internal.native.headers.unresolved.dependencies.ignore", "true");
Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
{
2+
"fileName": "Phoenix5.json",
3+
"name": "CTRE-Phoenix (v5)",
4+
"version": "5.33.0",
5+
"frcYear": 2024,
6+
"uuid": "ab676553-b602-441f-a38d-f1296eff6537",
7+
"mavenUrls": [
8+
"https://maven.ctr-electronics.com/release/"
9+
],
10+
"jsonUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix/Phoenix5-frc2024-latest.json",
11+
"requires": [
12+
{
13+
"uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
14+
"errorMessage": "Phoenix 5 requires low-level libraries from Phoenix 6. Please add the Phoenix 6 vendordep before adding Phoenix 5.",
15+
"offlineFileName": "Phoenix6.json",
16+
"onlineUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-frc2024-latest.json"
17+
}
18+
],
19+
"javaDependencies": [
20+
{
21+
"groupId": "com.ctre.phoenix",
22+
"artifactId": "api-java",
23+
"version": "5.33.0"
24+
},
25+
{
26+
"groupId": "com.ctre.phoenix",
27+
"artifactId": "wpiapi-java",
28+
"version": "5.33.0"
29+
}
30+
],
31+
"jniDependencies": [
32+
{
33+
"groupId": "com.ctre.phoenix",
34+
"artifactId": "cci",
35+
"version": "5.33.0",
36+
"isJar": false,
37+
"skipInvalidPlatforms": true,
38+
"validPlatforms": [
39+
"windowsx86-64",
40+
"linuxx86-64",
41+
"linuxathena"
42+
],
43+
"simMode": "hwsim"
44+
},
45+
{
46+
"groupId": "com.ctre.phoenix.sim",
47+
"artifactId": "cci-sim",
48+
"version": "5.33.0",
49+
"isJar": false,
50+
"skipInvalidPlatforms": true,
51+
"validPlatforms": [
52+
"windowsx86-64",
53+
"linuxx86-64",
54+
"osxuniversal"
55+
],
56+
"simMode": "swsim"
57+
}
58+
],
59+
"cppDependencies": [
60+
{
61+
"groupId": "com.ctre.phoenix",
62+
"artifactId": "wpiapi-cpp",
63+
"version": "5.33.0",
64+
"libName": "CTRE_Phoenix_WPI",
65+
"headerClassifier": "headers",
66+
"sharedLibrary": true,
67+
"skipInvalidPlatforms": true,
68+
"binaryPlatforms": [
69+
"windowsx86-64",
70+
"linuxx86-64",
71+
"linuxathena"
72+
],
73+
"simMode": "hwsim"
74+
},
75+
{
76+
"groupId": "com.ctre.phoenix",
77+
"artifactId": "api-cpp",
78+
"version": "5.33.0",
79+
"libName": "CTRE_Phoenix",
80+
"headerClassifier": "headers",
81+
"sharedLibrary": true,
82+
"skipInvalidPlatforms": true,
83+
"binaryPlatforms": [
84+
"windowsx86-64",
85+
"linuxx86-64",
86+
"linuxathena"
87+
],
88+
"simMode": "hwsim"
89+
},
90+
{
91+
"groupId": "com.ctre.phoenix",
92+
"artifactId": "cci",
93+
"version": "5.33.0",
94+
"libName": "CTRE_PhoenixCCI",
95+
"headerClassifier": "headers",
96+
"sharedLibrary": true,
97+
"skipInvalidPlatforms": true,
98+
"binaryPlatforms": [
99+
"windowsx86-64",
100+
"linuxx86-64",
101+
"linuxathena"
102+
],
103+
"simMode": "hwsim"
104+
},
105+
{
106+
"groupId": "com.ctre.phoenix.sim",
107+
"artifactId": "wpiapi-cpp-sim",
108+
"version": "5.33.0",
109+
"libName": "CTRE_Phoenix_WPISim",
110+
"headerClassifier": "headers",
111+
"sharedLibrary": true,
112+
"skipInvalidPlatforms": true,
113+
"binaryPlatforms": [
114+
"windowsx86-64",
115+
"linuxx86-64",
116+
"osxuniversal"
117+
],
118+
"simMode": "swsim"
119+
},
120+
{
121+
"groupId": "com.ctre.phoenix.sim",
122+
"artifactId": "api-cpp-sim",
123+
"version": "5.33.0",
124+
"libName": "CTRE_PhoenixSim",
125+
"headerClassifier": "headers",
126+
"sharedLibrary": true,
127+
"skipInvalidPlatforms": true,
128+
"binaryPlatforms": [
129+
"windowsx86-64",
130+
"linuxx86-64",
131+
"osxuniversal"
132+
],
133+
"simMode": "swsim"
134+
},
135+
{
136+
"groupId": "com.ctre.phoenix.sim",
137+
"artifactId": "cci-sim",
138+
"version": "5.33.0",
139+
"libName": "CTRE_PhoenixCCISim",
140+
"headerClassifier": "headers",
141+
"sharedLibrary": true,
142+
"skipInvalidPlatforms": true,
143+
"binaryPlatforms": [
144+
"windowsx86-64",
145+
"linuxx86-64",
146+
"osxuniversal"
147+
],
148+
"simMode": "swsim"
149+
}
150+
]
151+
}

0 commit comments

Comments
 (0)