Skip to content

Commit

Permalink
Merge pull request #21 from CrossTheRoadElec/beta-4
Browse files Browse the repository at this point in the history 
Add control request limits & update to beta-4
@CoryNessCTR
CoryNessCTR authored Dec 6, 2023
2 parents 3cd61e7 + 982d9ad commit 87c6444
Showing 48 changed files with 2,181 additions and 608 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build-all-parallel.yml
View file
Original file line number Diff line number Diff line change
@@ -51,6 +51,8 @@ jobs:
directory: 'java/CANcoder'
- project-name: 'CommandBasedDrive'
directory: 'java/CommandBasedDrive'
- project-name: 'ControlRequestLimits'
directory: 'java/ControlRequestLimits'
- project-name: 'CurrentLimits'
directory: 'java/CurrentLimits'
- project-name: 'Falcon500ArcadeDrive'
9 changes: 8 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
*.bak
*.bak

*.hoot
*.wpilog
simgui-ds.json
simgui.json
networktables.json
ctre_sim
2 changes: 1 addition & 1 deletion build_parallel_workflow.py
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
runs-on: ubuntu-latest
# This grabs the WPILib docker container
container: wpilib/roborio-cross-ubuntu:2023-22.04
container: wpilib/roborio-cross-ubuntu:2024-22.04
steps:
- uses: actions/checkout@v3
48 changes: 24 additions & 24 deletions cpp/BasicLatencyCompensation/vendordeps/Phoenix6.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"fileName": "Phoenix6.json",
"name": "CTRE-Phoenix (v6)",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"frcYear": 2024,
"uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
"mavenUrls": [
@@ -19,14 +19,14 @@
{
"groupId": "com.ctre.phoenix6",
"artifactId": "wpiapi-java",
"version": "24.0.0-beta-3"
"version": "24.0.0-beta-4"
}
],
"jniDependencies": [
{
"groupId": "com.ctre.phoenix6",
"artifactId": "tools",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
@@ -39,7 +39,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "tools-sim",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
@@ -52,7 +52,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simTalonSRX",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
@@ -65,7 +65,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simTalonFX",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
@@ -78,7 +78,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simVictorSPX",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
@@ -91,7 +91,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simPigeonIMU",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
@@ -104,7 +104,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simCANCoder",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
@@ -117,7 +117,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simProTalonFX",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
@@ -130,7 +130,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simProCANcoder",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
@@ -143,7 +143,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simProPigeon2",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
@@ -158,7 +158,7 @@
{
"groupId": "com.ctre.phoenix6",
"artifactId": "wpiapi-cpp",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_Phoenix6_WPI",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -173,7 +173,7 @@
{
"groupId": "com.ctre.phoenix6",
"artifactId": "tools",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_PhoenixTools",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -188,7 +188,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "wpiapi-cpp-sim",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_Phoenix6_WPISim",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -203,7 +203,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "tools-sim",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_PhoenixTools_Sim",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -218,7 +218,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simTalonSRX",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_SimTalonSRX",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -233,7 +233,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simTalonFX",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_SimTalonFX",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -248,7 +248,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simVictorSPX",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_SimVictorSPX",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -263,7 +263,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simPigeonIMU",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_SimPigeonIMU",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -278,7 +278,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simCANCoder",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_SimCANCoder",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -293,7 +293,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simProTalonFX",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_SimProTalonFX",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -308,7 +308,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simProCANcoder",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_SimProCANcoder",
"headerClassifier": "headers",
"sharedLibrary": true,
@@ -323,7 +323,7 @@
{
"groupId": "com.ctre.phoenix6.sim",
"artifactId": "simProPigeon2",
"version": "24.0.0-beta-3",
"version": "24.0.0-beta-4",
"libName": "CTRE_SimProPigeon2",
"headerClassifier": "headers",
"sharedLibrary": true,
Loading

0 comments on commit 87c6444

Please sign in to comment.