Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed typo #2740

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Checkout main
- name: Checkout stable
run: |
git fetch origin main --depth=1
git fetch origin stable --depth=1
- uses: actions/setup-python@v5
with:
python-version: 3.9
Expand All @@ -171,7 +171,7 @@ jobs:
make rediraffecheckdiff
- name: Check redirects format
run: |
[[ $(<source/redirects.txt) == $(git show origin/main:source/redirects.txt)* ]] || { echo "Error: redirects.txt can only be appended to. Lines cannot be modified or deleted."; exit 1; }
[[ $(<source/redirects.txt) == $(git show origin/stable:source/redirects.txt)* ]] || { echo "Error: redirects.txt can only be appended to. Lines cannot be modified or deleted."; exit 1; }

check-formatting:
runs-on: ubuntu-latest
Expand Down
6 changes: 2 additions & 4 deletions source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
]

# Redirect branch
rediraffe_branch = "origin/main"
rediraffe_branch = "origin/stable"

# File containing redirects
rediraffe_redirects = "redirects.txt"
Expand All @@ -112,9 +112,7 @@
# Configure OpenGraph support
ogp_site_url = "https://docs.wpilib.org/en/stable/"
ogp_site_name = "FIRST Robotics Competition Documentation"
ogp_image = (
"https://raw.githubusercontent.com/wpilibsuite/branding/main/png/wpilib-128.png"
)
ogp_image = "https://raw.githubusercontent.com/wpilibsuite/branding/main/export/png/wpilib-icon-256.png"

# Configure photofinish ci mode
photofinish_ci_only = True
Expand Down
20 changes: 10 additions & 10 deletions source/docs/software/commandbased/profile-subsystems-commands.rst
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,16 @@ In either case, a ``TrapezoidProfileCommand`` is created by passing the necessar
.. tab-item:: Java
:sync: Java

.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java
.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/v2024.3.2/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java
:language: java
:lines: 28-43
:lines: 28-44
:linenos:
:lineno-start: 28

.. tab-item:: C++
:sync: C++

.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/wpilibNewCommands/src/main/native/include/frc2/command/TrapezoidProfileCommand.h
.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/v2024.3.2/wpilibNewCommands/src/main/native/include/frc2/command/TrapezoidProfileCommand.h
:language: c++
:lines: 35-49
:linenos:
Expand Down Expand Up @@ -211,7 +211,7 @@ What does a ``TrapezoidProfileSubsystem`` look like when used in practice? The
.. tab-item:: Java
:sync: Java

.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/commands/DriveDistanceProfiled.java
.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/v2024.3.2/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/commands/DriveDistanceProfiled.java
:language: java
:lines: 5-
:linenos:
Expand All @@ -220,7 +220,7 @@ What does a ``TrapezoidProfileSubsystem`` look like when used in practice? The
.. tab-item:: C++ (Header)
:sync: C++ (Header)

.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/commands/DriveDistanceProfiled.h
.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/v2024.3.2/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/commands/DriveDistanceProfiled.h
:language: c++
:lines: 5-
:linenos:
Expand All @@ -229,7 +229,7 @@ What does a ``TrapezoidProfileSubsystem`` look like when used in practice? The
.. tab-item:: C++ (Source)
:sync: C++ (Source)

.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/commands/DriveDistanceProfiled.cpp
.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/v2024.3.2/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/commands/DriveDistanceProfiled.cpp
:language: c++
:lines: 5-
:linenos:
Expand All @@ -242,7 +242,7 @@ And, for an :ref:`inlined <docs/software/commandbased/organizing-command-based:I
.. tab-item:: Java
:sync: Java

.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/RobotContainer.java
.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/v2024.3.2/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/RobotContainer.java
:language: java
:lines: 66-85
:linenos:
Expand All @@ -251,8 +251,8 @@ And, for an :ref:`inlined <docs/software/commandbased/organizing-command-based:I
.. tab-item:: C++
:sync: C++

.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/RobotContainer.cpp
.. remoteliteralinclude:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/v2024.3.2/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/RobotContainer.cpp
:language: c++
:lines: 37-60
:lines: 39-62
:linenos:
:lineno-start: 37
:lineno-start: 39
2 changes: 1 addition & 1 deletion source/docs/software/telemetry/datalog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ The LogEntry classes can be used in conjunction with DataLogManager to record va

// Set up custom log entries
wpi::log::DataLog& log = frc::DataLogManager::GetLog();
myBooleanLog = wpi::Log::BooleanLogEntry(log, "/my/boolean");
myBooleanLog = wpi::log::BooleanLogEntry(log, "/my/boolean");
myDoubleLog = wpi::log::DoubleLogEntry(log, "/my/double");
myStringLog = wpi::log::StringLogEntry(log, "/my/string");
}
Expand Down
7 changes: 6 additions & 1 deletion source/docs/zero-to-robot/step-2/wpilib-setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ Supported Operating Systems and Architectures:
* Ubuntu 22.04, 64 bit. Other Linux distributions with glibc >= 2.34 may work, but are unsupported
* macOS 11 or higher, both Intel and Arm for Java. C++ requires macOS 12 or higher with Xcode 14.

.. warning:: The following OSes are no longer supported: macOS 10.15, Ubuntu 18.04 & 20.04, Windows 7, Windows 8.1, and any 32-bit Windows.
.. warning:: In 2025, macOS 13 or higher will be required.

.. note:: The following OSes are no longer supported: macOS 10.15, Ubuntu 18.04 & 20.04, Windows 7, Windows 8.1, and any 32-bit Windows.

.. note:: [Windows 10 support from Microsoft will end in October 2025](https://www.microsoft.com/en-us/windows/end-of-support). We intend to continue supporting Windows 10 through the 2026 season, but may have to drop support in 2027. Teams should start planning their upgrade path to Windows 11.


WPILib is designed to install to different folders for different years, so that it is not necessary to uninstall a previous version before installing this year's WPILib.

Expand Down
Loading