Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-19 00:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump wpilib versions to 2024 beta 1 (#947)

Browse Source
This commit is contained in:
Matt
2023-10-15 12:17:40 -04:00
committed by GitHub
parent 82e3da622f
commit 9991f8670c
52 changed files with 125 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
photonlib-cpp-examples/aimandrange/build.gradle
View File

@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2023.4.2"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "com.dorongold.task-tree" version "2.1.0"
}

3
photonlib-cpp-examples/aimandrange/gradlew vendored
View File

@@ -80,7 +80,8 @@ do
esac
done
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}

2
photonlib-cpp-examples/aimandrange/settings.gradle
View File

@@ -7,7 +7,7 @@ pluginManagement {
mavenLocal()
jcenter()
gradlePluginPortal()
String frcYear = '2023'
String frcYear = '2024'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')

4
photonlib-cpp-examples/aimandrange/src/main/include/Robot.h
View File

@@ -53,11 +53,11 @@ class Robot : public frc::TimedRobot {
// PID constants should be tuned per robot
const double LINEAR_P = 0.1;
const double LINEAR_D = 0.0;
frc2::PIDController forwardController{LINEAR_P, 0.0, LINEAR_D};
frc::PIDController forwardController{LINEAR_P, 0.0, LINEAR_D};
const double ANGULAR_P = 0.1;
const double ANGULAR_D = 0.0;
frc2::PIDController turnController{ANGULAR_P, 0.0, ANGULAR_D};
frc::PIDController turnController{ANGULAR_P, 0.0, ANGULAR_D};
// Change this to match the name of your camera
photonlib::PhotonCamera camera{"photonvision"};

2
photonlib-cpp-examples/aimattarget/build.gradle
View File

@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2023.4.2"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "com.dorongold.task-tree" version "2.1.0"
}

3
photonlib-cpp-examples/aimattarget/gradlew vendored
View File

@@ -80,7 +80,8 @@ do
esac
done
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}

2
photonlib-cpp-examples/aimattarget/settings.gradle
View File

@@ -7,7 +7,7 @@ pluginManagement {
mavenLocal()
jcenter()
gradlePluginPortal()
String frcYear = '2023'
String frcYear = '2024'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')

2
photonlib-cpp-examples/aimattarget/src/main/include/Robot.h
View File

@@ -42,7 +42,7 @@ class Robot : public frc::TimedRobot {
// Change this to match the name of your camera
photonlib::PhotonCamera camera{"photonvision"};
// PID constants should be tuned per robot
frc2::PIDController controller{.1, 0, 0};
frc::PIDController controller{.1, 0, 0};
frc::XboxController xboxController{0};

2
photonlib-cpp-examples/apriltagExample/build.gradle
View File

@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2023.4.2"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "com.dorongold.task-tree" version "2.1.0"
}

3
photonlib-cpp-examples/apriltagExample/gradlew vendored
View File

@@ -80,7 +80,8 @@ do
esac
done
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}

2
photonlib-cpp-examples/apriltagExample/settings.gradle
View File

@@ -7,7 +7,7 @@ pluginManagement {
mavenLocal()
jcenter()
gradlePluginPortal()
String frcYear = '2023'
String frcYear = '2024'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')

4
photonlib-cpp-examples/apriltagExample/src/main/include/Drivetrain.h
View File

@@ -109,8 +109,8 @@ class Drivetrain {
frc::Encoder m_leftEncoder{0, 1};
frc::Encoder m_rightEncoder{2, 3};
frc2::PIDController m_leftPIDController{8.5, 0.0, 0.0};
frc2::PIDController m_rightPIDController{8.5, 0.0, 0.0};
frc::PIDController m_leftPIDController{8.5, 0.0, 0.0};
frc::PIDController m_rightPIDController{8.5, 0.0, 0.0};
frc::AnalogGyro m_gyro{0};

7
photonlib-cpp-examples/build.gradle
View File

@@ -28,10 +28,3 @@ spotless {
}
apply from: "examples.gradle"
// Task that depends on the build task for every example
task buildAllExamples { task ->
exampleFolderNames.each { line ->
task.dependsOn(line + ":build")
}
}

2
photonlib-cpp-examples/getinrange/build.gradle
View File

@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2023.4.2"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "com.dorongold.task-tree" version "2.1.0"
}

3
photonlib-cpp-examples/getinrange/gradlew vendored
View File

@@ -80,7 +80,8 @@ do
esac
done
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}

2
photonlib-cpp-examples/getinrange/settings.gradle
View File

@@ -7,7 +7,7 @@ pluginManagement {
mavenLocal()
jcenter()
gradlePluginPortal()
String frcYear = '2023'
String frcYear = '2024'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')

2
photonlib-cpp-examples/getinrange/src/main/include/Robot.h
View File

@@ -53,7 +53,7 @@ class Robot : public frc::TimedRobot {
// PID constants should be tuned per robot
const double P_GAIN = 0.1;
const double D_GAIN = 0.0;
frc2::PIDController controller{P_GAIN, 0.0, D_GAIN};
frc::PIDController controller{P_GAIN, 0.0, D_GAIN};
// Change this to match the name of your camera
photonlib::PhotonCamera camera{"photonvision"};

2
photonlib-cpp-examples/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.3-bin\.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

3
photonlib-cpp-examples/gradlew vendored
View File

@@ -36,7 +36,8 @@ do
esac
done
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}