Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-06 03:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

HAND FIX - Fixup pregen files

Browse Source
This commit is contained in:
PJ Reiniger
2025-11-07 19:56:21 -05:00
committed by Peter Johnson
parent 6b69aab44e
commit e0320a942a
27 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ntcore/generate_topics.py
View File

@@ -25,7 +25,7 @@ def generate_topics(
loader=FileSystemLoader(java_template_directory), autoescape=False
)
generated_output_dir = output_directory / "main/java/edu/wpi/first/networktables"
generated_output_dir = output_directory / "main/java/org/wpilib/networktables"
for fn in java_template_directory.glob("*.jinja"):
template = env.get_template(fn.name)
outfn = fn.stem
@@ -42,7 +42,7 @@ def generate_topics(
Output(generated_output_dir, outfn2, output)
# C++ classes
cpp_subdirectory = "main/native/include/networktables"
cpp_subdirectory = "main/native/include/wpi/nt"
cpp_template_directory = template_root / cpp_subdirectory
env = Environment(
loader=FileSystemLoader(cpp_template_directory),
@@ -65,11 +65,11 @@ def generate_topics(
loader=FileSystemLoader(hdr_template_directory),
autoescape=False,
)
template = env.get_template("ntcore_cpp_types.h.jinja")
template = env.get_template("ntcore_cpp_types.hpp.jinja")
output = template.render(types=types)
Output(
output_directory / hdr_subdirectory,
"ntcore_cpp_types.h",
output_directory / hdr_subdirectory / "wpi/nt",
"ntcore_cpp_types.hpp",
output,
)
@@ -97,7 +97,9 @@ def generate_topics(
)
template = env.get_template("ntcore_c_types.h.jinja")
output = template.render(types=types)
Output(output_directory / hdr_subdirectory, "ntcore_c_types.h", output)
Output(
output_directory / hdr_subdirectory / "wpi/nt", "ntcore_c_types.h", output
)
# C handle API (source)
c_subdirectory = "main/native/cpp"

10
ntcore/src/generate/main/java/NetworkTableInstance.java.jinja
View File

@@ -6,11 +6,6 @@
package org.wpilib.networktables;
import org.wpilib.datalog.DataLog;
import org.wpilib.util.WPIUtilJNI;
import org.wpilib.util.concurrent.Event;
import org.wpilib.util.protobuf.Protobuf;
import org.wpilib.util.struct.Struct;
import java.nio.charset.StandardCharsets;
import java.util.EnumSet;
import java.util.HashMap;
@@ -24,6 +19,11 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Consumer;
import org.wpilib.datalog.DataLog;
import org.wpilib.util.WPIUtilJNI;
import org.wpilib.util.concurrent.Event;
import org.wpilib.util.protobuf.Protobuf;
import org.wpilib.util.struct.Struct;
import us.hebi.quickbuf.ProtoMessage;
/**

4
ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja
View File

@@ -6,13 +6,13 @@
package org.wpilib.networktables;
import org.wpilib.datalog.DataLog;
import org.wpilib.util.runtime.RuntimeLoader;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.EnumSet;
import java.util.OptionalLong;
import java.util.concurrent.atomic.AtomicBoolean;
import org.wpilib.datalog.DataLog;
import org.wpilib.util.runtime.RuntimeLoader;
/** NetworkTables JNI. */
public final class NetworkTablesJNI {