Skip to content

Commit 189ea22

Browse files
committed
[telemetry] Add new Telemetry implementation
1 parent 03fe204 commit 189ea22

File tree

240 files changed

+14409
-1761
lines changed

Some content is hidden

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

240 files changed

+14409
-1761
lines changed

.github/workflows/upstream-utils.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ jobs:
8484
./googletest.py clone
8585
./googletest.py copy-src
8686
./googletest.py format-patch
87+
- name: Run htrie.py
88+
run: |
89+
cd upstream_utils
90+
./htrie.py clone
91+
./htrie.py copy-src
92+
./htrie.py format-patch
8793
- name: Run imgui.py
8894
run: |
8995
cd upstream_utils

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ set(WPIUNITS_DEP_REPLACE_IMPL "find_dependency(wpiunits)")
291291
set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)")
292292
add_subdirectory(wpiutil)
293293

294+
add_subdirectory(telemetry)
294295
add_subdirectory(datalog)
295296

296297
if(WITH_NTCORE)

datalog/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ cc_library(
1818
strip_include_prefix = "src/main/native/include",
1919
visibility = ["//visibility:public"],
2020
deps = [
21+
"//telemetry:telemetry.static",
2122
"//wpiutil:wpiutil.static",
2223
],
2324
)
@@ -38,6 +39,7 @@ wpilib_jni_java_library(
3839
native_libs = [":datalogjni"],
3940
visibility = ["//visibility:public"],
4041
deps = [
42+
"//telemetry:telemetry-java",
4143
"//wpiutil:wpiutil-java",
4244
"@maven//:us_hebi_quickbuf_quickbuf_runtime",
4345
],
@@ -101,6 +103,7 @@ wpilib_java_junit5_test(
101103
tags = ["exclusive"],
102104
deps = [
103105
":datalog-java",
106+
"//telemetry:telemetry-java",
104107
"//wpiutil:wpiutil-java",
105108
],
106109
)

datalog/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ target_include_directories(
2525
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
2626
)
2727

28-
target_link_libraries(datalog PRIVATE wpiutil)
28+
target_link_libraries(datalog PUBLIC telemetry wpiutil)
2929

3030
subdir_list(datalog_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples")
3131
foreach(example ${datalog_examples})
@@ -51,7 +51,7 @@ if(WITH_JAVA)
5151
datalog_jar
5252
${JAVA_SOURCES}
5353
# INCLUDE_JARS ${JACKSON_JARS} ${QUICKBUF_JAR}
54-
INCLUDE_JARS wpiutil_jar ${QUICKBUF_JAR}
54+
INCLUDE_JARS telemetry_jar wpiutil_jar ${QUICKBUF_JAR}
5555
OUTPUT_NAME datalog
5656
OUTPUT_DIR ${WPILIB_BINARY_DIR}/${java_lib_dest}
5757
GENERATE_NATIVE_HEADERS datalog_jni_headers

datalog/build.gradle

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,20 @@ model {
2525
}
2626
}
2727
}
28+
binaries {
29+
all {
30+
if (!it.buildable || !(it instanceof NativeBinarySpec)) {
31+
return
32+
}
33+
if (it.component.name != "${nativeName}JNI") {
34+
lib project: ':telemetry', library: 'telemetry', linkage: 'shared'
35+
}
36+
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
37+
}
38+
}
2839
}
2940

3041
dependencies {
31-
api project(":wpiutil")
42+
implementation project(":telemetry")
43+
implementation project(":wpiutil")
3244
}

0 commit comments

Comments
 (0)