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.

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

[datalog] Move DataLogReaderThread from glass to new libdatalog #7641

Open
wants to merge 66 commits into
base: 2027
Choose a base branch
from
Open

[datalog] Move DataLogReaderThread from glass to new libdatalog #7641

wants to merge 66 commits into from
+742 −334

Conversation

DeltaDizzy
Copy link
Contributor

@DeltaDizzy DeltaDizzy commented Jan 5, 2025 •
edited
Loading

Currently the major DataLog backend API (reading and writing) is split between wpiutil and glass. In the interest of allowing code that wants to use these APIs to not need to link to glass and declutter wpiutil, all of those APIs are moved to a new library named "datalog".

@DeltaDizzy DeltaDizzy requested review from PeterJohnson and a team as code owners January 5, 2025 18:08
@github-actions github-actions bot added component: wpiutil WPI utility library component: sysid SysId app component: datalogtool DataLog Tool labels Jan 5, 2025
@DeltaDizzy DeltaDizzy force-pushed the datalogreader-to-wpiutil branch 2 times, most recently from 92897bb to d429635 Compare January 8, 2025 20:54
@DeltaDizzy DeltaDizzy changed the base branch from main to 2027 January 8, 2025 20:59
@DeltaDizzy DeltaDizzy requested review from a team as code owners January 8, 2025 20:59
@DeltaDizzy DeltaDizzy changed the title [wpiutil] Move DataLogReaderThread from glass to wpiutil [datalog] Move DataLogReaderThread from glass to new libdatalog Jan 8, 2025
@github-actions github-actions bot added component: cscore CameraServer library component: wpilibc WPILib C++ component: hal Hardware Abstraction Layer component: command-based WPILib Command Based Library component: wpimath Math library component: glass Glass app and backend component: apriltag AprilTag library component: epilogue Annotation-based logging library 2027 2027 target labels Jan 8, 2025
@KangarooKoala
Copy link
Contributor

KangarooKoala commented Jan 9, 2025 •
edited
Loading

Try doing git rebase -i 2027 and replacing pick with drop for the commits not in this PR.

If that doesn't work, try git reset --hard 92897bbc7156ece6d2433c2ecec6d3bc66bd6a9d (to reset to before the rebase) and then git rebase --onto 2027 HEAD main (to rebase while excluding the commits to main that aren't in 2027).

@DeltaDizzy DeltaDizzy force-pushed the datalogreader-to-wpiutil branch from f2ab2ec to d45aec8 Compare January 9, 2025 00:53
@DeltaDizzy DeltaDizzy requested a review from a team as a code owner January 9, 2025 17:31
@github-actions github-actions bot added component: ntcore NetworkTables library component: wpilibj WPILib Java labels Jan 9, 2025
spacey-sooty
spacey-sooty suggested changes Jan 9, 2025
View reviewed changes
ntcore/build.gradle Outdated Show resolved Hide resolved
ntcore/build.gradle Outdated Show resolved Hide resolved
DeltaDizzy and others added 25 commits February 8, 2025 18:57
@DeltaDizzy
wpiutil format
8ee9c3f
@DeltaDizzy
make wpiutil link last
578a962
@DeltaDizzy
reorder dlt deps
18f1da8
@DeltaDizzy
sysid deps
628537f
@DeltaDizzy
move filelogger from wpiutil to datalog (java)
d7ac8a2
@DeltaDizzy
fix jni names
24ff046
@DeltaDizzy @Gold856
Update libdatalog/BUILD.bazel
0679055 
Co-authored-by: Gold856 <[email protected]>
@DeltaDizzy
dont extend wpiutiljni
14d38dc
@DeltaDizzy
gradle tests fix
add82d9
@DeltaDizzy
add datalog to sysid tests
fa553b8
@DeltaDizzy
fix bazel build for libdatalog, epilogue, ntcore, wpiutil
4c93e61
@DeltaDizzy
rename to datalog
cf15228
@DeltaDizzy
format datalog cmake
83f56e3
@DeltaDizzy
format bazels
464d557
@DeltaDizzy
add datalog to wpilibj
5f10384
@DeltaDizzy
fix java rules def
17127e9
@DeltaDizzy
format bazels
9ea037e
@DeltaDizzy
add bazel tests
518cdde
@DeltaDizzy
format wpilibc bazel
7256833
@DeltaDizzy
move datalog headers to wpi/datalog
22aaec0
@DeltaDizzy
file file logger test includes
8556f43
@DeltaDizzy
fix jni includes
12a776d
@DeltaDizzy
filelogger namespaces
b816c21
@DeltaDizzy
run wpiformat
700d148
@DeltaDizzy
last include
497f403
@DeltaDizzy DeltaDizzy force-pushed the datalogreader-to-wpiutil branch from ac28657 to 497f403 Compare February 8, 2025 23:58
PeterJohnson
PeterJohnson reviewed Feb 10, 2025
View reviewed changes
Copy link
Member

@PeterJohnson PeterJohnson left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The datalog spec (in wpiutil/doc) should move as well.

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

@spacey-sooty spacey-sooty spacey-sooty requested changes

@Gold856 Gold856 Gold856 requested changes

@PeterJohnson PeterJohnson Awaiting requested review from PeterJohnson PeterJohnson is a code owner

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
2027 2027 target component: apriltag AprilTag library component: command-based WPILib Command Based Library component: cscore CameraServer library component: datalogtool DataLog Tool component: epilogue Annotation-based logging library component: glass Glass app and backend component: hal Hardware Abstraction Layer component: ntcore NetworkTables library component: sysid SysId app component: wpilibc WPILib C++ component: wpilibj WPILib Java component: wpimath Math library component: wpiutil WPI utility library
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@DeltaDizzy @KangarooKoala @PeterJohnson @spacey-sooty @Gold856