Skip to content

Commit 6dde0ca

Browse files
authored
Merge pull request #30 from AZ-First/develop
Merge `develop` into `main` for v1.0.0-rc1 release
2 parents 2944296 + 956718b commit 6dde0ca

80 files changed

Lines changed: 2032 additions & 1678 deletions

File tree

Some content is hidden

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

.github/dependabot.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ updates:
1010
- package-ecosystem: "github-actions"
1111
# Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
1212
directory: "/"
13+
labels:
14+
- "github_actions"
1315
schedule:
14-
interval: "weekly"
16+
interval: "monthly"
1517

1618
# Maintain dependencies for gradle
1719
- package-ecosystem: "gradle"
@@ -20,4 +22,4 @@ updates:
2022
labels:
2123
- "gradle dependencies"
2224
schedule:
23-
interval: "monthly"
25+
interval: "weekly"

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ name: CI
66
# events but only for the main branch.
77
on:
88
push:
9-
branches: [ main ]
9+
branches: [ main, develop ]
1010
pull_request:
11-
branches: [ main ]
11+
branches: [ main, develop ]
1212

1313
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1414
jobs:

.vscode/settings.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,36 @@
3636
"spotlessGradle.format.enable": true,
3737
"spotlessGradle.diagnostics.enable": false,
3838
"java.import.gradle.annotationProcessing.enabled": false,
39+
"java.completion.favoriteStaticMembers": [
40+
"org.junit.Assert.*",
41+
"org.junit.Assume.*",
42+
"org.junit.jupiter.api.Assertions.*",
43+
"org.junit.jupiter.api.Assumptions.*",
44+
"org.junit.jupiter.api.DynamicContainer.*",
45+
"org.junit.jupiter.api.DynamicTest.*",
46+
"org.mockito.Mockito.*",
47+
"org.mockito.ArgumentMatchers.*",
48+
"org.mockito.Answers.*",
49+
"edu.wpi.first.units.Units.*"
50+
],
51+
"java.completion.filteredTypes": [
52+
"java.awt.*",
53+
"com.sun.*",
54+
"sun.*",
55+
"jdk.*",
56+
"org.graalvm.*",
57+
"io.micrometer.shaded.*",
58+
"java.beans.*",
59+
"java.util.Base64.*",
60+
"java.util.Timer",
61+
"java.sql.*",
62+
"javax.swing.*",
63+
"javax.management.*",
64+
"javax.smartcardio.*",
65+
"edu.wpi.first.math.proto.*",
66+
"edu.wpi.first.math.**.proto.*",
67+
"edu.wpi.first.math.**.struct.*"
68+
],
3969
"editor.defaultFormatter": "richardwillis.vscode-spotless-gradle",
4070
"[json]": {
4171
"editor.defaultFormatter": "richardwillis.vscode-spotless-gradle"

.wpilib/wpilib_preferences.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"enableCppIntellisense": false,
33
"currentLanguage": "java",
4-
"projectYear": "2025beta",
4+
"projectYear": "2025",
55
"teamNumber": 0
66
}

AdvantageScope Swerve Calibration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
}
123123
}
124124
],
125-
"game": "2024 Field",
125+
"game": "2025 Field",
126126
"origin": "blue"
127127
},
128128
"controllerUUID": "psf0y633oclnjyocus23hcnq1d4tpyte",

INSTALL.md

Lines changed: 47 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,26 @@ recommended to **not** select the "Include all branches" checkbox.
2424

2525
--------
2626

