diff --git a/.github/actions/pregen/action.yml b/.github/actions/pregen/action.yml index e406a70705..a67e2a380f 100644 --- a/.github/actions/pregen/action.yml +++ b/.github/actions/pregen/action.yml @@ -43,7 +43,7 @@ runs: shell: bash - name: Regenerate mrcal minimath - run: ./wpical/generate_mrcal.py + run: ./tools/wpical/generate_mrcal.py shell: bash - name: Regenerate wpimath diff --git a/commandsv2/generate_hids.py b/commandsv2/generate_hids.py index f592b75e43..80d30c8b64 100755 --- a/commandsv2/generate_hids.py +++ b/commandsv2/generate_hids.py @@ -22,7 +22,7 @@ def generate_hids(output_directory: Path, template_directory: Path, schema_file: controllers = json.load(f) # Java files - java_subdirectory = "main/java/edu/wpi/first/wpilibj2/command/button" + java_subdirectory = "main/java/org/wpilib/command2/button" env = Environment( loader=FileSystemLoader(template_directory / "main/java"), autoescape=False, @@ -36,21 +36,21 @@ def generate_hids(output_directory: Path, template_directory: Path, schema_file: write_controller_file(root_path, controllerName, output) # C++ headers - hdr_subdirectory = "main/native/include/frc2/command/button" + hdr_subdirectory = "main/native/include/wpi/commands2/button" env = Environment( loader=FileSystemLoader(template_directory / hdr_subdirectory), autoescape=False, keep_trailing_newline=True, ) root_path = output_directory / hdr_subdirectory - template = env.get_template("commandhid.h.jinja") + template = env.get_template("commandhid.hpp.jinja") for controller in controllers: - controllerName = f"Command{controller['ConsoleName']}Controller.h" + controllerName = f"Command{controller['ConsoleName']}Controller.hpp" output = template.render(controller) write_controller_file(root_path, controllerName, output) # C++ files - cpp_subdirectory = "main/native/cpp/frc2/command/button" + cpp_subdirectory = "main/native/cpp/wpi/commands2/button" env = Environment( loader=FileSystemLoader(template_directory / cpp_subdirectory), autoescape=False, diff --git a/commandsv2/src/generate/main/java/commandhid.java.jinja b/commandsv2/src/generate/main/java/commandhid.java.jinja index b1a7749fa0..eed399b2e1 100644 --- a/commandsv2/src/generate/main/java/commandhid.java.jinja +++ b/commandsv2/src/generate/main/java/commandhid.java.jinja @@ -8,9 +8,9 @@ {%- endmacro %} package org.wpilib.command2.button; -import org.wpilib.{{ ConsoleName }}Controller; -import org.wpilib.event.EventLoop; import org.wpilib.command2.CommandScheduler; +import org.wpilib.driverstation.{{ ConsoleName }}Controller; +import org.wpilib.event.EventLoop; /** * A version of {@link {{ ConsoleName }}Controller} with {@link Trigger} factories for command-based. diff --git a/commandsv2/src/generate/main/native/cpp/wpi/commands2/button/commandhid.cpp.jinja b/commandsv2/src/generate/main/native/cpp/wpi/commands2/button/commandhid.cpp.jinja index 4316a49939..e6108c4076 100644 --- a/commandsv2/src/generate/main/native/cpp/wpi/commands2/button/commandhid.cpp.jinja +++ b/commandsv2/src/generate/main/native/cpp/wpi/commands2/button/commandhid.cpp.jinja @@ -6,7 +6,7 @@ {% macro capitalize_first(string) -%} {{ string[0]|capitalize + string[1:] }} {%- endmacro %} -#include "frc2/command/button/Command{{ ConsoleName }}Controller.h" +#include "wpi/commands2/button/Command{{ ConsoleName }}Controller.hpp" using namespace frc2; diff --git a/commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja b/commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja index 168c8b112e..694c61bad4 100644 --- a/commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja +++ b/commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja @@ -7,7 +7,7 @@ {{ string[0]|capitalize + string[1:] }} {%- endmacro %} #pragma once -#include +#include #include "wpi/commands2/button/Trigger.hpp" #include "wpi/commands2/CommandScheduler.hpp" diff --git a/commandsv3/generate_files.py b/commandsv3/generate_files.py index f6c1cb20c0..23ae3a8a67 100755 --- a/commandsv3/generate_files.py +++ b/commandsv3/generate_files.py @@ -24,7 +24,7 @@ def generate_hids(output_directory: Path, template_directory: Path, schema_file: controllers = json.load(f) # Java files - java_subdirectory = "main/java/org/wpilib/commands3/button" + java_subdirectory = "main/java/org/wpilib/command3/button" env = Environment( loader=FileSystemLoader(template_directory / "main/java"), autoescape=False, @@ -54,7 +54,7 @@ def generate_quickbuf( absolute_filename, ] subprocess.check_call(args) - java_files = (output_directory / "org/wpilib/commands3/proto").glob("*.java") + java_files = (output_directory / "org/wpilib/command3/proto").glob("*.java") for java_file in java_files: with (java_file).open(encoding="utf-8") as f: content = f.read() diff --git a/commandsv3/src/generate/main/java/commandhid.java.jinja b/commandsv3/src/generate/main/java/commandhid.java.jinja index d48c80b257..b39cf459c9 100644 --- a/commandsv3/src/generate/main/java/commandhid.java.jinja +++ b/commandsv3/src/generate/main/java/commandhid.java.jinja @@ -8,10 +8,10 @@ {%- endmacro %} package org.wpilib.command3.button; -import org.wpilib.{{ ConsoleName }}Controller; -import org.wpilib.event.EventLoop; import org.wpilib.command3.Scheduler; import org.wpilib.command3.Trigger; +import org.wpilib.driverstation.{{ ConsoleName }}Controller; +import org.wpilib.event.EventLoop; /** * A version of {@link {{ ConsoleName }}Controller} with {@link Trigger} factories for command-based. diff --git a/ntcore/generate_topics.py b/ntcore/generate_topics.py index e454048d73..26b085bca7 100755 --- a/ntcore/generate_topics.py +++ b/ntcore/generate_topics.py @@ -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" diff --git a/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja b/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja index d5db12af22..8b83ee6796 100644 --- a/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja +++ b/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja @@ -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; /** diff --git a/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja b/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja index 56bb920887..5b3e132c4b 100644 --- a/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja +++ b/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja @@ -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 { diff --git a/tools/wpical/src/main/native/thirdparty/mrcal/generated/minimath_generated.h b/tools/wpical/src/main/native/thirdparty/mrcal/generated/minimath_generated.h index 357be6d693..2d758c99b6 100644 --- a/tools/wpical/src/main/native/thirdparty/mrcal/generated/minimath_generated.h +++ b/tools/wpical/src/main/native/thirdparty/mrcal/generated/minimath_generated.h @@ -1,4 +1,4 @@ -// THIS IS AUTO-GENERATED BY /home/runner/work/allwpilib/allwpilib/wpical/src/main/native/thirdparty/mrcal/src/minimath/minimath_generate.pl. DO NOT EDIT BY HAND +// THIS IS AUTO-GENERATED BY /home/runner/work/allwpilib/allwpilib/tools/wpical/src/main/native/thirdparty/mrcal/src/minimath/minimath_generate.pl. DO NOT EDIT BY HAND // This contains dot products, norms, basic vector arithmetic and multiplication diff --git a/wpilibc/generate_hids.py b/wpilibc/generate_hids.py index f34c66803b..5f6f847e95 100755 --- a/wpilibc/generate_hids.py +++ b/wpilibc/generate_hids.py @@ -22,21 +22,21 @@ def generate_hids(output_directory: Path, template_directory: Path, schema_file: controllers = json.load(f) # C++ headers - hdr_subdirectory = "main/native/include/frc" + hdr_subdirectory = "main/native/include/wpi/driverstation" env = Environment( loader=FileSystemLoader(template_directory / hdr_subdirectory), autoescape=False, keep_trailing_newline=True, ) root_path = output_directory / hdr_subdirectory - template = env.get_template("hid.h.jinja") + template = env.get_template("hid.hpp.jinja") for controller in controllers: - controllerName = f"{controller['ConsoleName']}Controller.h" + controllerName = f"{controller['ConsoleName']}Controller.hpp" output = template.render(controller) write_controller_file(root_path, controllerName, output) # C++ files - cpp_subdirectory = "main/native/cpp" + cpp_subdirectory = "main/native/cpp/driverstation" env = Environment( loader=FileSystemLoader(template_directory / cpp_subdirectory), autoescape=False, @@ -49,16 +49,16 @@ def generate_hids(output_directory: Path, template_directory: Path, schema_file: write_controller_file(root_path, controllerName, output) # C++ simulation headers - sim_hdr_subdirectory = "main/native/include/frc/simulation" + sim_hdr_subdirectory = "main/native/include/wpi/simulation" env = Environment( loader=FileSystemLoader(template_directory / sim_hdr_subdirectory), autoescape=False, keep_trailing_newline=True, ) root_path = output_directory / sim_hdr_subdirectory - template = env.get_template("hidsim.h.jinja") + template = env.get_template("hidsim.hpp.jinja") for controller in controllers: - controllerName = f"{controller['ConsoleName']}ControllerSim.h" + controllerName = f"{controller['ConsoleName']}ControllerSim.hpp" output = template.render(controller) write_controller_file(root_path, controllerName, output) diff --git a/wpilibc/generate_pwm_motor_controllers.py b/wpilibc/generate_pwm_motor_controllers.py index 10a81fb000..a99477b6b1 100755 --- a/wpilibc/generate_pwm_motor_controllers.py +++ b/wpilibc/generate_pwm_motor_controllers.py @@ -26,30 +26,30 @@ def render_template( def generate_cpp_headers( output_root: Path, template_root: Path, pwm_motor_controllers: Dict[str, Any] ): - header_template_root = template_root / "main/native/include/frc/motorcontroller" + header_template_root = template_root / "main/native/include/wpi/hardware/motor" env = Environment( loader=FileSystemLoader(header_template_root), autoescape=False, keep_trailing_newline=True, ) - root_path = output_root / "main/native/include/frc/motorcontrol" - template = env.get_template("pwm_motor_controller.h.jinja") + root_path = output_root / "main/native/include/wpi/hardware/motor" + template = env.get_template("pwm_motor_controller.hpp.jinja") for controller in pwm_motor_controllers: - controller_name = os.path.basename(f"{controller['name']}.h") + controller_name = os.path.basename(f"{controller['name']}.hpp") render_template(template, root_path, controller_name, controller) def generate_cpp_sources(output_root, template_root, pwm_motor_controllers): - cpp_template_root = str(template_root / "main/native/cpp/motorcontroller") + cpp_template_root = str(template_root / "main/native/cpp/hardware/motor") env = Environment( loader=FileSystemLoader(cpp_template_root), autoescape=False, keep_trailing_newline=True, ) - root_path = output_root / "main/native/cpp/motorcontrol" + root_path = output_root / "main/native/cpp/hardware/motor" template = env.get_template("pwm_motor_controller.cpp.jinja") for controller in pwm_motor_controllers: diff --git a/wpilibc/src/generate/main/native/cpp/hid.cpp.jinja b/wpilibc/src/generate/main/native/cpp/driverstation/hid.cpp.jinja similarity index 98% rename from wpilibc/src/generate/main/native/cpp/hid.cpp.jinja rename to wpilibc/src/generate/main/native/cpp/driverstation/hid.cpp.jinja index 5b4803c0d3..9ac2bca451 100644 --- a/wpilibc/src/generate/main/native/cpp/hid.cpp.jinja +++ b/wpilibc/src/generate/main/native/cpp/driverstation/hid.cpp.jinja @@ -6,7 +6,7 @@ {% macro capitalize_first(string) -%} {{ string[0]|capitalize + string[1:] }} {%- endmacro %} -#include "frc/{{ ConsoleName }}Controller.h" +#include "wpi/driverstation/{{ ConsoleName }}Controller.hpp" #include "wpi/hal/UsageReporting.h" #include "wpi/util/sendable/SendableBuilder.hpp" diff --git a/wpilibc/src/generate/main/native/cpp/motorcontroller/pwm_motor_controller.cpp.jinja b/wpilibc/src/generate/main/native/cpp/hardware/motor/pwm_motor_controller.cpp.jinja similarity index 94% rename from wpilibc/src/generate/main/native/cpp/motorcontroller/pwm_motor_controller.cpp.jinja rename to wpilibc/src/generate/main/native/cpp/hardware/motor/pwm_motor_controller.cpp.jinja index 55f9f7e2eb..0c0909176f 100644 --- a/wpilibc/src/generate/main/native/cpp/motorcontroller/pwm_motor_controller.cpp.jinja +++ b/wpilibc/src/generate/main/native/cpp/hardware/motor/pwm_motor_controller.cpp.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibc/generate_pwm_motor_controllers.py. DO NOT MODIFY -#include "frc/motorcontrol/{{ name }}.h" +#include "wpi/hardware/motor/{{ name }}.hpp" #include "wpi/hal/UsageReporting.h" diff --git a/wpilibc/src/generate/main/native/cpp/simulation/hidsim.cpp.jinja b/wpilibc/src/generate/main/native/cpp/simulation/hidsim.cpp.jinja index 944fd93f40..3a99eafbd1 100644 --- a/wpilibc/src/generate/main/native/cpp/simulation/hidsim.cpp.jinja +++ b/wpilibc/src/generate/main/native/cpp/simulation/hidsim.cpp.jinja @@ -6,9 +6,9 @@ {% macro capitalize_first(string) -%} {{ string[0]|capitalize + string[1:] }} {%- endmacro %} -#include "frc/simulation/{{ ConsoleName }}ControllerSim.h" +#include "wpi/simulation/{{ ConsoleName }}ControllerSim.hpp" -#include "frc/{{ ConsoleName }}Controller.h" +#include "wpi/driverstation/{{ ConsoleName }}Controller.hpp" using namespace frc; using namespace frc::sim; diff --git a/wpilibj/generate_hids.py b/wpilibj/generate_hids.py index cea7cf1fce..3d6b1a3e4b 100755 --- a/wpilibj/generate_hids.py +++ b/wpilibj/generate_hids.py @@ -27,7 +27,7 @@ def generate_hids(output_directory: Path, template_directory: Path): autoescape=False, keep_trailing_newline=True, ) - rootPath = output_directory / "main/java/edu/wpi/first/wpilibj" + rootPath = output_directory / "main/java/org/wpilib/driverstation" template = env.get_template("hid.java.jinja") for controller in controllers: controllerName = f"{controller['ConsoleName']}Controller.java" @@ -35,7 +35,7 @@ def generate_hids(output_directory: Path, template_directory: Path): write_controller_file(rootPath, controllerName, output) # Java simulation files - rootPath = output_directory / "main/java/edu/wpi/first/wpilibj/simulation" + rootPath = output_directory / "main/java/org/wpilib/simulation" template = env.get_template("hidsim.java.jinja") for controller in controllers: controllerName = f"{controller['ConsoleName']}ControllerSim.java" diff --git a/wpilibj/generate_pwm_motor_controllers.py b/wpilibj/generate_pwm_motor_controllers.py index 0b3b25db1c..85774df6eb 100755 --- a/wpilibj/generate_pwm_motor_controllers.py +++ b/wpilibj/generate_pwm_motor_controllers.py @@ -32,7 +32,7 @@ def generate_pwm_motor_controllers(output_root, template_root): keep_trailing_newline=True, ) - root_path = Path(output_root) / "main/java/edu/wpi/first/wpilibj/motorcontrol" + root_path = Path(output_root) / "main/java/org/wpilib/hardware/motor" template = env.get_template("pwm_motor_controller.java.jinja") for controller in controllers: diff --git a/wpilibj/src/generate/WPILibVersion.java.in b/wpilibj/src/generate/WPILibVersion.java.in index f38d1b0b72..3bf097375d 100644 --- a/wpilibj/src/generate/WPILibVersion.java.in +++ b/wpilibj/src/generate/WPILibVersion.java.in @@ -1,4 +1,4 @@ -package edu.wpi.first.wpilibj.util; +package org.wpilib.system; /** * Autogenerated file! Do not manually edit this file. This version is regenerated diff --git a/wpilibj/src/generate/main/java/hid.java.jinja b/wpilibj/src/generate/main/java/hid.java.jinja index 6b27b3ee7e..23c5ff7a8c 100644 --- a/wpilibj/src/generate/main/java/hid.java.jinja +++ b/wpilibj/src/generate/main/java/hid.java.jinja @@ -6,13 +6,13 @@ {% macro capitalize_first(string) -%} {{ string[0]|capitalize + string[1:] }} {%- endmacro %} -package org.wpilib; +package org.wpilib.driverstation; +import org.wpilib.event.BooleanEvent; +import org.wpilib.event.EventLoop; import org.wpilib.hardware.hal.HAL; import org.wpilib.util.sendable.Sendable; import org.wpilib.util.sendable.SendableBuilder; -import org.wpilib.event.BooleanEvent; -import org.wpilib.event.EventLoop; /** * Handle input from {{ ConsoleName }} controllers connected to the Driver Station. diff --git a/wpilibj/src/generate/main/java/hidsim.java.jinja b/wpilibj/src/generate/main/java/hidsim.java.jinja index 5274eafc40..318f999536 100644 --- a/wpilibj/src/generate/main/java/hidsim.java.jinja +++ b/wpilibj/src/generate/main/java/hidsim.java.jinja @@ -8,7 +8,7 @@ {%- endmacro %} package org.wpilib.simulation; -import org.wpilib.{{ ConsoleName }}Controller; +import org.wpilib.driverstation.{{ ConsoleName }}Controller; /** Class to control a simulated {{ ConsoleName }} controller. */ public class {{ ConsoleName }}ControllerSim extends GenericHIDSim { diff --git a/wpilibj/src/generate/main/java/pwm_motor_controller.java.jinja b/wpilibj/src/generate/main/java/pwm_motor_controller.java.jinja index b1136b1497..b990f50cb1 100644 --- a/wpilibj/src/generate/main/java/pwm_motor_controller.java.jinja +++ b/wpilibj/src/generate/main/java/pwm_motor_controller.java.jinja @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package org.wpilib.motorcontrol; +package org.wpilib.hardware.motor; -import org.wpilib.hardware.hal.HAL; import org.wpilib.hardware.discrete.PWM; +import org.wpilib.hardware.hal.HAL; /** * {{ Manufacturer }} {{ DisplayName }} Motor Controller. diff --git a/wpilibjExamples/generate_bazel_files.py b/wpilibjExamples/generate_bazel_files.py index 6254311cb9..ca2b40d29c 100644 --- a/wpilibjExamples/generate_bazel_files.py +++ b/wpilibjExamples/generate_bazel_files.py @@ -29,19 +29,19 @@ def load_tests(filename): def main(): examples = load_foldernames( - "wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json" + "wpilibjExamples/src/main/java/org/wpilib/examples/examples.json" ) commands = load_foldernames( - "wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/commands.json" + "wpilibjExamples/src/main/java/org/wpilib/commands/commands.json" ) templates = load_foldernames( - "wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json" + "wpilibjExamples/src/main/java/org/wpilib/templates/templates.json" ) snippets = load_foldernames( - "wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/snippets/snippets.json" + "wpilibjExamples/src/main/java/org/wpilib/snippets/snippets.json" ) tests = load_tests( - "wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json" + "wpilibjExamples/src/main/java/org/wpilib/examples/examples.json" ) output_file = "wpilibjExamples/example_projects.bzl" diff --git a/wpimath/generate_numbers.py b/wpimath/generate_numbers.py index 8a7f7b5551..e596eca436 100755 --- a/wpimath/generate_numbers.py +++ b/wpimath/generate_numbers.py @@ -26,14 +26,14 @@ def generate_numbers(output_directory: Path, template_root: Path): ) template = env.get_template("GenericNumber.java.jinja") - rootPath = output_directory / "main/java/edu/wpi/first/math/numbers" + rootPath = output_directory / "main/java/org/wpilib/math/numbers" for i in range(MAX_NUM + 1): contents = template.render(num=i) output(rootPath, f"N{i}.java", contents) template = env.get_template("Nat.java.jinja") - rootPath = output_directory / "main/java/edu/wpi/first/math" + rootPath = output_directory / "main/java/org/wpilib/math/util" contents = template.render(nums=range(MAX_NUM + 1)) output(rootPath, "Nat.java", contents) diff --git a/wpimath/generate_quickbuf.py b/wpimath/generate_quickbuf.py index 8b0747b858..12e6264dfc 100755 --- a/wpimath/generate_quickbuf.py +++ b/wpimath/generate_quickbuf.py @@ -24,7 +24,7 @@ def generate_quickbuf( absolute_filename, ] ) - java_files = (output_directory / "edu/wpi/first/math/proto").glob("*.java") + java_files = (output_directory / "org/wpilib/math/proto").glob("*.java") for java_file in java_files: with (java_file).open(encoding="utf-8") as f: content = f.read() diff --git a/wpimath/src/generate/main/java/Nat.java.jinja b/wpimath/src/generate/main/java/Nat.java.jinja index db0f07b34f..c3ed74874a 100644 --- a/wpimath/src/generate/main/java/Nat.java.jinja +++ b/wpimath/src/generate/main/java/Nat.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package org.wpilib.math; +package org.wpilib.math.util; // CHECKSTYLE.OFF: ImportOrder {% for num in nums %} diff --git a/wpiunits/generate_units.py b/wpiunits/generate_units.py index 05bd7c06db..05f415db5d 100755 --- a/wpiunits/generate_units.py +++ b/wpiunits/generate_units.py @@ -353,7 +353,7 @@ def generate_units(output_directory: Path, template_directory: Path): ) interfaceTemplate = env.get_template("Measure-implementation.java.jinja") - rootPath = output_directory / "main/java/edu/wpi/first/units" + rootPath = output_directory / "main/java/org/wpilib/units" helpers = { "type_decl": type_decl,