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.

Sign up for GitHub

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

Jump to bottom

[upstream_utils] Add AprilTag library #6816

Merged

PeterJohnson merged 31 commits into wpilibsuite:main from spacey-sooty:upstreamuutilsapriltag

Jul 21, 2024

Contributor

spacey-sooty commented Jul 9, 2024 •

edited

Loading

Resolves #6808

TODO:

fix patches
add to build

spacey-sooty requested a review from a team as a code owner

July 9, 2024 14:23

spacey-sooty force-pushed the upstreamuutilsapriltag branch from e2de1b5 to b29dafd Compare

July 9, 2024 14:25

spacey-sooty marked this pull request as draft

July 9, 2024 14:43

spacey-sooty force-pushed the upstreamuutilsapriltag branch 2 times, most recently from b8a1a09 to 7544378 Compare

July 9, 2024 15:13

PeterJohnson reviewed

View reviewed changes

apriltag/src/main/native/thirdparty/apriltag/tag25h9.cpp Outdated Show resolved Hide resolved

PeterJohnson reviewed

View reviewed changes

...ag/src/main/native/thirdparty/apriltag/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.cpp Outdated Show resolved Hide resolved

PeterJohnson reviewed

View reviewed changes

apriltag/src/main/native/thirdparty/apriltag/example/apriltag_demo.cpp Outdated Show resolved Hide resolved

PeterJohnson reviewed

View reviewed changes

apriltag/src/main/native/thirdparty/apriltag/common/getopt.h Outdated Show resolved Hide resolved

PeterJohnson reviewed

View reviewed changes

apriltag/src/main/native/thirdparty/apriltag/common/postscript_utils.h Outdated Show resolved Hide resolved

PeterJohnson reviewed

View reviewed changes

apriltag/src/main/native/thirdparty/apriltag/ntcoreffi/src/main/native/c/ntcoreffi.cpp Outdated Show resolved Hide resolved

calcmogul reviewed

View reviewed changes

.github/workflows/upstream-utils.yml Outdated Show resolved Hide resolved

PeterJohnson reviewed

View reviewed changes

apriltag/src/main/native/thirdparty/apriltag/apriltag_pywrap.cpp Outdated Show resolved Hide resolved

spacey-sooty force-pushed the upstreamuutilsapriltag branch 4 times, most recently from a2a8788 to 7baf7fa Compare

July 10, 2024 14:59

PeterJohnson reviewed

View reviewed changes

Member

PeterJohnson left a comment

Needs to be hooked into the build too.

apriltag/src/main/native/thirdparty/apriltag/common/getopt.cpp Outdated Show resolved Hide resolved

spacey-sooty force-pushed the upstreamuutilsapriltag branch 2 times, most recently from 31f1617 to 4d570df Compare

July 11, 2024 02:01


          [upstream_utils] Add AprilTag library

b94ac57

spacey-sooty force-pushed the upstreamuutilsapriltag branch from 4d570df to b94ac57 Compare

July 11, 2024 05:39

calcmogul requested changes

View reviewed changes

Member

calcmogul left a comment

This needs to be rebased to use the new upstream_utils API.

calcmogul added 3 commits

July 19, 2024 16:37


          Merge branch 'main' into upstreamuutilsapriltag

498db8a


          Apply bugfix to early-exit patch

2a4ca82


          Make thirdparty source locations match other libraries

be5dfe9

Member

calcmogul commented Jul 19, 2024

I updated the upstream_utils usage and reapplied the patches that were there. About half of them were already applied upstream. The main thing left is the build system.

calcmogul added 3 commits

July 19, 2024 17:02


          Remove unused import

b58124f


          Put blank line before patch list

cd6fe06


          Remove 25h9 test

8498eda

calcmogul added 22 commits

July 19, 2024 17:25


          Remove Java 25h9 test

e2c4183


          Fix invalid includes


          Clean up include filtering

95d6519


          Add apriltag files to build system

0b639ef


          Fix include paths

196ef93


          Fix some C++ warnings

990f931


          Import apriltag as a C library

1b511a2


          Put patches in same order as apriltag repo fork

5cbc028


          Fix Gradle build on Linux

10a3cdc


          mpack fix

8f84370


          Suppress warnings

111e676


          Exclude apriltag file from Doxygen

bfd06e7


          Apply Clang patches

a9d9392


          Disable more warnings

f4d582d


          Suppress more warnings

eef064a


          Use different warning suppressions for macOS

4cb8e46


          Fix macOS if condition

e7b5726


          Modify clang check

f58e292


          Remove apriltaglib fetch

cb47397


          Fix JNI linkage

495bebb


          Add .cpp files to apriltaglib glob

6b66000


          Fix more clang warnings

97c147f

spacey-sooty marked this pull request as ready for review

July 20, 2024 13:17

calcmogul added 2 commits

July 20, 2024 09:35


          Merge branch 'main' into upstreamuutilsapriltag

ac75113


          Remove unnecessary generated file exclusion

6d22060

calcmogul approved these changes

View reviewed changes

PeterJohnson merged commit eda63dc into wpilibsuite:main

33 checks passed

spacey-sooty deleted the upstreamuutilsapriltag branch

July 24, 2024 14:42

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet