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

Standardize on c++ rather than cpp for code tabs #2472

Merged
merged 3 commits into from
Jan 2, 2024

Conversation

jasondaming
Copy link
Member

No description provided.

@sciencewhiz
Copy link
Collaborator

sciencewhiz commented Jan 1, 2024

Looks tab-set-code needs to be changed to c++ also.

https://frc-docs--2472.org.readthedocs.build/en/2472/docs/software/dashboards/glass/field2d-widget.html#sending-trajectories-to-field2d

.. tab-set-code::
.. rli:: https://github.com/wpilibsuite/allwpilib/raw/v2024.1.1-beta-4/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/ramsetecontroller/Robot.java
:language: java
:lines: 44-61
:linenos:
:lineno-start: 44
.. rli:: https://raw.githubusercontent.com/wpilibsuite/allwpilib/v2024.1.1-beta-4/wpilibcExamples/src/main/cpp/examples/RamseteController/cpp/Robot.cpp
:language: cpp
:lines: 18-30
:linenos:
:lineno-start: 18

@sciencewhiz
Copy link
Collaborator

There's a conflict to resolve

@jasondaming
Copy link
Member Author

I also implemented the change to fix the :sync: in the command scheduler that you pushed. I went ahead and fixed all the tabbing issues.

@sciencewhiz sciencewhiz merged commit d50ab48 into wpilibsuite:main Jan 2, 2024
10 checks passed
@jasondaming jasondaming deleted the c++overcpp branch January 2, 2024 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants