diff --git a/wpilibc/robotpy_pybind_build_info.bzl b/wpilibc/robotpy_pybind_build_info.bzl index 7b82c03f43..1e950fa6a4 100644 --- a/wpilibc/robotpy_pybind_build_info.bzl +++ b/wpilibc/robotpy_pybind_build_info.bzl @@ -150,46 +150,6 @@ def wpilib_extension(srcs = [], header_to_dat_deps = [], extra_hdrs = [], includ ("wpi::PyNotifier", "wpi__PyNotifier.hpp"), ], ), - struct( - class_name = "ExpansionHub", - yml_file = "semiwrap/ExpansionHub.yml", - header_root = "$(execpath :robotpy-native-wpilib.copy_headers)", - header_file = "$(execpath :robotpy-native-wpilib.copy_headers)/wpi/ExpansionHub.hpp", - tmpl_class_names = [], - trampolines = [ - ("wpi::ExpansionHub", "wpi__ExpansionHub.hpp"), - ], - ), - struct( - class_name = "ExpansionHubMotor", - yml_file = "semiwrap/ExpansionHubMotor.yml", - header_root = "$(execpath :robotpy-native-wpilib.copy_headers)", - header_file = "$(execpath :robotpy-native-wpilib.copy_headers)/wpi/ExpansionHubMotor.hpp", - tmpl_class_names = [], - trampolines = [ - ("wpi::ExpansionHubMotor", "wpi__ExpansionHubMotor.hpp"), - ], - ), - struct( - class_name = "ExpansionHubPidConstants", - yml_file = "semiwrap/ExpansionHubPidConstants.yml", - header_root = "$(execpath :robotpy-native-wpilib.copy_headers)", - header_file = "$(execpath :robotpy-native-wpilib.copy_headers)/wpi/ExpansionHubPidConstants.hpp", - tmpl_class_names = [], - trampolines = [ - ("wpi::ExpansionHubPidConstants", "wpi__ExpansionHubPidConstants.hpp"), - ], - ), - struct( - class_name = "ExpansionHubServo", - yml_file = "semiwrap/ExpansionHubServo.yml", - header_root = "$(execpath :robotpy-native-wpilib.copy_headers)", - header_file = "$(execpath :robotpy-native-wpilib.copy_headers)/wpi/ExpansionHubServo.hpp", - tmpl_class_names = [], - trampolines = [ - ("wpi::ExpansionHubServo", "wpi__ExpansionHubServo.hpp"), - ], - ), struct( class_name = "DSControlWord", yml_file = "semiwrap/DSControlWord.yml", @@ -442,6 +402,46 @@ def wpilib_extension(srcs = [], header_to_dat_deps = [], extra_hdrs = [], includ ("wpi::PWM", "wpi__PWM.hpp"), ], ), + struct( + class_name = "ExpansionHub", + yml_file = "semiwrap/ExpansionHub.yml", + header_root = "$(execpath :robotpy-native-wpilib.copy_headers)", + header_file = "$(execpath :robotpy-native-wpilib.copy_headers)/wpi/hardware/expansionhub/ExpansionHub.hpp", + tmpl_class_names = [], + trampolines = [ + ("wpi::ExpansionHub", "wpi__ExpansionHub.hpp"), + ], + ), + struct( + class_name = "ExpansionHubMotor", + yml_file = "semiwrap/ExpansionHubMotor.yml", + header_root = "$(execpath :robotpy-native-wpilib.copy_headers)", + header_file = "$(execpath :robotpy-native-wpilib.copy_headers)/wpi/hardware/expansionhub/ExpansionHubMotor.hpp", + tmpl_class_names = [], + trampolines = [ + ("wpi::ExpansionHubMotor", "wpi__ExpansionHubMotor.hpp"), + ], + ), + struct( + class_name = "ExpansionHubPidConstants", + yml_file = "semiwrap/ExpansionHubPidConstants.yml", + header_root = "$(execpath :robotpy-native-wpilib.copy_headers)", + header_file = "$(execpath :robotpy-native-wpilib.copy_headers)/wpi/hardware/expansionhub/ExpansionHubPidConstants.hpp", + tmpl_class_names = [], + trampolines = [ + ("wpi::ExpansionHubPidConstants", "wpi__ExpansionHubPidConstants.hpp"), + ], + ), + struct( + class_name = "ExpansionHubServo", + yml_file = "semiwrap/ExpansionHubServo.yml", + header_root = "$(execpath :robotpy-native-wpilib.copy_headers)", + header_file = "$(execpath :robotpy-native-wpilib.copy_headers)/wpi/hardware/expansionhub/ExpansionHubServo.hpp", + tmpl_class_names = [], + trampolines = [ + ("wpi::ExpansionHubServo", "wpi__ExpansionHubServo.hpp"), + ], + ), struct( class_name = "OnboardIMU", yml_file = "semiwrap/OnboardIMU.yml", diff --git a/wpilibc/src/main/native/cpp/ExpansionHub.cpp b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHub.cpp similarity index 94% rename from wpilibc/src/main/native/cpp/ExpansionHub.cpp rename to wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHub.cpp index 386ebf8c9c..6e49163af4 100644 --- a/wpilibc/src/main/native/cpp/ExpansionHub.cpp +++ b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHub.cpp @@ -2,13 +2,13 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/ExpansionHub.hpp" +#include "wpi/hardware/expansionhub/ExpansionHub.hpp" #include -#include "wpi/ExpansionHubMotor.hpp" -#include "wpi/ExpansionHubServo.hpp" #include "wpi/hal/UsageReporting.h" +#include "wpi/hardware/expansionhub/ExpansionHubMotor.hpp" +#include "wpi/hardware/expansionhub/ExpansionHubServo.hpp" #include "wpi/nt/BooleanTopic.hpp" #include "wpi/system/Errors.hpp" #include "wpi/system/SystemServer.hpp" diff --git a/wpilibc/src/main/native/cpp/ExpansionHubMotor.cpp b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHubMotor.cpp similarity index 98% rename from wpilibc/src/main/native/cpp/ExpansionHubMotor.cpp rename to wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHubMotor.cpp index 11f68aeaab..96c5892ec6 100644 --- a/wpilibc/src/main/native/cpp/ExpansionHubMotor.cpp +++ b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHubMotor.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/ExpansionHubMotor.hpp" +#include "wpi/hardware/expansionhub/ExpansionHubMotor.hpp" #include "wpi/system/Errors.hpp" #include "wpi/system/SystemServer.hpp" diff --git a/wpilibc/src/main/native/cpp/ExpansionHubPidConstants.cpp b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHubPidConstants.cpp similarity index 98% rename from wpilibc/src/main/native/cpp/ExpansionHubPidConstants.cpp rename to wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHubPidConstants.cpp index 94a30b6b6f..21861656fa 100644 --- a/wpilibc/src/main/native/cpp/ExpansionHubPidConstants.cpp +++ b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHubPidConstants.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/ExpansionHubPidConstants.hpp" +#include "wpi/hardware/expansionhub/ExpansionHubPidConstants.hpp" #include diff --git a/wpilibc/src/main/native/cpp/ExpansionHubServo.cpp b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHubServo.cpp similarity index 98% rename from wpilibc/src/main/native/cpp/ExpansionHubServo.cpp rename to wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHubServo.cpp index 2e9fbc46d5..b035aa9ff5 100644 --- a/wpilibc/src/main/native/cpp/ExpansionHubServo.cpp +++ b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHubServo.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/ExpansionHubServo.hpp" +#include "wpi/hardware/expansionhub/ExpansionHubServo.hpp" #include "wpi/system/Errors.hpp" #include "wpi/system/SystemServer.hpp" diff --git a/wpilibc/src/main/native/include/wpi/ExpansionHub.hpp b/wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHub.hpp similarity index 100% rename from wpilibc/src/main/native/include/wpi/ExpansionHub.hpp rename to wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHub.hpp diff --git a/wpilibc/src/main/native/include/wpi/ExpansionHubMotor.hpp b/wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHubMotor.hpp similarity index 97% rename from wpilibc/src/main/native/include/wpi/ExpansionHubMotor.hpp rename to wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHubMotor.hpp index 6c42dc3723..5870aa1a69 100644 --- a/wpilibc/src/main/native/include/wpi/ExpansionHubMotor.hpp +++ b/wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHubMotor.hpp @@ -6,8 +6,8 @@ #include -#include "wpi/ExpansionHub.hpp" -#include "wpi/ExpansionHubPidConstants.hpp" +#include "wpi/hardware/expansionhub/ExpansionHub.hpp" +#include "wpi/hardware/expansionhub/ExpansionHubPidConstants.hpp" #include "wpi/nt/BooleanTopic.hpp" #include "wpi/nt/DoubleTopic.hpp" #include "wpi/nt/IntegerTopic.hpp" diff --git a/wpilibc/src/main/native/include/wpi/ExpansionHubPidConstants.hpp b/wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHubPidConstants.hpp similarity index 100% rename from wpilibc/src/main/native/include/wpi/ExpansionHubPidConstants.hpp rename to wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHubPidConstants.hpp diff --git a/wpilibc/src/main/native/include/wpi/ExpansionHubServo.hpp b/wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHubServo.hpp similarity index 98% rename from wpilibc/src/main/native/include/wpi/ExpansionHubServo.hpp rename to wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHubServo.hpp index 2b6b278f14..1a20ed0a64 100644 --- a/wpilibc/src/main/native/include/wpi/ExpansionHubServo.hpp +++ b/wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHubServo.hpp @@ -6,7 +6,7 @@ #include -#include "wpi/ExpansionHub.hpp" +#include "wpi/hardware/expansionhub/ExpansionHub.hpp" #include "wpi/nt/BooleanTopic.hpp" #include "wpi/nt/IntegerTopic.hpp" #include "wpi/units/angle.hpp" diff --git a/wpilibc/src/main/python/pyproject.toml b/wpilibc/src/main/python/pyproject.toml index 391098dbbf..1e46cb86c6 100644 --- a/wpilibc/src/main/python/pyproject.toml +++ b/wpilibc/src/main/python/pyproject.toml @@ -93,12 +93,6 @@ Filesystem = "rpy/Filesystem.h" MotorControllerGroup = "rpy/MotorControllerGroup.h" Notifier = "rpy/Notifier.h" -# wpi -ExpansionHub = "wpi/ExpansionHub.hpp" -ExpansionHubMotor = "wpi/ExpansionHubMotor.hpp" -ExpansionHubPidConstants = "wpi/ExpansionHubPidConstants.hpp" -ExpansionHubServo = "wpi/ExpansionHubServo.hpp" - # wpi/driverstation DSControlWord = "wpi/driverstation/DSControlWord.hpp" DriverStation = "wpi/driverstation/DriverStation.hpp" @@ -133,6 +127,12 @@ DigitalInput = "wpi/hardware/discrete/DigitalInput.hpp" DigitalOutput = "wpi/hardware/discrete/DigitalOutput.hpp" PWM = "wpi/hardware/discrete/PWM.hpp" +# wpi/hardware/expansionhub +ExpansionHub = "wpi/hardware/expansionhub/ExpansionHub.hpp" +ExpansionHubMotor = "wpi/hardware/expansionhub/ExpansionHubMotor.hpp" +ExpansionHubPidConstants = "wpi/hardware/expansionhub/ExpansionHubPidConstants.hpp" +ExpansionHubServo = "wpi/hardware/expansionhub/ExpansionHubServo.hpp" + # wpi/hardware/imu OnboardIMU = "wpi/hardware/imu/OnboardIMU.hpp" diff --git a/wpilibc/src/main/python/semiwrap/ExpansionHub.yml b/wpilibc/src/main/python/semiwrap/ExpansionHub.yml index cdd055f3ce..be33a7586f 100644 --- a/wpilibc/src/main/python/semiwrap/ExpansionHub.yml +++ b/wpilibc/src/main/python/semiwrap/ExpansionHub.yml @@ -1,6 +1,6 @@ extra_includes: -- wpi/ExpansionHubMotor.hpp -- wpi/ExpansionHubServo.hpp +- wpi/hardware/expansionhub/ExpansionHubMotor.hpp +- wpi/hardware/expansionhub/ExpansionHubServo.hpp classes: wpi::ExpansionHub: diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHub.java b/wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHub.java similarity index 99% rename from wpilibj/src/main/java/org/wpilib/ExpansionHub.java rename to wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHub.java index 4b58366aaf..c205505984 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHub.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHub.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib; +package org.wpilib.hardware.expansionhub; import org.wpilib.hardware.hal.HAL; import org.wpilib.networktables.BooleanSubscriber; diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java b/wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHubMotor.java similarity index 99% rename from wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java rename to wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHubMotor.java index 2228c730d0..e5c68676ba 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHubMotor.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib; +package org.wpilib.hardware.expansionhub; import static org.wpilib.units.Units.Amps; import static org.wpilib.units.Units.Volts; diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java b/wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHubPidConstants.java similarity index 99% rename from wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java rename to wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHubPidConstants.java index 0cbcd2bb9b..2fd6e1dde6 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHubPidConstants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib; +package org.wpilib.hardware.expansionhub; import org.wpilib.networktables.BooleanPublisher; import org.wpilib.networktables.DoublePublisher; diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java b/wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHubServo.java similarity index 99% rename from wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java rename to wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHubServo.java index 50aa495287..5ed9eeacba 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/expansionhub/ExpansionHubServo.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib; +package org.wpilib.hardware.expansionhub; import static org.wpilib.units.Units.Degrees; import static org.wpilib.units.Units.Microseconds;