Flatten wpilib namespace

- Keeping wpilib.simulation and wpilib.sysid since they're fairly distinct

Author: virtuald

docs/conf.py

@@ -60,11 +60,6 @@
 
 # WPILib
 gen_package(root, "wpilib", exclude=["wpi_*"])
-gen_package(root, "wpilib.counter")
-gen_package(root, "wpilib.event")
-gen_package(root, "wpilib.drive")
-gen_package(root, "wpilib.interfaces")
-gen_package(root, "wpilib.shuffleboard")
 gen_package(root, "wpilib.simulation")
 gen_package(root, "wpilib.sysid")
 

subprojects/robotpy-wpilib/meson.build

@@ -12,18 +12,6 @@ wpilib_sources += files(
     'wpilib/src/rpy/MotorControllerGroup.cpp',
 )
 
-wpilib_counter_sources += files(
-    'wpilib/counter/counter.cpp',
-)
-
-wpilib_drive_sources += files(
-    'wpilib/drive/drive.cpp',
-)
-
-wpilib_event_sources += files(
-    'wpilib/event/event.cpp',
-)
-
 wpilib_simulation_sources += files(
     'wpilib/simulation/simulation.cpp',
 )

subprojects/robotpy-wpilib/pyproject.toml

@@ -50,10 +50,6 @@ packages = ["wpilib"]
 [tool.semiwrap]
 update_init = [
     "wpilib",
-    "wpilib.counter",
-    "wpilib.drive",
-    "wpilib.event",
-    "wpilib.interfaces wpilib._wpilib.interfaces",
     "wpilib.simulation",
     "wpilib.sysid wpilib._wpilib.sysid",
 ]
@@ -79,8 +75,7 @@ name = "wpilib"
 wraps = ["robotpy-native-wpilib"]
 depends = [
     "wpihal", "wpiutil", "ntcore",
-    "wpimath", "wpimath_geometry", "wpimath_controls",
-    "wpilib_event"
+    "wpimath", "wpimath_geometry", "wpimath_controls", "wpimath_filter",
 ]
 includes = ["wpilib/src"]
 
@@ -93,6 +88,16 @@ Filesystem = "rpy/Filesystem.h"
 MotorControllerGroup = "rpy/MotorControllerGroup.h"
 Notifier = "rpy/Notifier.h"
 
+# wpi/counter
+EdgeConfiguration = "wpi/counter/EdgeConfiguration.hpp"
+Tachometer = "wpi/counter/Tachometer.hpp"
+UpDownCounter = "wpi/counter/UpDownCounter.hpp"
+
+# wpi/drive
+DifferentialDrive = "wpi/drive/DifferentialDrive.hpp"
+MecanumDrive = "wpi/drive/MecanumDrive.hpp"
+RobotDriveBase = "wpi/drive/RobotDriveBase.hpp"
+
 # wpi/driverstation
 DSControlWord = "wpi/driverstation/DSControlWord.hpp"
 DriverStation = "wpi/driverstation/DriverStation.hpp"
@@ -104,6 +109,11 @@ PS5Controller = "wpi/driverstation/PS5Controller.hpp"
 StadiaController = "wpi/driverstation/StadiaController.hpp"
 XboxController = "wpi/driverstation/XboxController.hpp"
 
+# wpi/event
+BooleanEvent = "wpi/event/BooleanEvent.hpp"
+EventLoop = "wpi/event/EventLoop.hpp"
+NetworkBooleanEvent = "wpi/event/NetworkBooleanEvent.hpp"
+
 # wpi/framework
 IterativeRobotBase = "wpi/framework/IterativeRobotBase.hpp"
 RobotBase = "wpi/framework/RobotBase.hpp"
@@ -214,46 +224,6 @@ Preferences = "wpi/util/Preferences.hpp"
 SensorUtil = "wpi/util/SensorUtil.hpp"
 
 
-[tool.semiwrap.extension_modules."wpilib.counter._counter"]
-name = "wpilib_counter"
-wraps = ["robotpy-native-wpilib"]
-depends = ["wpilib"]
-yaml_path = "semiwrap/counter"
-
-[tool.semiwrap.extension_modules."wpilib.counter._counter".headers]
-# wpi/counter
-EdgeConfiguration = "wpi/counter/EdgeConfiguration.hpp"
-Tachometer = "wpi/counter/Tachometer.hpp"
-UpDownCounter = "wpi/counter/UpDownCounter.hpp"
-
-
-[tool.semiwrap.extension_modules."wpilib.drive._drive"]
-name = "wpilib_drive"
-wraps = ["robotpy-native-wpilib"]
-depends = ["wpilib"]
-yaml_path = "semiwrap/drive"
-
-[tool.semiwrap.extension_modules."wpilib.drive._drive".headers]
-# wpi/drive
-DifferentialDrive = "wpi/drive/DifferentialDrive.hpp"
-MecanumDrive = "wpi/drive/MecanumDrive.hpp"
-RobotDriveBase = "wpi/drive/RobotDriveBase.hpp"
-
-
-[tool.semiwrap.extension_modules."wpilib.event._event"]
-name = "wpilib_event"
-wraps = ["robotpy-native-wpilib"]
-# depends = ["wpilib", "wpimath_filter"]
-depends = ["wpimath_filter"]
-yaml_path = "semiwrap/event"
-
-[tool.semiwrap.extension_modules."wpilib.event._event".headers]
-# wpi/event
-BooleanEvent = "wpi/event/BooleanEvent.hpp"
-EventLoop = "wpi/event/EventLoop.hpp"
-NetworkBooleanEvent = "wpi/event/NetworkBooleanEvent.hpp"
-
-
 [tool.semiwrap.extension_modules."wpilib.simulation._simulation"]
 name = "wpilib_simulation"
 wraps = ["robotpy-native-wpilib"]

…y-wpilib/semiwrap/event/BooleanEvent.yml …robotpy-wpilib/semiwrap/BooleanEvent.ymlsubprojects/robotpy-wpilib/semiwrap/event/BooleanEvent.yml renamed to subprojects/robotpy-wpilib/semiwrap/BooleanEvent.yml subprojects/robotpy-wpilib/semiwrap/event/BooleanEvent.yml renamed to subprojects/robotpy-wpilib/semiwrap/BooleanEvent.yml

@@ -1,6 +1,3 @@
-defaults:
-  subpackage: interfaces
-
 classes:
   wpi::CounterBase:
     enums:

subprojects/robotpy-wpilib/semiwrap/CounterBase.yml

@@ -1,6 +1,3 @@
-defaults:
-  subpackage: interfaces
-
 extra_includes:
 - wpi/driverstation/DriverStation.hpp
 - wpi/event/BooleanEvent.hpp