27-
### Setting up your new project
27+
### Software Requirements
28+
29+
The Az-RBSI requires the [2025 WPILib Installer](
30+
https://github.com/wpilibsuite/allwpilib/releases) (VSCode and associated
31+
tools), 2025 firmware installed on all hardware (motors, encoders, power
32+
distribution, etc.), the [2025 NI FRC Game Tools](
33+
https://www.ni.com/en/support/downloads/drivers/download.frc-game-tools.html)
34+
(Driver Station and associated tools), and the [2025 CTRE Phoenix Tuner X](
35+
https://v6.docs.ctr-electronics.com/en/stable/docs/tuner/index.html). Take a
36+
moment to update all software and firmware before attempting to load your new
37+
robot project.
38+
39+
Please note that you need these _minimum_ versions of the following components:
40+
41+
* WPILib `2025.1.1`
42+
* RoboRIO image `FRC_roboRIO_2025_v2.0`
2843

29-
**The Az-RBSI requires the 2025 WPILib Installer (VSCode and associated tools),
30-
2025 firmware installed on all hardware (motors, encoders, power distribution,
31-
etc.), the 2025 NI FRC Game Tools (Driver Station and associated tools), and
32-
the 2025 CTRE Phoenix Tuner X. Take a moment to update all software and
33-
firmware before attempting to load your new robot project.**
44+
--------
45+
46+
### Setting up your new project
3447

3548
When your new robot code respository is created, it will have a single commit
3649
that contains the entire Az-RBSI template for the current release. (See the
@@ -42,9 +55,19 @@ steps you need to complete:
4255

4356
1. Add your team number to the `.wpilib/wpilib_preferences.json` file. The
4457
generic Az-RBSI template contains a team number "0", and your code will not
45-
deploy properly if this variable is not set (*e.g.*, VSCode looks for the
46-
RoboRIO on IP address `10.TE.AM.2`, and it will not find anything if it
47-
tries to contact `10.0.0.2`.)
58+
deploy properly if this variable is not set (*i.e.*, since VSCode looks for
59+
the RoboRIO on IP address `10.TE.AM.2`, it will not find anything if it
60+
tries to contact `10.0.0.2`.) If you forget to change this value, you will
61+
get an error message when deploying code to your robot like:
62+
63+
```
64+
Missing Target!
65+
=============================================
66+
Are you connected to the robot, and is it on?
67+
=============================================
68+
GradleRIO detected this build failed due to not being able to find "roborio"!
69+
Scroll up in this error log for more information.
70+
```
4871

4972
2. If you have an all-CTRE swerve base (*i.e.*, 8x TalonFX-controlled motors,
5073
4x CANCoders, and 1x Pigeon2), use Phoenix Tuner X to create a swerve
@@ -76,14 +99,24 @@ method are encouraged to submit bug reports and code fixes to the [Az-RBSI
7699
repository](https://github.com/AZ-First/Az-RBSI).
77100

78101
6. The Az-RBSI expects an Xbox-style controller -- if you have a PS4 or other,
79-
change this at the top of the `RobotContainer.java` file in the
80-
`src/main/java/frc/robot` directory.
81-
82-
7. Power ports...
102+
substitute the proper command-based controller class for
103+
`CommandXboxController` near the top of the `RobotContainer.java` file in
104+
the `src/main/java/frc/robot` directory.
105+
106+
7. Power monitoring by subsystem is included in the Az-RBSI. In order to
107+
properly match subsystems to ports on your Power Distribution Module,
108+
carefully edit the `CANandPowerPorts` of `Constants.java` to include the
109+
proper power ports for each motor in your drivetrain, and include any
110+
motors from additional subsystems you add to your robot. To include
111+
additional subsystems in the monitoring, add them to the [`m_power`
112+
instantiation](
113+
https://github.com/AZ-First/Az-RBSI/blob/38f6391cb70c4caa90502710f591682815064677/src/main/java/frc/robot/RobotContainer.java#L154-L157) in the `RobotContainer.java` file.
83114

84115
8. All of the constants for needed for tuning your robot should be in the
85116
`Constants.java` file in the `src/main/java/frc/robot` directory. This file
86-
should be thoroughly edited to match the particulars of your robot.
117+
should be thoroughly edited to match the particulars of your robot. Be sure
118+
to work through each section of this file and include the proper values for
119+
your robot.
87120

88121

89122
--------

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,8 @@ effective logging for troubleshooting.
5353
* [PhotonVision](https://docs.photonvision.org/en/latest/) / [Limelight](
5454
https://docs.limelightvision.io/docs/docs-limelight/getting-started/summary)
5555
-- Robot vision / tracking
56+
57+
## Further Reading
58+
59+
For tips on command-based programming, see this post:
60+
https://bovlb.github.io/frc-tips/commands/best-practices.html

WPILib-License.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2009-2024 FIRST and other WPILib contributors
1+
Copyright (c) 2009-2025 FIRST and other WPILib contributors
22
All rights reserved.
33

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

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
3+
id "edu.wpi.first.GradleRIO" version "2025.2.1"
44
id "com.peterabeles.gversion" version "1.10.3"
55
id "com.diffplug.spotless" version "6.25.0"
66
id "io.freefair.lombok" version "8.11"

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pluginManagement {
44
repositories {
55
mavenLocal()
66
gradlePluginPortal()
7-
String frcYear = '2024'
7+
String frcYear = '2025'
88
File frcHome
99
if (OperatingSystem.current().isWindows()) {
1010
String publicFolder = System.getenv('PUBLIC')

0 commit comments

Comments
 (0)