From 69961bdd68fa0c7be4196ea6ea8d811ee2f4712c Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sat, 24 May 2025 01:02:56 -0400 Subject: [PATCH 1/9] Updated dependencies - build-system.requires: pyntcore==2027.0.0a1.dev0 - build-system.requires: robotpy-hal==2027.0.0a1.dev0 - build-system.requires: robotpy-native-apriltag==2027.0.0a1.dev0 - build-system.requires: robotpy-native-ntcore==2027.0.0a1.dev0 - build-system.requires: robotpy-native-romi==2027.0.0a1.dev0 - build-system.requires: robotpy-native-wpihal==2027.0.0a1.dev0 - build-system.requires: robotpy-native-wpilib==2027.0.0a1.dev0 - build-system.requires: robotpy-native-wpimath==2027.0.0a1.dev0 - build-system.requires: robotpy-native-wpinet==2027.0.0a1.dev0 - build-system.requires: robotpy-native-wpiutil==2027.0.0a1.dev0 - build-system.requires: robotpy-native-xrp==2027.0.0a1.dev0 - build-system.requires: robotpy-wpimath==2027.0.0a1.dev0 - build-system.requires: robotpy-wpinet==2027.0.0a1.dev0 - build-system.requires: robotpy-wpiutil==2027.0.0a1.dev0 - build-system.requires: wpilib==2027.0.0a1.dev0 - lib updated to 2025.3.2-123-g22d12d2 - project.dependencies: pyntcore==2027.0.0a1.dev0 - project.dependencies: robotpy-hal==2027.0.0a1.dev0 - project.dependencies: robotpy-native-apriltag==2027.0.0a1.dev0 - project.dependencies: robotpy-native-ntcore==2027.0.0a1.dev0 - project.dependencies: robotpy-native-wpihal==2027.0.0a1.dev0 - project.dependencies: robotpy-native-wpilib==2027.0.0a1.dev0 - project.dependencies: robotpy-native-wpimath==2027.0.0a1.dev0 - project.dependencies: robotpy-native-wpinet==2027.0.0a1.dev0 - project.dependencies: robotpy-native-wpiutil==2027.0.0a1.dev0 - project.dependencies: robotpy-wpimath==2027.0.0a1.dev0 - project.dependencies: robotpy-wpinet==2027.0.0a1.dev0 - project.dependencies: robotpy-wpiutil==2027.0.0a1.dev0 - project.dependencies: wpilib==2027.0.0a1.dev0 - pyntcore updated to 2027.0.0a1.dev0 - repo updated to https://frcmaven.wpi.edu/artifactory/development-2027 - robotpy-apriltag updated to 2027.0.0a1.dev0 - robotpy-cscore updated to 2027.0.0a1.dev0 - robotpy-hal updated to 2027.0.0a1.dev0 - robotpy-halsim-ds-socket updated to 2027.0.0a1.dev0 - robotpy-halsim-gui updated to 2027.0.0a1.dev0 - robotpy-halsim-ws updated to 2027.0.0a1.dev0 - robotpy-native-apriltag updated to 2027.0.0a1.dev0 - robotpy-native-ntcore updated to 2027.0.0a1.dev0 - robotpy-native-romi updated to 2027.0.0a1.dev0 - robotpy-native-wpihal updated to 2027.0.0a1.dev0 - robotpy-native-wpilib updated to 2027.0.0a1.dev0 - robotpy-native-wpimath updated to 2027.0.0a1.dev0 - robotpy-native-wpinet updated to 2027.0.0a1.dev0 - robotpy-native-wpiutil updated to 2027.0.0a1.dev0 - robotpy-native-xrp updated to 2027.0.0a1.dev0 - robotpy-romi updated to 2027.0.0a1.dev0 - robotpy-wpimath updated to 2027.0.0a1.dev0 - robotpy-wpinet updated to 2027.0.0a1.dev0 - robotpy-wpiutil updated to 2027.0.0a1.dev0 - robotpy-xrp updated to 2027.0.0a1.dev0 - wpilib updated to 2027.0.0a1.dev0 --- rdev.toml | 12 ++++----- subprojects/pyntcore/pyproject.toml | 14 +++++----- subprojects/robotpy-apriltag/pyproject.toml | 14 +++++----- subprojects/robotpy-cscore/pyproject.toml | 22 ++++++++-------- subprojects/robotpy-hal/pyproject.toml | 10 +++---- .../robotpy-halsim-ds-socket/pyproject.toml | 10 +++---- subprojects/robotpy-halsim-gui/pyproject.toml | 22 ++++++++-------- subprojects/robotpy-halsim-ws/pyproject.toml | 14 +++++----- .../robotpy-native-apriltag/pyproject.toml | 14 +++++----- .../robotpy-native-ntcore/pyproject.toml | 14 +++++----- .../robotpy-native-romi/pyproject.toml | 10 +++---- .../robotpy-native-wpihal/pyproject.toml | 10 +++---- .../robotpy-native-wpilib/pyproject.toml | 26 +++++++++---------- .../robotpy-native-wpimath/pyproject.toml | 10 +++---- .../robotpy-native-wpinet/pyproject.toml | 10 +++---- .../robotpy-native-wpiutil/pyproject.toml | 6 ++--- subprojects/robotpy-native-xrp/pyproject.toml | 10 +++---- subprojects/robotpy-romi/pyproject.toml | 8 +++--- subprojects/robotpy-wpilib/pyproject.toml | 22 ++++++++-------- subprojects/robotpy-wpimath/pyproject.toml | 10 +++---- subprojects/robotpy-wpinet/pyproject.toml | 10 +++---- subprojects/robotpy-wpiutil/pyproject.toml | 6 ++--- subprojects/robotpy-xrp/pyproject.toml | 12 ++++----- 23 files changed, 148 insertions(+), 148 deletions(-) diff --git a/rdev.toml b/rdev.toml index 98011b7f..8809f62a 100644 --- a/rdev.toml +++ b/rdev.toml @@ -11,19 +11,19 @@ [py_versions] # Usually the same as wpilib_bin_version -native = "2025.3.2" +native = "2027.0.0a1.dev0" # Will eventually sync with native -halsim_native = "2025.3.2.2" +halsim_native = "2027.0.0a1.dev0" # Usually similar to native, but subminor version is bumped for bugfixes -wrapper = "2025.3.2.2" +wrapper = "2027.0.0a1.dev0" [params] -wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release" -wpilib_bin_version = "2025.3.2" -#wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development" +# wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release" +wpilib_bin_version = "2025.3.2-123-g22d12d2" +wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development-2027" # Don't update these maven artifacts exclude_artifacts = [ diff --git a/subprojects/pyntcore/pyproject.toml b/subprojects/pyntcore/pyproject.toml index c5e8e48f..01761451 100644 --- a/subprojects/pyntcore/pyproject.toml +++ b/subprojects/pyntcore/pyproject.toml @@ -5,24 +5,24 @@ requires = [ "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", - "robotpy-native-ntcore==2025.3.2", - "robotpy-wpiutil==2025.3.2.2", - "robotpy-wpinet==2025.3.2.2", + "robotpy-native-ntcore==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0", + "robotpy-wpinet==2027.0.0a1.dev0", ] [project] name = "pyntcore" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "Binary wrappers for the FRC ntcore library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-ntcore==2025.3.2", - "robotpy-wpiutil==2025.3.2.2", - "robotpy-wpinet==2025.3.2.2", + "robotpy-native-ntcore==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0", + "robotpy-wpinet==2027.0.0a1.dev0", ] [project.urls] diff --git a/subprojects/robotpy-apriltag/pyproject.toml b/subprojects/robotpy-apriltag/pyproject.toml index c5f0919e..1d4bea64 100644 --- a/subprojects/robotpy-apriltag/pyproject.toml +++ b/subprojects/robotpy-apriltag/pyproject.toml @@ -5,23 +5,23 @@ requires = [ "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", - "robotpy-native-apriltag==2025.3.2", - "robotpy-wpiutil==2025.3.2.2", - "robotpy-wpimath==2025.3.2.2", + "robotpy-native-apriltag==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0", + "robotpy-wpimath==2027.0.0a1.dev0", ] [project] name = "robotpy-apriltag" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "RobotPy bindings for WPILib's AprilTag library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-apriltag==2025.3.2", - "robotpy-wpiutil==2025.3.2.2", - "robotpy-wpimath==2025.3.2.2", + "robotpy-native-apriltag==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0", + "robotpy-wpimath==2027.0.0a1.dev0", ] [project.urls] diff --git a/subprojects/robotpy-cscore/pyproject.toml b/subprojects/robotpy-cscore/pyproject.toml index 30a71b24..300b7759 100644 --- a/subprojects/robotpy-cscore/pyproject.toml +++ b/subprojects/robotpy-cscore/pyproject.toml @@ -5,24 +5,24 @@ requires = [ "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", - "robotpy-wpiutil==2025.3.2.2", - "robotpy-wpinet==2025.3.2.2", - "pyntcore==2025.3.2.2", + "robotpy-wpiutil==2027.0.0a1.dev0", + "robotpy-wpinet==2027.0.0a1.dev0", + "pyntcore==2027.0.0a1.dev0", # "numpy", # required for pybind11-stubgen to not complain, broken in raspbian CI ] [project] name = "robotpy-cscore" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "RobotPy bindings for cscore image processing library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-wpiutil==2025.3.2.2", - "robotpy-wpinet==2025.3.2.2", - "pyntcore==2025.3.2.2", + "robotpy-wpiutil==2027.0.0a1.dev0", + "robotpy-wpinet==2027.0.0a1.dev0", + "pyntcore==2027.0.0a1.dev0", ] [project.urls] @@ -43,8 +43,8 @@ version_file = "cscore/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "cscore-cpp" group_id = "edu.wpi.first.cscore" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" staticlibs = ["cscore"] extract_to = "lib" @@ -52,8 +52,8 @@ extract_to = "lib" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "cameraserver-cpp" group_id = "edu.wpi.first.cameraserver" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" staticlibs = ["cameraserver"] extract_to = "lib" diff --git a/subprojects/robotpy-hal/pyproject.toml b/subprojects/robotpy-hal/pyproject.toml index 70f77f31..65b5aff8 100644 --- a/subprojects/robotpy-hal/pyproject.toml +++ b/subprojects/robotpy-hal/pyproject.toml @@ -4,21 +4,21 @@ requires = [ "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatchling", - "robotpy-native-wpihal==2025.3.2", - "robotpy-wpiutil==2025.3.2.2", + "robotpy-native-wpihal==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0", ] [project] name = "robotpy-hal" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "Binary wrapper for FRC HAL" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpihal==2025.3.2", - "robotpy-wpiutil==2025.3.2.2", + "robotpy-native-wpihal==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0", ] [project.urls] diff --git a/subprojects/robotpy-halsim-ds-socket/pyproject.toml b/subprojects/robotpy-halsim-ds-socket/pyproject.toml index 32ccd891..54900363 100644 --- a/subprojects/robotpy-halsim-ds-socket/pyproject.toml +++ b/subprojects/robotpy-halsim-ds-socket/pyproject.toml @@ -7,15 +7,15 @@ requires = [ [project] name = "robotpy-halsim-ds-socket" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "WPILib simulator DS Socket Extension" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpihal==2025.3.2", - "robotpy-native-wpinet==2025.3.2", + "robotpy-native-wpihal==2027.0.0a1.dev0", + "robotpy-native-wpinet==2027.0.0a1.dev0", ] [project.entry-points.robotpysimext] @@ -28,8 +28,8 @@ version_file = "halsim_ds_socket/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_ds_socket" group_id = "edu.wpi.first.halsim" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" use_headers = false extract_to = "halsim_ds_socket" diff --git a/subprojects/robotpy-halsim-gui/pyproject.toml b/subprojects/robotpy-halsim-gui/pyproject.toml index 77c84c33..56efde78 100644 --- a/subprojects/robotpy-halsim-gui/pyproject.toml +++ b/subprojects/robotpy-halsim-gui/pyproject.toml @@ -5,25 +5,25 @@ requires = [ "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", - "robotpy-wpiutil==2025.3.2.2", - "robotpy-wpimath==2025.3.2.2", - "robotpy-hal==2025.3.2.2", - "pyntcore==2025.3.2.2", + "robotpy-wpiutil==2027.0.0a1.dev0", + "robotpy-wpimath==2027.0.0a1.dev0", + "robotpy-hal==2027.0.0a1.dev0", + "pyntcore==2027.0.0a1.dev0", ] [project] name = "robotpy-halsim-gui" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "WPILib simulation GUI" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-wpiutil==2025.3.2.2", - "robotpy-wpimath==2025.3.2.2", - "robotpy-hal==2025.3.2.2", - "pyntcore==2025.3.2.2", + "robotpy-wpiutil==2027.0.0a1.dev0", + "robotpy-wpimath==2027.0.0a1.dev0", + "robotpy-hal==2027.0.0a1.dev0", + "pyntcore==2027.0.0a1.dev0", ] [project.urls] @@ -36,8 +36,8 @@ version_file = "halsim_gui/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_gui" group_id = "edu.wpi.first.halsim" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" use_headers = true libs = ["halsim_gui"] diff --git a/subprojects/robotpy-halsim-ws/pyproject.toml b/subprojects/robotpy-halsim-ws/pyproject.toml index 1dd5a23d..afbbf207 100644 --- a/subprojects/robotpy-halsim-ws/pyproject.toml +++ b/subprojects/robotpy-halsim-ws/pyproject.toml @@ -7,15 +7,15 @@ requires = [ [project] name = "robotpy-halsim-ws" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "WPILib simulator websim Extensions" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpihal==2025.3.2", - "robotpy-native-wpinet==2025.3.2", + "robotpy-native-wpihal==2027.0.0a1.dev0", + "robotpy-native-wpinet==2027.0.0a1.dev0", ] [project.entry-points.robotpysimext] @@ -33,8 +33,8 @@ version_file = "halsim_ws/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_ws_server" group_id = "edu.wpi.first.halsim" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" use_headers = false extract_to = "halsim_ws/server" @@ -43,8 +43,8 @@ libs = ["halsim_ws_server"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_ws_client" group_id = "edu.wpi.first.halsim" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" use_headers = false extract_to = "halsim_ws/client" diff --git a/subprojects/robotpy-native-apriltag/pyproject.toml b/subprojects/robotpy-native-apriltag/pyproject.toml index 6d0f88fc..9040a50d 100644 --- a/subprojects/robotpy-native-apriltag/pyproject.toml +++ b/subprojects/robotpy-native-apriltag/pyproject.toml @@ -4,19 +4,19 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2", - "robotpy-native-wpiutil==2025.3.2", - "robotpy-native-wpimath==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", + "robotpy-native-wpimath==2027.0.0a1.dev0", ] [project] name = "robotpy-native-apriltag" -version = "2025.3.2" +version = "2027.0.0a1.dev0" description = "WPILib AprilTag Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2025.3.2", - "robotpy-native-wpimath==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", + "robotpy-native-wpimath==2027.0.0a1.dev0", ] [tool.hatch.build.targets.wheel] @@ -25,8 +25,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "apriltag-cpp" group_id = "edu.wpi.first.apriltag" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" extract_to = "src/native/apriltag" libs = ["apriltag"] diff --git a/subprojects/robotpy-native-ntcore/pyproject.toml b/subprojects/robotpy-native-ntcore/pyproject.toml index 83f83e7b..d3ec8eac 100644 --- a/subprojects/robotpy-native-ntcore/pyproject.toml +++ b/subprojects/robotpy-native-ntcore/pyproject.toml @@ -4,19 +4,19 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2", - "robotpy-native-wpiutil==2025.3.2", - "robotpy-native-wpinet==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", + "robotpy-native-wpinet==2027.0.0a1.dev0", ] [project] name = "robotpy-native-ntcore" -version = "2025.3.2" +version = "2027.0.0a1.dev0" description = "WPILib NetworkTables Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2025.3.2", - "robotpy-native-wpinet==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", + "robotpy-native-wpinet==2027.0.0a1.dev0", ] [tool.hatch.build.targets.wheel] @@ -25,8 +25,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "ntcore-cpp" group_id = "edu.wpi.first.ntcore" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" extract_to = "src/native/ntcore" libs = ["ntcore"] diff --git a/subprojects/robotpy-native-romi/pyproject.toml b/subprojects/robotpy-native-romi/pyproject.toml index 47688367..9e846276 100644 --- a/subprojects/robotpy-native-romi/pyproject.toml +++ b/subprojects/robotpy-native-romi/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2", - "robotpy-native-wpilib==2025.3.2", + "robotpy-native-wpilib==2027.0.0a1.dev0", ] [project] name = "robotpy-native-romi" -version = "2025.3.2" +version = "2027.0.0a1.dev0" description = "WPILib Romi support library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==2025.3.2", + "robotpy-native-wpilib==2027.0.0a1.dev0", ] [tool.hatch.build.targets.wheel] @@ -23,8 +23,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "romiVendordep-cpp" group_id = "edu.wpi.first.romiVendordep" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" extract_to = "src/native/romi" libs = ["romiVendordep"] diff --git a/subprojects/robotpy-native-wpihal/pyproject.toml b/subprojects/robotpy-native-wpihal/pyproject.toml index 0ee6480e..0335c79c 100644 --- a/subprojects/robotpy-native-wpihal/pyproject.toml +++ b/subprojects/robotpy-native-wpihal/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2", - "robotpy-native-wpiutil==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", ] [project] name = "robotpy-native-wpihal" -version = "2025.3.2" +version = "2027.0.0a1.dev0" description = "WPILib HAL implementation" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", ] [tool.hatch.build.targets.wheel] @@ -23,8 +23,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "hal-cpp" group_id = "edu.wpi.first.hal" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" extract_to = "src/native/wpihal" libs = ["wpiHal"] diff --git a/subprojects/robotpy-native-wpilib/pyproject.toml b/subprojects/robotpy-native-wpilib/pyproject.toml index 9a418fa6..5604e4bc 100644 --- a/subprojects/robotpy-native-wpilib/pyproject.toml +++ b/subprojects/robotpy-native-wpilib/pyproject.toml @@ -4,25 +4,25 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2", - "robotpy-native-wpiutil==2025.3.2", - "robotpy-native-wpinet==2025.3.2", - "robotpy-native-ntcore==2025.3.2", - "robotpy-native-wpimath==2025.3.2", - "robotpy-native-wpihal==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", + "robotpy-native-wpinet==2027.0.0a1.dev0", + "robotpy-native-ntcore==2027.0.0a1.dev0", + "robotpy-native-wpimath==2027.0.0a1.dev0", + "robotpy-native-wpihal==2027.0.0a1.dev0", ] [project] name = "robotpy-native-wpilib" -version = "2025.3.2" +version = "2027.0.0a1.dev0" description = "WPILib Robotics Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2025.3.2", - "robotpy-native-wpinet==2025.3.2", - "robotpy-native-ntcore==2025.3.2", - "robotpy-native-wpimath==2025.3.2", - "robotpy-native-wpihal==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", + "robotpy-native-wpinet==2027.0.0a1.dev0", + "robotpy-native-ntcore==2027.0.0a1.dev0", + "robotpy-native-wpimath==2027.0.0a1.dev0", + "robotpy-native-wpihal==2027.0.0a1.dev0", ] [tool.hatch.build.targets.wheel] @@ -31,8 +31,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpilibc-cpp" group_id = "edu.wpi.first.wpilibc" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" extract_to = "src/native/wpilib" libs = ["wpilibc"] diff --git a/subprojects/robotpy-native-wpimath/pyproject.toml b/subprojects/robotpy-native-wpimath/pyproject.toml index 72b8bcd3..466dc4ae 100644 --- a/subprojects/robotpy-native-wpimath/pyproject.toml +++ b/subprojects/robotpy-native-wpimath/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2", - "robotpy-native-wpiutil==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", ] [project] name = "robotpy-native-wpimath" -version = "2025.3.2" +version = "2027.0.0a1.dev0" description = "WPILib Math Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", ] [tool.hatch.build.targets.wheel] @@ -23,8 +23,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpimath-cpp" group_id = "edu.wpi.first.wpimath" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" extract_to = "src/native/wpimath" libs = ["wpimath"] diff --git a/subprojects/robotpy-native-wpinet/pyproject.toml b/subprojects/robotpy-native-wpinet/pyproject.toml index ac928d9d..3bd39dac 100644 --- a/subprojects/robotpy-native-wpinet/pyproject.toml +++ b/subprojects/robotpy-native-wpinet/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2", - "robotpy-native-wpiutil==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", ] [project] name = "robotpy-native-wpinet" -version = "2025.3.2" +version = "2027.0.0a1.dev0" description = "WPILib Networking Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", ] [tool.hatch.build.targets.wheel] @@ -23,8 +23,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpinet-cpp" group_id = "edu.wpi.first.wpinet" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" extract_to = "src/native/wpinet" libs = ["wpinet"] diff --git a/subprojects/robotpy-native-wpiutil/pyproject.toml b/subprojects/robotpy-native-wpiutil/pyproject.toml index e0a6e604..b97e6898 100644 --- a/subprojects/robotpy-native-wpiutil/pyproject.toml +++ b/subprojects/robotpy-native-wpiutil/pyproject.toml @@ -8,7 +8,7 @@ requires = [ [project] name = "robotpy-native-wpiutil" -version = "2025.3.2" +version = "2027.0.0a1.dev0" description = "WPILib Utility Library" license = "BSD-3-Clause" @@ -22,8 +22,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "wpiutil-cpp" group_id = "edu.wpi.first.wpiutil" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" extract_to = "src/native/wpiutil" libs = ["wpiutil"] diff --git a/subprojects/robotpy-native-xrp/pyproject.toml b/subprojects/robotpy-native-xrp/pyproject.toml index 7499b4d6..ecd5b6c4 100644 --- a/subprojects/robotpy-native-xrp/pyproject.toml +++ b/subprojects/robotpy-native-xrp/pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2", - "robotpy-native-wpilib==2025.3.2", + "robotpy-native-wpilib==2027.0.0a1.dev0", ] [project] name = "robotpy-native-xrp" -version = "2025.3.2" +version = "2027.0.0a1.dev0" description = "WPILib XRP vendor library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==2025.3.2", + "robotpy-native-wpilib==2027.0.0a1.dev0", ] [tool.hatch.build.targets.wheel] @@ -23,8 +23,8 @@ packages = ["src/native"] [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "xrpVendordep-cpp" group_id = "edu.wpi.first.xrpVendordep" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" extract_to = "src/native/xrp" libs = ["xrpVendordep"] diff --git a/subprojects/robotpy-romi/pyproject.toml b/subprojects/robotpy-romi/pyproject.toml index 48948c87..056b3829 100644 --- a/subprojects/robotpy-romi/pyproject.toml +++ b/subprojects/robotpy-romi/pyproject.toml @@ -5,21 +5,21 @@ requires = [ "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", - "robotpy-native-romi==2025.3.2", - "wpilib==2025.3.2.2", + "robotpy-native-romi==2027.0.0a1.dev0", + "wpilib==2027.0.0a1.dev0", ] [project] name = "robotpy-romi" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "Binary wrapper for WPILib Romi Vendor library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "wpilib==2025.3.2.2" + "wpilib==2027.0.0a1.dev0" ] [project.urls] diff --git a/subprojects/robotpy-wpilib/pyproject.toml b/subprojects/robotpy-wpilib/pyproject.toml index 297d0128..38b703ce 100644 --- a/subprojects/robotpy-wpilib/pyproject.toml +++ b/subprojects/robotpy-wpilib/pyproject.toml @@ -5,27 +5,27 @@ requires = [ "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", - "robotpy-native-wpilib==2025.3.2", - "robotpy-wpiutil==2025.3.2.2", - "robotpy-wpimath==2025.3.2.2", - "robotpy-hal==2025.3.2.2", - "pyntcore==2025.3.2.2", + "robotpy-native-wpilib==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0", + "robotpy-wpimath==2027.0.0a1.dev0", + "robotpy-hal==2027.0.0a1.dev0", + "pyntcore==2027.0.0a1.dev0", ] [project] name = "wpilib" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "Binary wrapper for FRC WPILib" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==2025.3.2", - "robotpy-wpiutil==2025.3.2.2", - "robotpy-wpimath==2025.3.2.2", - "robotpy-hal==2025.3.2.2", - "pyntcore==2025.3.2.2", + "robotpy-native-wpilib==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0", + "robotpy-wpimath==2027.0.0a1.dev0", + "robotpy-hal==2027.0.0a1.dev0", + "pyntcore==2027.0.0a1.dev0", "robotpy-cli~=2024.0b" ] diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml index 01bf64ca..9c15f919 100644 --- a/subprojects/robotpy-wpimath/pyproject.toml +++ b/subprojects/robotpy-wpimath/pyproject.toml @@ -5,22 +5,22 @@ requires = [ "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", - "robotpy-native-wpimath==2025.3.2", - "robotpy-wpiutil==2025.3.2.2", + "robotpy-native-wpimath==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0", # "numpy", # broken in raspbian CI ] [project] name = "robotpy-wpimath" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "Binary wrapper for FRC WPIMath library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpimath==2025.3.2", - "robotpy-wpiutil==2025.3.2.2", + "robotpy-native-wpimath==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0", ] [project.urls] diff --git a/subprojects/robotpy-wpinet/pyproject.toml b/subprojects/robotpy-wpinet/pyproject.toml index deec4d53..4d50a0b2 100644 --- a/subprojects/robotpy-wpinet/pyproject.toml +++ b/subprojects/robotpy-wpinet/pyproject.toml @@ -4,21 +4,21 @@ requires = [ "semiwrap~=0.1.2", "hatch-meson~=0.1.0b2", "hatchling", - "robotpy-native-wpinet==2025.3.2", - "robotpy-wpiutil==2025.3.2.2" + "robotpy-native-wpinet==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0" ] [project] name = "robotpy-wpinet" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "Binary wrapper for FRC wpinet library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpinet==2025.3.2", - "robotpy-wpiutil==2025.3.2.2" + "robotpy-native-wpinet==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0" ] [project.urls] diff --git a/subprojects/robotpy-wpiutil/pyproject.toml b/subprojects/robotpy-wpiutil/pyproject.toml index b37acd45..1782ecd7 100644 --- a/subprojects/robotpy-wpiutil/pyproject.toml +++ b/subprojects/robotpy-wpiutil/pyproject.toml @@ -5,19 +5,19 @@ requires = [ "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", - "robotpy-native-wpiutil==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", ] [project] name = "robotpy-wpiutil" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "Binary wrapper for FRC WPIUtil library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2025.3.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", ] [project.urls] diff --git a/subprojects/robotpy-xrp/pyproject.toml b/subprojects/robotpy-xrp/pyproject.toml index dc63f8e1..d188964f 100644 --- a/subprojects/robotpy-xrp/pyproject.toml +++ b/subprojects/robotpy-xrp/pyproject.toml @@ -5,21 +5,21 @@ requires = [ "hatch-meson~=0.1.0b2", "hatch-robotpy~=0.2", "hatchling", - "robotpy-native-xrp==2025.3.2", - "wpilib==2025.3.2.2", + "robotpy-native-xrp==2027.0.0a1.dev0", + "wpilib==2027.0.0a1.dev0", ] [project] name = "robotpy-xrp" -version = "2025.3.2.2" +version = "2027.0.0a1.dev0" description = "Binary wrapper for WPILib XRP Vendor library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "wpilib==2025.3.2.2" + "wpilib==2027.0.0a1.dev0" ] [project.entry-points.robotpysimext] @@ -32,8 +32,8 @@ version_file = "xrp/version.py" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "halsim_xrp" group_id = "edu.wpi.first.halsim" -repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "2025.3.2" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" use_headers = false extract_to = "xrp/extension" From 2a2449abf2117022bc7a824ed4e97507f2cb743c Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sat, 24 May 2025 23:11:40 -0400 Subject: [PATCH 2/9] Split datalog from wpiutil --- rdev.toml | 8 +++ subprojects/robotpy-native-datalog/.gitignore | 2 + .../robotpy-native-datalog/pyproject.toml | 40 ++++++++++++ subprojects/robotpy-wpilog/.gitignore | 10 +++ subprojects/robotpy-wpilog/meson.build | 11 ++++ subprojects/robotpy-wpilog/pyproject.toml | 62 +++++++++++++++++++ .../robotpy-wpilog/semiwrap/.gitignore | 3 + .../semiwrap/DataLog.yml | 33 +--------- .../semiwrap/DataLogBackgroundWriter.yml | 0 .../semiwrap/DataLogReader.yml | 4 -- .../semiwrap/DataLogWriter.yml | 0 subprojects/robotpy-wpilog/src/main.cpp | 6 ++ .../robotpy-wpilog/tests/requirements.txt | 1 + subprojects/robotpy-wpilog/tests/run_tests.py | 12 ++++ .../robotpy-wpilog/tests/test_wpilog.py | 5 ++ .../log => robotpy-wpilog/wpilog}/__init__.py | 12 +++- subprojects/robotpy-wpiutil/pyproject.toml | 6 +- .../robotpy-wpiutil/wpiutil/__init__.py | 6 -- 18 files changed, 174 insertions(+), 47 deletions(-) create mode 100644 subprojects/robotpy-native-datalog/.gitignore create mode 100644 subprojects/robotpy-native-datalog/pyproject.toml create mode 100644 subprojects/robotpy-wpilog/.gitignore create mode 100644 subprojects/robotpy-wpilog/meson.build create mode 100644 subprojects/robotpy-wpilog/pyproject.toml create mode 100644 subprojects/robotpy-wpilog/semiwrap/.gitignore rename subprojects/{robotpy-wpiutil => robotpy-wpilog}/semiwrap/DataLog.yml (95%) rename subprojects/{robotpy-wpiutil => robotpy-wpilog}/semiwrap/DataLogBackgroundWriter.yml (100%) rename subprojects/{robotpy-wpiutil => robotpy-wpilog}/semiwrap/DataLogReader.yml (99%) rename subprojects/{robotpy-wpiutil => robotpy-wpilog}/semiwrap/DataLogWriter.yml (100%) create mode 100644 subprojects/robotpy-wpilog/src/main.cpp create mode 100644 subprojects/robotpy-wpilog/tests/requirements.txt create mode 100755 subprojects/robotpy-wpilog/tests/run_tests.py create mode 100644 subprojects/robotpy-wpilog/tests/test_wpilog.py rename subprojects/{robotpy-wpiutil/wpiutil/log => robotpy-wpilog/wpilog}/__init__.py (76%) diff --git a/rdev.toml b/rdev.toml index 8809f62a..a6cb7fab 100644 --- a/rdev.toml +++ b/rdev.toml @@ -41,6 +41,10 @@ hatch-robotpy = "~=0.2" py_version = "native" roborio = true +[subprojects."robotpy-native-datalog"] +py_version = "native" +roborio = true + [subprojects."robotpy-native-wpinet"] py_version = "native" roborio = true @@ -77,6 +81,10 @@ roborio = false py_version = "wrapper" roborio = true +[subprojects."robotpy-wpilog"] +py_version = "wrapper" +roborio = true + [subprojects."robotpy-wpinet"] py_version = "wrapper" roborio = true diff --git a/subprojects/robotpy-native-datalog/.gitignore b/subprojects/robotpy-native-datalog/.gitignore new file mode 100644 index 00000000..a32b856a --- /dev/null +++ b/subprojects/robotpy-native-datalog/.gitignore @@ -0,0 +1,2 @@ +/dist +/src diff --git a/subprojects/robotpy-native-datalog/pyproject.toml b/subprojects/robotpy-native-datalog/pyproject.toml new file mode 100644 index 00000000..94c81b69 --- /dev/null +++ b/subprojects/robotpy-native-datalog/pyproject.toml @@ -0,0 +1,40 @@ +[build-system] +build-backend = "hatchling.build" +requires = [ + "hatchling", + "hatch-nativelib~=0.2.0", + "hatch-robotpy~=0.2", + "robotpy-native-wpiutil==2027.0.0a1.dev0", +] + +[project] +name = "robotpy-native-datalog" +version = "2027.0.0a1.dev0" +description = "WPILib Utility Library" +license = "BSD-3-Clause" + +dependencies = [ + "robotpy-native-wpiutil==2027.0.0a1.dev0", +] + +[tool.hatch.build.targets.wheel] +packages = ["src/native"] + + +[[tool.hatch.build.hooks.robotpy.maven_lib_download]] +artifact_id = "datalog-cpp" +group_id = "edu.wpi.first.datalog" +repo_url = "https://frcmaven.wpi.edu/artifactory/development-2027" +version = "2025.3.2-123-g22d12d2" + +extract_to = "src/native/datalog" +libs = ["datalog"] + +[[tool.hatch.build.hooks.nativelib.pcfile]] +pcfile = "src/native/datalog/robotpy-native-datalog.pc" +name = "datalog" + +includedir = "src/native/datalog/include" +libdir = "src/native/datalog/lib" +shared_libraries = ["datalog"] +requires = ["robotpy-native-wpiutil"] \ No newline at end of file diff --git a/subprojects/robotpy-wpilog/.gitignore b/subprojects/robotpy-wpilog/.gitignore new file mode 100644 index 00000000..24dfbb02 --- /dev/null +++ b/subprojects/robotpy-wpilog/.gitignore @@ -0,0 +1,10 @@ +/build +/dist +*.pc +*.so +*.dll +*.dylib + +/wpilog/_init__wpilog.py +/wpilog/version.py +/wpilog/trampolines diff --git a/subprojects/robotpy-wpilog/meson.build b/subprojects/robotpy-wpilog/meson.build new file mode 100644 index 00000000..382e8d77 --- /dev/null +++ b/subprojects/robotpy-wpilog/meson.build @@ -0,0 +1,11 @@ +project('robotpy-wpilog', ['cpp'], + default_options: ['warning_level=1', 'cpp_std=c++20', + 'b_colorout=auto', 'optimization=2', 'b_pie=true']) + +subdir('semiwrap') + +wpilog_sources += files( + 'src/main.cpp', +) + +subdir('semiwrap/modules') diff --git a/subprojects/robotpy-wpilog/pyproject.toml b/subprojects/robotpy-wpilog/pyproject.toml new file mode 100644 index 00000000..7fce038f --- /dev/null +++ b/subprojects/robotpy-wpilog/pyproject.toml @@ -0,0 +1,62 @@ +[build-system] +build-backend = "hatchling.build" +requires = [ + "semiwrap~=0.1.2", + "hatch-meson~=0.1.0b2", + "hatchling", + "robotpy-native-datalog==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0" +] + +[project] +name = "robotpy-wpilog" +version = "2027.0.0a1.dev0" +description = "Binary wrapper for FRC wpilog library" +authors = [ + {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, +] +license = "BSD-3-Clause" +dependencies = [ + "robotpy-native-datalog==2027.0.0a1.dev0", + "robotpy-wpiutil==2027.0.0a1.dev0" +] + +[project.urls] +"Source code" = "https://github.com/robotpy/mostrobotpy" + + +[tool.hatch.build.hooks.robotpy] +version_file = "wpilog/version.py" + +[tool.hatch.build.hooks.semiwrap] + +[tool.hatch.build.hooks.meson] + +[tool.hatch.build.targets.wheel] +packages = ["wpilog"] + + +[tool.semiwrap] +update_init = [ + "wpilog" +] +scan_headers_ignore = [ + # wpi/datalog + "wpi/datalog/DataLog_c.h", + "wpi/datalog/FileLogger.h", +] + +[tool.semiwrap.extension_modules."wpilog._wpilog"] +name = "wpilog" +wraps = ["robotpy-native-datalog"] +depends = ["wpiutil"] + +[tool.semiwrap.extension_modules."wpilog._wpilog".headers] +# wpi/datalog +DataLog = "wpi/datalog/DataLog.h" +DataLogBackgroundWriter = "wpi/datalog/DataLogBackgroundWriter.h" +DataLogReader = "wpi/datalog/DataLogReader.h" +# DataLogReaderThread = "wpi/datalog/DataLogReaderThread.h" +DataLogWriter = "wpi/datalog/DataLogWriter.h" +# DataLog_c = "wpi/datalog/DataLog_c.h" +# FileLogger = "wpi/datalog/FileLogger.h" \ No newline at end of file diff --git a/subprojects/robotpy-wpilog/semiwrap/.gitignore b/subprojects/robotpy-wpilog/semiwrap/.gitignore new file mode 100644 index 00000000..6cdce102 --- /dev/null +++ b/subprojects/robotpy-wpilog/semiwrap/.gitignore @@ -0,0 +1,3 @@ +/meson.build +/modules/meson.build +/trampolines/meson.build diff --git a/subprojects/robotpy-wpiutil/semiwrap/DataLog.yml b/subprojects/robotpy-wpilog/semiwrap/DataLog.yml similarity index 95% rename from subprojects/robotpy-wpiutil/semiwrap/DataLog.yml rename to subprojects/robotpy-wpilog/semiwrap/DataLog.yml index 1ccff49c..fcf4ca52 100644 --- a/subprojects/robotpy-wpiutil/semiwrap/DataLog.yml +++ b/subprojects/robotpy-wpilog/semiwrap/DataLog.yml @@ -1,12 +1,11 @@ --- -defaults: - ignore: true - report_ignored_missing: false +# defaults: +# ignore: true +# report_ignored_missing: false enums: ControlRecordType: classes: wpi::log::DataLog: - subpackage: log attributes: kBlockSize: s_defaultMessageLog: @@ -72,7 +71,6 @@ classes: BufferHalfFull: BufferFull: wpi::log::DataLogEntry: - subpackage: log force_no_trampoline: true methods: SetMetadata: @@ -100,7 +98,6 @@ classes: ignore: true DataLog&, std::string_view, std::string_view, std::string_view, int64_t: wpi::log::RawLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -115,7 +112,6 @@ classes: Append: Update: wpi::log::BooleanLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -129,7 +125,6 @@ classes: Append: Update: wpi::log::IntegerLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -143,7 +138,6 @@ classes: Append: Update: wpi::log::FloatLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -157,7 +151,6 @@ classes: Append: Update: wpi::log::DoubleLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -171,7 +164,6 @@ classes: Append: Update: wpi::log::StringLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -186,7 +178,6 @@ classes: Append: Update: wpi::log::BooleanArrayLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -219,7 +210,6 @@ classes: std::span, int64_t: ignore: true wpi::log::IntegerArrayLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -241,7 +231,6 @@ classes: std::initializer_list, int64_t: ignore: true wpi::log::FloatArrayLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -263,7 +252,6 @@ classes: std::initializer_list, int64_t: ignore: true wpi::log::DoubleArrayLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -285,7 +273,6 @@ classes: std::initializer_list, int64_t: ignore: true wpi::log::StringArrayLogEntry: - subpackage: log force_no_trampoline: true attributes: kDataType: @@ -373,7 +360,6 @@ classes: ignore: true std::span, int64_t: wpi::log::ProtobufLogEntry: - subpackage: log force_no_trampoline: true ignore: true methods: @@ -387,69 +373,56 @@ classes: templates: StructLogEntry: qualname: wpi::log::StructLogEntry - subpackage: log params: - WPyStruct - WPyStructInfo StructArrayLogEntry: qualname: wpi::log::StructArrayLogEntry - subpackage: log params: - WPyStruct - WPyStructInfo _RawLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector _BooleanLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - bool _IntegerLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - int64_t _FloatLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - float _DoubleLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - double _StringLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::string _BooleanArrayLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector _IntegerArrayLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector _FloatArrayLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector _DoubleArrayLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector _StringArrayLogEntryImpl: qualname: wpi::log::DataLogValueEntryImpl - subpackage: log params: - std::vector \ No newline at end of file diff --git a/subprojects/robotpy-wpiutil/semiwrap/DataLogBackgroundWriter.yml b/subprojects/robotpy-wpilog/semiwrap/DataLogBackgroundWriter.yml similarity index 100% rename from subprojects/robotpy-wpiutil/semiwrap/DataLogBackgroundWriter.yml rename to subprojects/robotpy-wpilog/semiwrap/DataLogBackgroundWriter.yml diff --git a/subprojects/robotpy-wpiutil/semiwrap/DataLogReader.yml b/subprojects/robotpy-wpilog/semiwrap/DataLogReader.yml similarity index 99% rename from subprojects/robotpy-wpiutil/semiwrap/DataLogReader.yml rename to subprojects/robotpy-wpilog/semiwrap/DataLogReader.yml index 15a429f7..70554576 100644 --- a/subprojects/robotpy-wpiutil/semiwrap/DataLogReader.yml +++ b/subprojects/robotpy-wpilog/semiwrap/DataLogReader.yml @@ -2,7 +2,6 @@ classes: wpi::log::StartRecordData: - subpackage: log attributes: entry: access: readonly @@ -13,14 +12,12 @@ classes: metadata: access: readonly wpi::log::MetadataRecordData: - subpackage: log attributes: entry: access: readonly metadata: access: readonly wpi::log::DataLogRecord: - subpackage: log methods: DataLogRecord: overloads: @@ -267,7 +264,6 @@ classes: wpi::log::DataLogIterator: ignore: true wpi::log::DataLogReader: - subpackage: log typealias: - wpi::MemoryBuffer methods: diff --git a/subprojects/robotpy-wpiutil/semiwrap/DataLogWriter.yml b/subprojects/robotpy-wpilog/semiwrap/DataLogWriter.yml similarity index 100% rename from subprojects/robotpy-wpiutil/semiwrap/DataLogWriter.yml rename to subprojects/robotpy-wpilog/semiwrap/DataLogWriter.yml diff --git a/subprojects/robotpy-wpilog/src/main.cpp b/subprojects/robotpy-wpilog/src/main.cpp new file mode 100644 index 00000000..5b9f043a --- /dev/null +++ b/subprojects/robotpy-wpilog/src/main.cpp @@ -0,0 +1,6 @@ + +#include + +SEMIWRAP_PYBIND11_MODULE(m) { + initWrapper(m); +} diff --git a/subprojects/robotpy-wpilog/tests/requirements.txt b/subprojects/robotpy-wpilog/tests/requirements.txt new file mode 100644 index 00000000..55b033e9 --- /dev/null +++ b/subprojects/robotpy-wpilog/tests/requirements.txt @@ -0,0 +1 @@ +pytest \ No newline at end of file diff --git a/subprojects/robotpy-wpilog/tests/run_tests.py b/subprojects/robotpy-wpilog/tests/run_tests.py new file mode 100755 index 00000000..2ffc6595 --- /dev/null +++ b/subprojects/robotpy-wpilog/tests/run_tests.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python3 + +import os +from os.path import abspath, dirname +import sys +import subprocess + +if __name__ == "__main__": + root = abspath(dirname(__file__)) + os.chdir(root) + + subprocess.check_call([sys.executable, "-m", "pytest"]) diff --git a/subprojects/robotpy-wpilog/tests/test_wpilog.py b/subprojects/robotpy-wpilog/tests/test_wpilog.py new file mode 100644 index 00000000..594cc341 --- /dev/null +++ b/subprojects/robotpy-wpilog/tests/test_wpilog.py @@ -0,0 +1,5 @@ +import wpilog + + +def test_existance(): + pass diff --git a/subprojects/robotpy-wpiutil/wpiutil/log/__init__.py b/subprojects/robotpy-wpilog/wpilog/__init__.py similarity index 76% rename from subprojects/robotpy-wpiutil/wpiutil/log/__init__.py rename to subprojects/robotpy-wpilog/wpilog/__init__.py index d724c267..abbd3cef 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/log/__init__.py +++ b/subprojects/robotpy-wpilog/wpilog/__init__.py @@ -1,11 +1,16 @@ -# autogenerated by 'semiwrap create-imports wpiutil.log wpiutil._wpiutil.log' -from .._wpiutil.log import ( +from . import _init__wpilog + +# autogenerated by 'semiwrap create-imports wpilog wpilog._wpilog' +from ._wpilog import ( BooleanArrayLogEntry, BooleanLogEntry, + ControlRecordType, DataLog, + DataLogBackgroundWriter, DataLogEntry, DataLogReader, DataLogRecord, + DataLogWriter, DoubleArrayLogEntry, DoubleLogEntry, FloatArrayLogEntry, @@ -24,10 +29,13 @@ __all__ = [ "BooleanArrayLogEntry", "BooleanLogEntry", + "ControlRecordType", "DataLog", + "DataLogBackgroundWriter", "DataLogEntry", "DataLogReader", "DataLogRecord", + "DataLogWriter", "DoubleArrayLogEntry", "DoubleLogEntry", "FloatArrayLogEntry", diff --git a/subprojects/robotpy-wpiutil/pyproject.toml b/subprojects/robotpy-wpiutil/pyproject.toml index 1782ecd7..b8c89d32 100644 --- a/subprojects/robotpy-wpiutil/pyproject.toml +++ b/subprojects/robotpy-wpiutil/pyproject.toml @@ -38,7 +38,7 @@ packages = ["wpiutil"] [tool.semiwrap] update_init = [ "wpiutil", - "wpiutil.log wpiutil._wpiutil.log", + # "wpiutil.log wpiutil._wpiutil.log", "wpiutil.sync wpiutil._wpiutil.sync", "wpiutil.wpistruct wpiutil._wpiutil.wpistruct", ] @@ -65,10 +65,6 @@ depends = ["wpiutil-casters"] [tool.semiwrap.extension_modules."wpiutil._wpiutil".headers] # wpi -DataLog = "wpi/DataLog.h" -DataLogReader = "wpi/DataLogReader.h" -DataLogBackgroundWriter = "wpi/DataLogBackgroundWriter.h" -DataLogWriter = "wpi/DataLogWriter.h" StackTrace = "wpi/StackTrace.h" Synchronization = "wpi/Synchronization.h" RawFrame = "wpi/RawFrame.h" diff --git a/subprojects/robotpy-wpiutil/wpiutil/__init__.py b/subprojects/robotpy-wpiutil/wpiutil/__init__.py index 6dccafed..6f5e8ab4 100644 --- a/subprojects/robotpy-wpiutil/wpiutil/__init__.py +++ b/subprojects/robotpy-wpiutil/wpiutil/__init__.py @@ -2,9 +2,6 @@ # autogenerated by 'semiwrap create-imports wpiutil wpiutil._wpiutil' from ._wpiutil import ( - ControlRecordType, - DataLogBackgroundWriter, - DataLogWriter, Sendable, SendableBuilder, SendableRegistry, @@ -14,9 +11,6 @@ ) __all__ = [ - "ControlRecordType", - "DataLogBackgroundWriter", - "DataLogWriter", "Sendable", "SendableBuilder", "SendableRegistry", From 92ea93d1b47a82667044bd0af05f7fdb34d2c2c2 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sun, 25 May 2025 00:19:17 -0400 Subject: [PATCH 3/9] Fix wpiutil tests --- .../robotpy-wpiutil/tests/cpp/wpiutil_test/sendable_test.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/sendable_test.cpp b/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/sendable_test.cpp index bc3d7cb4..bc15a605 100644 --- a/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/sendable_test.cpp +++ b/subprojects/robotpy-wpiutil/tests/cpp/wpiutil_test/sendable_test.cpp @@ -18,8 +18,6 @@ class MySendableBuilder : public wpi::SendableBuilder { void SetActuator(bool value) override {} - void SetSafeState(std::function func) override {} - void AddBooleanProperty(std::string_view key, std::function getter, std::function setter) override {} From 6b99cb1241aa6395c3bd046a9bdd587fb2a0c007 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sun, 25 May 2025 00:29:55 -0400 Subject: [PATCH 4/9] Update ntcore for 2027 --- subprojects/pyntcore/pyproject.toml | 4 +- .../semiwrap/NetworkTableInstance.yml | 6 +-- subprojects/pyntcore/tests/conftest.py | 47 +++++-------------- .../robotpy-native-ntcore/pyproject.toml | 4 +- 4 files changed, 22 insertions(+), 39 deletions(-) diff --git a/subprojects/pyntcore/pyproject.toml b/subprojects/pyntcore/pyproject.toml index 01761451..179316a0 100644 --- a/subprojects/pyntcore/pyproject.toml +++ b/subprojects/pyntcore/pyproject.toml @@ -8,6 +8,7 @@ requires = [ "robotpy-native-ntcore==2027.0.0a1.dev0", "robotpy-wpiutil==2027.0.0a1.dev0", "robotpy-wpinet==2027.0.0a1.dev0", + "robotpy-wpilog==2027.0.0a1.dev0", ] @@ -23,6 +24,7 @@ dependencies = [ "robotpy-native-ntcore==2027.0.0a1.dev0", "robotpy-wpiutil==2027.0.0a1.dev0", "robotpy-wpinet==2027.0.0a1.dev0", + "robotpy-wpilog==2027.0.0a1.dev0", ] [project.urls] @@ -60,7 +62,7 @@ scan_headers_ignore = [ [tool.semiwrap.extension_modules."ntcore._ntcore"] name = "ntcore" wraps = ["robotpy-native-ntcore"] -depends = ["wpiutil", "wpinet"] +depends = ["wpiutil", "wpinet", "wpilog"] [tool.semiwrap.extension_modules."ntcore._ntcore".headers] diff --git a/subprojects/pyntcore/semiwrap/NetworkTableInstance.yml b/subprojects/pyntcore/semiwrap/NetworkTableInstance.yml index cc3d2919..e5466d95 100644 --- a/subprojects/pyntcore/semiwrap/NetworkTableInstance.yml +++ b/subprojects/pyntcore/semiwrap/NetworkTableInstance.yml @@ -17,7 +17,7 @@ extra_includes: - networktables/Topic.h - src/py2value.h - src/nt_instance.h -- wpi/DataLog.h +- wpi/datalog/DataLog.h - wpystruct.h classes: @@ -120,10 +120,10 @@ classes: StartServer: cpp_code: | [](NetworkTableInstance * self, std::string_view persist_filename, const char* listen_address, - unsigned int port3, unsigned int port4) { + unsigned int port) { pyntcore::onInstanceStart(self); py::gil_scoped_release release; - self->StartServer(persist_filename, listen_address, port3, port4); + self->StartServer(persist_filename, listen_address, port); } StopServer: StartClient3: diff --git a/subprojects/pyntcore/tests/conftest.py b/subprojects/pyntcore/tests/conftest.py index b8395361..d7136a7f 100644 --- a/subprojects/pyntcore/tests/conftest.py +++ b/subprojects/pyntcore/tests/conftest.py @@ -70,11 +70,10 @@ def _init_common(self): # self._wait_init() - def _init_server(self, port3=23232, port4=23233): + def _init_server(self, port=23232): self._init_common() - self.port3 = port3 - self.port4 = port4 + self.port = port def _init_client(self): self._init_common() @@ -122,23 +121,18 @@ def expect_changes(self, count): @pytest.fixture() def nt_server(request, cfg_logging): class NtServer(NtTestBase): - _test_saved_port3 = None - _test_saved_port4 = None + _test_saved_port = None def start_test(self): logger.info("NtServer::start_test") # Restore server port on restart - if self._test_saved_port3 is not None: - self.port3 = self._test_saved_port3 - self.port4 = self._test_saved_port4 + if self._test_saved_port is not None: + self.port = self._test_saved_port - self._impl.startServer( - listen_address="127.0.0.1", port3=self.port3, port4=self.port4 - ) + self._impl.startServer(listen_address="127.0.0.1", port=self.port) - self._test_saved_port3 = self.port3 - self._test_saved_port4 = self.port4 + self._test_saved_port = self.port server = NtServer() server._init_server() @@ -149,26 +143,11 @@ def start_test(self): @pytest.fixture() -def nt_client3(request, nt_server): +def nt_client(request, nt_server): class NtClient(NtTestBase): def start_test(self): - self._impl.startClient3("C3") - self._impl.setServer("127.0.0.1", nt_server.port3) - - client = NtClient() - client._init_client() - try: - yield client - finally: - client.shutdown() - - -@pytest.fixture() -def nt_client4(request, nt_server): - class NtClient(NtTestBase): - def start_test(self): - self._impl.startClient4("C4") - self._impl.setServer("127.0.0.1", nt_server.port4) + self._impl.startClient("C4") + self._impl.setServer("127.0.0.1", nt_server.port) client = NtClient() client._init_client() @@ -177,10 +156,10 @@ def start_test(self): @pytest.fixture -def nt_live(nt_server, nt_client4): +def nt_live(nt_server, nt_client): """This fixture automatically starts the client and server""" nt_server.start_test() - nt_client4.start_test() + nt_client.start_test() - return nt_server, nt_client4 + return nt_server, nt_client diff --git a/subprojects/robotpy-native-ntcore/pyproject.toml b/subprojects/robotpy-native-ntcore/pyproject.toml index d3ec8eac..1650e8c5 100644 --- a/subprojects/robotpy-native-ntcore/pyproject.toml +++ b/subprojects/robotpy-native-ntcore/pyproject.toml @@ -6,6 +6,7 @@ requires = [ "hatch-robotpy~=0.2", "robotpy-native-wpiutil==2027.0.0a1.dev0", "robotpy-native-wpinet==2027.0.0a1.dev0", + "robotpy-native-datalog==2027.0.0a1.dev0", ] [project] @@ -17,6 +18,7 @@ license = "BSD-3-Clause" dependencies = [ "robotpy-native-wpiutil==2027.0.0a1.dev0", "robotpy-native-wpinet==2027.0.0a1.dev0", + "robotpy-native-datalog==2027.0.0a1.dev0", ] [tool.hatch.build.targets.wheel] @@ -38,4 +40,4 @@ name = "ntcore" includedir = "src/native/ntcore/include" libdir = "src/native/ntcore/lib" shared_libraries = ["ntcore"] -requires = ["robotpy-native-wpinet", "robotpy-native-wpiutil"] +requires = ["robotpy-native-datalog", "robotpy-native-wpinet", "robotpy-native-wpiutil"] From 61cc6033db553cd2eefc35639caca7f4dca35747 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sun, 25 May 2025 00:36:20 -0400 Subject: [PATCH 5/9] Update hal for 2027 --- subprojects/robotpy-hal/pyproject.toml | 32 +++------------ .../robotpy-hal/semiwrap/Accelerometer.yml | 13 ------ .../robotpy-hal/semiwrap/AnalogGyro.yml | 18 --------- .../robotpy-hal/semiwrap/AnalogOutput.yml | 11 ----- .../robotpy-hal/semiwrap/AnalogTrigger.yml | 21 ---------- subprojects/robotpy-hal/semiwrap/CAN.yml | 9 +---- subprojects/robotpy-hal/semiwrap/CANAPI.yml | 10 ----- .../robotpy-hal/semiwrap/CANAPITypes.yml | 12 +++++- .../semiwrap/FRCUsageReporting.yml | 11 ----- .../robotpy-hal/semiwrap/Interrupts.yml | 15 ------- subprojects/robotpy-hal/semiwrap/Relay.yml | 11 ----- subprojects/robotpy-hal/semiwrap/SPI.yml | 40 ------------------- subprojects/robotpy-hal/semiwrap/SPITypes.yml | 10 ----- .../robotpy-hal/semiwrap/SerialHelper.yml | 10 ----- .../semiwrap/simulation/AccelerometerData.yml | 34 ---------------- .../semiwrap/simulation/AnalogGyroData.yml | 24 ----------- .../semiwrap/simulation/AnalogOutData.yml | 19 --------- .../semiwrap/simulation/AnalogTriggerData.yml | 32 --------------- .../semiwrap/simulation/PWMData.yml | 7 ++++ .../semiwrap/simulation/RelayData.yml | 29 -------------- .../semiwrap/simulation/RoboRioData.yml | 3 ++ .../simulation/SPIAccelerometerData.yml | 34 ---------------- .../robotpy-native-wpihal/pyproject.toml | 4 +- 23 files changed, 31 insertions(+), 378 deletions(-) delete mode 100644 subprojects/robotpy-hal/semiwrap/Accelerometer.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/AnalogGyro.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/AnalogOutput.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/AnalogTrigger.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/FRCUsageReporting.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/Interrupts.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/Relay.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/SPI.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/SPITypes.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/SerialHelper.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/simulation/AccelerometerData.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/simulation/AnalogGyroData.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/simulation/AnalogOutData.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/simulation/AnalogTriggerData.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/simulation/RelayData.yml delete mode 100644 subprojects/robotpy-hal/semiwrap/simulation/SPIAccelerometerData.yml diff --git a/subprojects/robotpy-hal/pyproject.toml b/subprojects/robotpy-hal/pyproject.toml index 65b5aff8..476babab 100644 --- a/subprojects/robotpy-hal/pyproject.toml +++ b/subprojects/robotpy-hal/pyproject.toml @@ -43,6 +43,7 @@ scan_headers_ignore = [ "hal/DMA.h", "hal/Errors.h", "hal/HAL.h", + "hal/SystemServer.h", "hal/UsageReporting.h", "hal/Types.h", "hal/Value.h", @@ -58,6 +59,8 @@ scan_headers_ignore = [ "hal/handles/LimitedHandleResource.h", "hal/handles/UnlimitedHandleResource.h", + "hal/proto/*", + "hal/roborio/HMB.h", "hal/roborio/InterruptManager.h", @@ -75,23 +78,17 @@ scan_headers_ignore = [ [tool.semiwrap.extension_modules."hal._wpiHal"] name = "wpihal" wraps = ["robotpy-native-wpihal"] -depends = ["wpiutil"] +depends = ["wpiutil", "ntcore"] [tool.semiwrap.extension_modules."hal._wpiHal".headers] # hal -Accelerometer = "hal/Accelerometer.h" AddressableLED = "hal/AddressableLED.h" AddressableLEDTypes = "hal/AddressableLEDTypes.h" -AnalogAccumulator = "hal/AnalogAccumulator.h" -AnalogGyro = "hal/AnalogGyro.h" AnalogInput = "hal/AnalogInput.h" -AnalogOutput = "hal/AnalogOutput.h" -AnalogTrigger = "hal/AnalogTrigger.h" CAN = "hal/CAN.h" CANAPI = "hal/CANAPI.h" CANAPITypes = "hal/CANAPITypes.h" CTREPCM = "hal/CTREPCM.h" -# ChipObject = "hal/ChipObject.h" Constants = "hal/Constants.h" Counter = "hal/Counter.h" DIO = "hal/DIO.h" @@ -102,13 +99,10 @@ DutyCycle = "hal/DutyCycle.h" Encoder = "hal/Encoder.h" # Errors = "hal/Errors.h" Extensions = "hal/Extensions.h" -FRCUsageReporting = "hal/FRCUsageReporting.h" # HAL = "hal/HAL.h" HALBase = "hal/HALBase.h" I2C = "hal/I2C.h" I2CTypes = "hal/I2CTypes.h" -Interrupts = "hal/Interrupts.h" -LEDs = "hal/LEDs.h" Main = "hal/Main.h" Notifier = "hal/Notifier.h" PWM = "hal/PWM.h" @@ -116,9 +110,6 @@ Ports = "hal/Ports.h" Power = "hal/Power.h" PowerDistribution = "hal/PowerDistribution.h" REVPH = "hal/REVPH.h" -Relay = "hal/Relay.h" -SPI = "hal/SPI.h" -SPITypes = "hal/SPITypes.h" SerialPort = "hal/SerialPort.h" SimDevice = "hal/SimDevice.h" Threads = "hal/Threads.h" @@ -126,8 +117,6 @@ Threads = "hal/Threads.h" # Value = "hal/Value.h" # hal/cpp -SerialHelper = { header="hal/cpp/SerialHelper.h", enable_if="platform_machine == 'roborio'" } -# UnsafeDIO = "hal/cpp/UnsafeDIO.h" # fpga_clock = "hal/cpp/fpga_clock.h" # hal/handles @@ -139,24 +128,16 @@ HandlesInternal = "hal/handles/HandlesInternal.h" # LimitedHandleResource = "hal/handles/LimitedHandleResource.h" # UnlimitedHandleResource = "hal/handles/UnlimitedHandleResource.h" -# hal/roborio -# HMB = "hal/roborio/HMB.h" -# InterruptManager = "hal/roborio/InterruptManager.h" - [tool.semiwrap.extension_modules."hal.simulation._simulation"] name = "hal_simulation" wraps = ["robotpy-native-wpihal"] -depends = ["wpiutil"] +depends = ["wpiutil", "ntcore"] yaml_path = "semiwrap/simulation" [tool.semiwrap.extension_modules."hal.simulation._simulation".headers] -AccelerometerData = "hal/simulation/AccelerometerData.h" AddressableLEDData = "hal/simulation/AddressableLEDData.h" -AnalogGyroData = "hal/simulation/AnalogGyroData.h" AnalogInData = "hal/simulation/AnalogInData.h" -AnalogOutData = "hal/simulation/AnalogOutData.h" -AnalogTriggerData = "hal/simulation/AnalogTriggerData.h" CTREPCMData = "hal/simulation/CTREPCMData.h" # CanData = "hal/simulation/CanData.h" DIOData = "hal/simulation/DIOData.h" @@ -171,11 +152,8 @@ NotifierData = "hal/simulation/NotifierData.h" PWMData = "hal/simulation/PWMData.h" PowerDistributionData = "hal/simulation/PowerDistributionData.h" REVPHData = "hal/simulation/REVPHData.h" -RelayData = "hal/simulation/RelayData.h" Reset = "hal/simulation/Reset.h" RoboRioData = "hal/simulation/RoboRioData.h" -SPIAccelerometerData = "hal/simulation/SPIAccelerometerData.h" -# SPIData = "hal/simulation/SPIData.h" # SimCallbackRegistry = "hal/simulation/SimCallbackRegistry.h" # SimDataValue = "hal/simulation/SimDataValue.h" SimDeviceData = "hal/simulation/SimDeviceData.h" diff --git a/subprojects/robotpy-hal/semiwrap/Accelerometer.yml b/subprojects/robotpy-hal/semiwrap/Accelerometer.yml deleted file mode 100644 index 1e165334..00000000 --- a/subprojects/robotpy-hal/semiwrap/Accelerometer.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- - -strip_prefixes: -- HAL_ - -enums: - HAL_AccelerometerRange: -functions: - HAL_SetAccelerometerActive: - HAL_SetAccelerometerRange: - HAL_GetAccelerometerX: - HAL_GetAccelerometerY: - HAL_GetAccelerometerZ: diff --git a/subprojects/robotpy-hal/semiwrap/AnalogGyro.yml b/subprojects/robotpy-hal/semiwrap/AnalogGyro.yml deleted file mode 100644 index 0e4a14b6..00000000 --- a/subprojects/robotpy-hal/semiwrap/AnalogGyro.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- - -strip_prefixes: -- HAL_ - -functions: - HAL_InitializeAnalogGyro: - HAL_SetupAnalogGyro: - HAL_FreeAnalogGyro: - HAL_SetAnalogGyroParameters: - HAL_SetAnalogGyroVoltsPerDegreePerSecond: - HAL_ResetAnalogGyro: - HAL_CalibrateAnalogGyro: - HAL_SetAnalogGyroDeadband: - HAL_GetAnalogGyroAngle: - HAL_GetAnalogGyroRate: - HAL_GetAnalogGyroOffset: - HAL_GetAnalogGyroCenter: diff --git a/subprojects/robotpy-hal/semiwrap/AnalogOutput.yml b/subprojects/robotpy-hal/semiwrap/AnalogOutput.yml deleted file mode 100644 index 2398d5ae..00000000 --- a/subprojects/robotpy-hal/semiwrap/AnalogOutput.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -strip_prefixes: -- HAL_ - -functions: - HAL_InitializeAnalogOutputPort: - HAL_FreeAnalogOutputPort: - HAL_SetAnalogOutput: - HAL_GetAnalogOutput: - HAL_CheckAnalogOutputChannel: diff --git a/subprojects/robotpy-hal/semiwrap/AnalogTrigger.yml b/subprojects/robotpy-hal/semiwrap/AnalogTrigger.yml deleted file mode 100644 index 5788718a..00000000 --- a/subprojects/robotpy-hal/semiwrap/AnalogTrigger.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -strip_prefixes: -- HAL_ - -enums: - HAL_AnalogTriggerType: - value_prefix: HAL_Trigger -functions: - HAL_InitializeAnalogTrigger: - HAL_InitializeAnalogTriggerDutyCycle: - HAL_CleanAnalogTrigger: - HAL_SetAnalogTriggerLimitsRaw: - HAL_SetAnalogTriggerLimitsVoltage: - HAL_SetAnalogTriggerLimitsDutyCycle: - HAL_SetAnalogTriggerAveraged: - HAL_SetAnalogTriggerFiltered: - HAL_GetAnalogTriggerInWindow: - HAL_GetAnalogTriggerTriggerState: - HAL_GetAnalogTriggerOutput: - HAL_GetAnalogTriggerFPGAIndex: diff --git a/subprojects/robotpy-hal/semiwrap/CAN.yml b/subprojects/robotpy-hal/semiwrap/CAN.yml index bb1414ff..fc5cbaf2 100644 --- a/subprojects/robotpy-hal/semiwrap/CAN.yml +++ b/subprojects/robotpy-hal/semiwrap/CAN.yml @@ -5,11 +5,7 @@ strip_prefixes: functions: HAL_CAN_SendMessage: - buffers: - - { type: IN, src: data, len: dataSize } HAL_CAN_ReceiveMessage: - buffers: - - { type: OUT, src: data, len: dataSize, minsz: 8 } HAL_CAN_OpenStreamSession: HAL_CAN_CloseStreamSession: HAL_CAN_ReadStreamSession: @@ -18,7 +14,6 @@ functions: classes: HAL_CANStreamMessage: attributes: - messageID: + messageId: timeStamp: - data: - dataSize: + message: diff --git a/subprojects/robotpy-hal/semiwrap/CANAPI.yml b/subprojects/robotpy-hal/semiwrap/CANAPI.yml index 3d4954f9..1d57c275 100644 --- a/subprojects/robotpy-hal/semiwrap/CANAPI.yml +++ b/subprojects/robotpy-hal/semiwrap/CANAPI.yml @@ -8,19 +8,9 @@ functions: HAL_InitializeCAN: HAL_CleanCAN: HAL_WriteCANPacket: - buffers: - - { type: IN, src: data, len: length } HAL_WriteCANPacketRepeating: - buffers: - - { type: IN, src: data, len: length } HAL_WriteCANRTRFrame: HAL_StopCANPacketRepeating: HAL_ReadCANPacketNew: - buffers: - - { type: OUT, src: data, len: length, minsz: 8 } HAL_ReadCANPacketLatest: - buffers: - - { type: OUT, src: data, len: length, minsz: 8 } HAL_ReadCANPacketTimeout: - buffers: - - { type: OUT, src: data, len: length, minsz: 8 } diff --git a/subprojects/robotpy-hal/semiwrap/CANAPITypes.yml b/subprojects/robotpy-hal/semiwrap/CANAPITypes.yml index 1707e78c..1cb6526c 100644 --- a/subprojects/robotpy-hal/semiwrap/CANAPITypes.yml +++ b/subprojects/robotpy-hal/semiwrap/CANAPITypes.yml @@ -7,4 +7,14 @@ enums: HAL_CANDeviceType: value_prefix: HAL_CAN_Dev HAL_CANManufacturer: - value_prefix: HAL_CAN_Man \ No newline at end of file + value_prefix: HAL_CAN_Man +classes: + HAL_CANMessage: + attributes: + flags: + dataSize: + data: + HAL_CANReceiveMessage: + attributes: + timeStamp: + message: \ No newline at end of file diff --git a/subprojects/robotpy-hal/semiwrap/FRCUsageReporting.yml b/subprojects/robotpy-hal/semiwrap/FRCUsageReporting.yml deleted file mode 100644 index ff25d15b..00000000 --- a/subprojects/robotpy-hal/semiwrap/FRCUsageReporting.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -strip_prefixes: -- HAL_ - -functions: - HAL_Report: - -enums: - tResourceType: - tInstances: diff --git a/subprojects/robotpy-hal/semiwrap/Interrupts.yml b/subprojects/robotpy-hal/semiwrap/Interrupts.yml deleted file mode 100644 index b219cb17..00000000 --- a/subprojects/robotpy-hal/semiwrap/Interrupts.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- - -strip_prefixes: -- HAL_ - -functions: - HAL_InitializeInterrupts: - HAL_CleanInterrupts: - HAL_WaitForInterrupt: - HAL_WaitForMultipleInterrupts: - HAL_ReadInterruptRisingTimestamp: - HAL_ReadInterruptFallingTimestamp: - HAL_RequestInterrupts: - HAL_SetInterruptUpSourceEdge: - HAL_ReleaseWaitingInterrupt: diff --git a/subprojects/robotpy-hal/semiwrap/Relay.yml b/subprojects/robotpy-hal/semiwrap/Relay.yml deleted file mode 100644 index 284ba37f..00000000 --- a/subprojects/robotpy-hal/semiwrap/Relay.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -strip_prefixes: -- HAL_ - -functions: - HAL_InitializeRelayPort: - HAL_FreeRelayPort: - HAL_CheckRelayChannel: - HAL_SetRelay: - HAL_GetRelay: diff --git a/subprojects/robotpy-hal/semiwrap/SPI.yml b/subprojects/robotpy-hal/semiwrap/SPI.yml deleted file mode 100644 index 020f8366..00000000 --- a/subprojects/robotpy-hal/semiwrap/SPI.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- - -strip_prefixes: -- HAL_ - -functions: - HAL_InitializeSPI: - HAL_TransactionSPI: - buffers: - - { type: IN, src: dataToSend, len: size } - - { type: OUT, src: dataReceived, len: size } - # TODO: dataToSend buffer must be at least as long as dataReceived buffer - HAL_WriteSPI: - buffers: - - { type: IN, src: dataToSend, len: sendSize } - HAL_ReadSPI: - buffers: - - { type: OUT, src: buffer, len: count } - HAL_CloseSPI: - HAL_SetSPISpeed: - HAL_SetSPIMode: - HAL_GetSPIMode: - HAL_SetSPIChipSelectActiveHigh: - HAL_SetSPIChipSelectActiveLow: - HAL_GetSPIHandle: - HAL_SetSPIHandle: - HAL_InitSPIAuto: - HAL_FreeSPIAuto: - HAL_StartSPIAutoRate: - HAL_StartSPIAutoTrigger: - HAL_StopSPIAuto: - HAL_SetSPIAutoTransmitData: - buffers: - - { type: IN, src: dataToSend, len: dataSize } - HAL_ForceSPIAutoRead: - HAL_ReadSPIAutoReceivedData: - buffers: - - { type: OUT, src: buffer, len: numToRead } - HAL_GetSPIAutoDroppedCount: - HAL_ConfigureSPIAutoStall: diff --git a/subprojects/robotpy-hal/semiwrap/SPITypes.yml b/subprojects/robotpy-hal/semiwrap/SPITypes.yml deleted file mode 100644 index 324af6e8..00000000 --- a/subprojects/robotpy-hal/semiwrap/SPITypes.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -strip_prefixes: -- HAL_ - -enums: - HAL_SPIPort: - value_prefix: HAL_SPI - HAL_SPIMode: - value_prefix: HAL_SPI diff --git a/subprojects/robotpy-hal/semiwrap/SerialHelper.yml b/subprojects/robotpy-hal/semiwrap/SerialHelper.yml deleted file mode 100644 index 14bad971..00000000 --- a/subprojects/robotpy-hal/semiwrap/SerialHelper.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -classes: - hal::SerialHelper: - methods: - SerialHelper: - GetVISASerialPortName: - GetOSSerialPortName: - GetVISASerialPortList: - GetOSSerialPortList: diff --git a/subprojects/robotpy-hal/semiwrap/simulation/AccelerometerData.yml b/subprojects/robotpy-hal/semiwrap/simulation/AccelerometerData.yml deleted file mode 100644 index 17d84c62..00000000 --- a/subprojects/robotpy-hal/semiwrap/simulation/AccelerometerData.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- - -strip_prefixes: -- HALSIM_ - -functions: - HALSIM_ResetAccelerometerData: - HALSIM_RegisterAccelerometerActiveCallback: - ignore: true - HALSIM_CancelAccelerometerActiveCallback: - HALSIM_GetAccelerometerActive: - HALSIM_SetAccelerometerActive: - HALSIM_RegisterAccelerometerRangeCallback: - ignore: true - HALSIM_CancelAccelerometerRangeCallback: - HALSIM_GetAccelerometerRange: - HALSIM_SetAccelerometerRange: - HALSIM_RegisterAccelerometerXCallback: - ignore: true - HALSIM_CancelAccelerometerXCallback: - HALSIM_GetAccelerometerX: - HALSIM_SetAccelerometerX: - HALSIM_RegisterAccelerometerYCallback: - ignore: true - HALSIM_CancelAccelerometerYCallback: - HALSIM_GetAccelerometerY: - HALSIM_SetAccelerometerY: - HALSIM_RegisterAccelerometerZCallback: - ignore: true - HALSIM_CancelAccelerometerZCallback: - HALSIM_GetAccelerometerZ: - HALSIM_SetAccelerometerZ: - HALSIM_RegisterAccelerometerAllCallbacks: - ignore: true diff --git a/subprojects/robotpy-hal/semiwrap/simulation/AnalogGyroData.yml b/subprojects/robotpy-hal/semiwrap/simulation/AnalogGyroData.yml deleted file mode 100644 index 84240c5d..00000000 --- a/subprojects/robotpy-hal/semiwrap/simulation/AnalogGyroData.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- - -strip_prefixes: -- HALSIM_ - -functions: - HALSIM_ResetAnalogGyroData: - HALSIM_RegisterAnalogGyroAngleCallback: - ignore: true - HALSIM_CancelAnalogGyroAngleCallback: - HALSIM_GetAnalogGyroAngle: - HALSIM_SetAnalogGyroAngle: - HALSIM_RegisterAnalogGyroRateCallback: - ignore: true - HALSIM_CancelAnalogGyroRateCallback: - HALSIM_GetAnalogGyroRate: - HALSIM_SetAnalogGyroRate: - HALSIM_RegisterAnalogGyroInitializedCallback: - ignore: true - HALSIM_CancelAnalogGyroInitializedCallback: - HALSIM_GetAnalogGyroInitialized: - HALSIM_SetAnalogGyroInitialized: - HALSIM_RegisterAnalogGyroAllCallbacks: - ignore: true diff --git a/subprojects/robotpy-hal/semiwrap/simulation/AnalogOutData.yml b/subprojects/robotpy-hal/semiwrap/simulation/AnalogOutData.yml deleted file mode 100644 index 7108ad46..00000000 --- a/subprojects/robotpy-hal/semiwrap/simulation/AnalogOutData.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- - -strip_prefixes: -- HALSIM_ - -functions: - HALSIM_ResetAnalogOutData: - HALSIM_RegisterAnalogOutVoltageCallback: - ignore: true - HALSIM_CancelAnalogOutVoltageCallback: - HALSIM_GetAnalogOutVoltage: - HALSIM_SetAnalogOutVoltage: - HALSIM_RegisterAnalogOutInitializedCallback: - ignore: true - HALSIM_CancelAnalogOutInitializedCallback: - HALSIM_GetAnalogOutInitialized: - HALSIM_SetAnalogOutInitialized: - HALSIM_RegisterAnalogOutAllCallbacks: - ignore: true diff --git a/subprojects/robotpy-hal/semiwrap/simulation/AnalogTriggerData.yml b/subprojects/robotpy-hal/semiwrap/simulation/AnalogTriggerData.yml deleted file mode 100644 index 3d484ba7..00000000 --- a/subprojects/robotpy-hal/semiwrap/simulation/AnalogTriggerData.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- - -strip_prefixes: -- HALSIM_ - -enums: - HALSIM_AnalogTriggerMode: -functions: - HALSIM_FindAnalogTriggerForChannel: - HALSIM_ResetAnalogTriggerData: - HALSIM_RegisterAnalogTriggerInitializedCallback: - ignore: true - HALSIM_CancelAnalogTriggerInitializedCallback: - HALSIM_GetAnalogTriggerInitialized: - HALSIM_SetAnalogTriggerInitialized: - HALSIM_RegisterAnalogTriggerTriggerLowerBoundCallback: - ignore: true - HALSIM_CancelAnalogTriggerTriggerLowerBoundCallback: - HALSIM_GetAnalogTriggerTriggerLowerBound: - HALSIM_SetAnalogTriggerTriggerLowerBound: - HALSIM_RegisterAnalogTriggerTriggerUpperBoundCallback: - ignore: true - HALSIM_CancelAnalogTriggerTriggerUpperBoundCallback: - HALSIM_GetAnalogTriggerTriggerUpperBound: - HALSIM_SetAnalogTriggerTriggerUpperBound: - HALSIM_RegisterAnalogTriggerTriggerModeCallback: - ignore: true - HALSIM_CancelAnalogTriggerTriggerModeCallback: - HALSIM_GetAnalogTriggerTriggerMode: - HALSIM_SetAnalogTriggerTriggerMode: - HALSIM_RegisterAnalogTriggerAllCallbacks: - ignore: true diff --git a/subprojects/robotpy-hal/semiwrap/simulation/PWMData.yml b/subprojects/robotpy-hal/semiwrap/simulation/PWMData.yml index 39b93484..ececdb02 100644 --- a/subprojects/robotpy-hal/semiwrap/simulation/PWMData.yml +++ b/subprojects/robotpy-hal/semiwrap/simulation/PWMData.yml @@ -43,3 +43,10 @@ functions: HALSIM_SetPWMZeroLatch: HALSIM_RegisterPWMAllCallbacks: ignore: true + HALSIM_GetPWMSimDevice: + HALSIM_RegisterPWMOutputPeriodCallback: + ignore: true + HALSIM_CancelPWMOutputPeriodCallback: + ignore: true + HALSIM_GetPWMOutputPeriod: + HALSIM_SetPWMOutputPeriod: \ No newline at end of file diff --git a/subprojects/robotpy-hal/semiwrap/simulation/RelayData.yml b/subprojects/robotpy-hal/semiwrap/simulation/RelayData.yml deleted file mode 100644 index 28b5bab0..00000000 --- a/subprojects/robotpy-hal/semiwrap/simulation/RelayData.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -strip_prefixes: -- HALSIM_ - -functions: - HALSIM_ResetRelayData: - HALSIM_RegisterRelayInitializedForwardCallback: - ignore: true - HALSIM_CancelRelayInitializedForwardCallback: - HALSIM_GetRelayInitializedForward: - HALSIM_SetRelayInitializedForward: - HALSIM_RegisterRelayInitializedReverseCallback: - ignore: true - HALSIM_CancelRelayInitializedReverseCallback: - HALSIM_GetRelayInitializedReverse: - HALSIM_SetRelayInitializedReverse: - HALSIM_RegisterRelayForwardCallback: - ignore: true - HALSIM_CancelRelayForwardCallback: - HALSIM_GetRelayForward: - HALSIM_SetRelayForward: - HALSIM_RegisterRelayReverseCallback: - ignore: true - HALSIM_CancelRelayReverseCallback: - HALSIM_GetRelayReverse: - HALSIM_SetRelayReverse: - HALSIM_RegisterRelayAllCallbacks: - ignore: true diff --git a/subprojects/robotpy-hal/semiwrap/simulation/RoboRioData.yml b/subprojects/robotpy-hal/semiwrap/simulation/RoboRioData.yml index f89de89f..724d515a 100644 --- a/subprojects/robotpy-hal/semiwrap/simulation/RoboRioData.yml +++ b/subprojects/robotpy-hal/semiwrap/simulation/RoboRioData.yml @@ -8,8 +8,11 @@ functions: HALSIM_RegisterRoboRioFPGAButtonCallback: ignore: true HALSIM_CancelRoboRioFPGAButtonCallback: + ignore: true HALSIM_GetRoboRioFPGAButton: + ignore: true HALSIM_SetRoboRioFPGAButton: + ignore: true HALSIM_RegisterRoboRioVInVoltageCallback: ignore: true HALSIM_CancelRoboRioVInVoltageCallback: diff --git a/subprojects/robotpy-hal/semiwrap/simulation/SPIAccelerometerData.yml b/subprojects/robotpy-hal/semiwrap/simulation/SPIAccelerometerData.yml deleted file mode 100644 index 00381b52..00000000 --- a/subprojects/robotpy-hal/semiwrap/simulation/SPIAccelerometerData.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- - -strip_prefixes: -- HALSIM_ - -functions: - HALSIM_ResetSPIAccelerometerData: - HALSIM_RegisterSPIAccelerometerActiveCallback: - ignore: true - HALSIM_CancelSPIAccelerometerActiveCallback: - HALSIM_GetSPIAccelerometerActive: - HALSIM_SetSPIAccelerometerActive: - HALSIM_RegisterSPIAccelerometerRangeCallback: - ignore: true - HALSIM_CancelSPIAccelerometerRangeCallback: - HALSIM_GetSPIAccelerometerRange: - HALSIM_SetSPIAccelerometerRange: - HALSIM_RegisterSPIAccelerometerXCallback: - ignore: true - HALSIM_CancelSPIAccelerometerXCallback: - HALSIM_GetSPIAccelerometerX: - HALSIM_SetSPIAccelerometerX: - HALSIM_RegisterSPIAccelerometerYCallback: - ignore: true - HALSIM_CancelSPIAccelerometerYCallback: - HALSIM_GetSPIAccelerometerY: - HALSIM_SetSPIAccelerometerY: - HALSIM_RegisterSPIAccelerometerZCallback: - ignore: true - HALSIM_CancelSPIAccelerometerZCallback: - HALSIM_GetSPIAccelerometerZ: - HALSIM_SetSPIAccelerometerZ: - HALSIM_RegisterSPIAccelerometerAllCallbacks: - ignore: true \ No newline at end of file diff --git a/subprojects/robotpy-native-wpihal/pyproject.toml b/subprojects/robotpy-native-wpihal/pyproject.toml index 0335c79c..64ffe135 100644 --- a/subprojects/robotpy-native-wpihal/pyproject.toml +++ b/subprojects/robotpy-native-wpihal/pyproject.toml @@ -5,6 +5,7 @@ requires = [ "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2", "robotpy-native-wpiutil==2027.0.0a1.dev0", + "robotpy-native-ntcore==2027.0.0a1.dev0", ] [project] @@ -15,6 +16,7 @@ license = "BSD-3-Clause" dependencies = [ "robotpy-native-wpiutil==2027.0.0a1.dev0", + "robotpy-native-ntcore==2027.0.0a1.dev0", ] [tool.hatch.build.targets.wheel] @@ -36,4 +38,4 @@ name = "wpihal" includedir = "src/native/wpihal/include" libdir = "src/native/wpihal/lib" shared_libraries = ["wpiHal"] -requires = ["robotpy-native-wpiutil"] +requires = ["robotpy-native-wpiutil", "robotpy-native-ntcore"] From c219f6192ec4a3d8122bf92f738576f43dfee38a Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sun, 25 May 2025 00:54:24 -0400 Subject: [PATCH 6/9] Update wpimath for 2027 --- subprojects/robotpy-wpimath/pyproject.toml | 2 -- .../semiwrap/controls/RamseteController.yml | 22 ------------------- .../semiwrap/controls/TrajectoryUtil.yml | 8 ------- .../semiwrap/kinematics/ChassisSpeeds.yml | 8 ------- .../tests/kinematics/test_chassis_speeds.py | 20 ----------------- .../wpimath/controller/__init__.py | 2 -- .../wpimath/trajectory/__init__.py | 2 -- 7 files changed, 64 deletions(-) delete mode 100644 subprojects/robotpy-wpimath/semiwrap/controls/RamseteController.yml delete mode 100644 subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryUtil.yml diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml index 9c15f919..e2f987e9 100644 --- a/subprojects/robotpy-wpimath/pyproject.toml +++ b/subprojects/robotpy-wpimath/pyproject.toml @@ -1577,7 +1577,6 @@ LinearPlantInversionFeedforward = "frc/controller/LinearPlantInversionFeedforwar LinearQuadraticRegulator = "frc/controller/LinearQuadraticRegulator.h" PIDController = "frc/controller/PIDController.h" ProfiledPIDController = "frc/controller/ProfiledPIDController.h" -RamseteController = "frc/controller/RamseteController.h" SimpleMotorFeedforward = "frc/controller/SimpleMotorFeedforward.h" # frc/estimator @@ -1620,7 +1619,6 @@ Trajectory = "frc/trajectory/Trajectory.h" TrajectoryConfig = "frc/trajectory/TrajectoryConfig.h" TrajectoryGenerator = "frc/trajectory/TrajectoryGenerator.h" TrajectoryParameterizer = "frc/trajectory/TrajectoryParameterizer.h" -TrajectoryUtil = "frc/trajectory/TrajectoryUtil.h" TrapezoidProfile = "frc/trajectory/TrapezoidProfile.h" # frc/trajectory/constraint diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/RamseteController.yml b/subprojects/robotpy-wpimath/semiwrap/controls/RamseteController.yml deleted file mode 100644 index 69d1f3d9..00000000 --- a/subprojects/robotpy-wpimath/semiwrap/controls/RamseteController.yml +++ /dev/null @@ -1,22 +0,0 @@ - -classes: - frc::RamseteController: - subpackage: controller - methods: - RamseteController: - overloads: - units::unit_t, units::unit_t: - cpp_code: | - [](double b, double zeta) { - return std::make_shared( - units::unit_t{b}, - units::unit_t{zeta}); - } - '': - AtReference: - SetTolerance: - Calculate: - overloads: - const Pose2d&, const Pose2d&, units::meters_per_second_t, units::radians_per_second_t: - const Pose2d&, const Trajectory::State&: - SetEnabled: diff --git a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryUtil.yml b/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryUtil.yml deleted file mode 100644 index 063b37a0..00000000 --- a/subprojects/robotpy-wpimath/semiwrap/controls/TrajectoryUtil.yml +++ /dev/null @@ -1,8 +0,0 @@ -classes: - frc::TrajectoryUtil: - subpackage: trajectory - methods: - ToPathweaverJson: - FromPathweaverJson: - SerializeTrajectory: - DeserializeTrajectory: diff --git a/subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml b/subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml index 4d94b3e1..687f7d3d 100644 --- a/subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml +++ b/subprojects/robotpy-wpimath/semiwrap/kinematics/ChassisSpeeds.yml @@ -14,14 +14,6 @@ classes: overloads: units::meters_per_second_t, units::meters_per_second_t, units::radians_per_second_t, units::second_t: const ChassisSpeeds&, units::second_t: - FromFieldRelativeSpeeds: - overloads: - units::meters_per_second_t, units::meters_per_second_t, units::radians_per_second_t, const Rotation2d&: - const ChassisSpeeds&, const Rotation2d&: - FromRobotRelativeSpeeds: - overloads: - units::meters_per_second_t, units::meters_per_second_t, units::radians_per_second_t, const Rotation2d&: - const ChassisSpeeds&, const Rotation2d&: operator+: operator-: overloads: diff --git a/subprojects/robotpy-wpimath/tests/kinematics/test_chassis_speeds.py b/subprojects/robotpy-wpimath/tests/kinematics/test_chassis_speeds.py index fb5bad83..3b5fb190 100644 --- a/subprojects/robotpy-wpimath/tests/kinematics/test_chassis_speeds.py +++ b/subprojects/robotpy-wpimath/tests/kinematics/test_chassis_speeds.py @@ -4,26 +4,6 @@ from wpimath.kinematics import ChassisSpeeds -def test_fromFieldRelativeSpeeds() -> None: - chassisSpeeds = ChassisSpeeds.fromFieldRelativeSpeeds( - vx=1.0, vy=0.0, omega=0.5, robotAngle=Rotation2d.fromDegrees(-90) - ) - - assert math.isclose(0.0, chassisSpeeds.vx, abs_tol=1e-9) - assert math.isclose(1.0, chassisSpeeds.vy) - assert math.isclose(0.5, chassisSpeeds.omega) - - -def test_fromRobotRelativeSpeeds() -> None: - chassisSpeeds = ChassisSpeeds.fromRobotRelativeSpeeds( - vx=1.0, vy=0.0, omega=0.5, robotAngle=Rotation2d.fromDegrees(45) - ) - - assert math.isclose(1.0 / math.sqrt(2), chassisSpeeds.vx) - assert math.isclose(1.0 / math.sqrt(2), chassisSpeeds.vy) - assert math.isclose(0.5, chassisSpeeds.omega) - - def test_plus() -> None: left = ChassisSpeeds(vx=1.0, vy=0.5, omega=0.75) right = ChassisSpeeds(vx=2.0, vy=1.5, omega=0.25) diff --git a/subprojects/robotpy-wpimath/wpimath/controller/__init__.py b/subprojects/robotpy-wpimath/wpimath/controller/__init__.py index 4fe1fcdc..53070f02 100644 --- a/subprojects/robotpy-wpimath/wpimath/controller/__init__.py +++ b/subprojects/robotpy-wpimath/wpimath/controller/__init__.py @@ -25,7 +25,6 @@ PIDController, ProfiledPIDController, ProfiledPIDControllerRadians, - RamseteController, SimpleMotorFeedforwardMeters, SimpleMotorFeedforwardRadians, ) @@ -56,7 +55,6 @@ "PIDController", "ProfiledPIDController", "ProfiledPIDControllerRadians", - "RamseteController", "SimpleMotorFeedforwardMeters", "SimpleMotorFeedforwardRadians", ] diff --git a/subprojects/robotpy-wpimath/wpimath/trajectory/__init__.py b/subprojects/robotpy-wpimath/wpimath/trajectory/__init__.py index 944b9d11..6a0916bb 100644 --- a/subprojects/robotpy-wpimath/wpimath/trajectory/__init__.py +++ b/subprojects/robotpy-wpimath/wpimath/trajectory/__init__.py @@ -5,7 +5,6 @@ TrajectoryConfig, TrajectoryGenerator, TrajectoryParameterizer, - TrajectoryUtil, TrapezoidProfile, TrapezoidProfileRadians, ) @@ -16,7 +15,6 @@ "TrajectoryConfig", "TrajectoryGenerator", "TrajectoryParameterizer", - "TrajectoryUtil", "TrapezoidProfile", "TrapezoidProfileRadians", ] From c1ee7a5dadb6c6b3aaa0f07952c10cb4052f350d Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sun, 25 May 2025 00:58:05 -0400 Subject: [PATCH 7/9] Update cscore for 2027 --- subprojects/robotpy-cscore/meson.build | 2 +- subprojects/robotpy-cscore/pyproject.toml | 6 +++--- subprojects/robotpy-cscore/semiwrap/CameraServer.yml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/subprojects/robotpy-cscore/meson.build b/subprojects/robotpy-cscore/meson.build index ddf089e1..3eab4beb 100644 --- a/subprojects/robotpy-cscore/meson.build +++ b/subprojects/robotpy-cscore/meson.build @@ -18,7 +18,7 @@ cpp = meson.get_compiler('cpp') libs_path = meson.current_source_dir() + '/lib/lib' cscore_deps += [ - cpp.find_library('opencv480', dirs: libs_path), + cpp.find_library('opencv4100', dirs: libs_path), cpp.find_library('cscore', dirs: libs_path), cpp.find_library('cameraserver', dirs: libs_path), ] diff --git a/subprojects/robotpy-cscore/pyproject.toml b/subprojects/robotpy-cscore/pyproject.toml index 300b7759..d2b70008 100644 --- a/subprojects/robotpy-cscore/pyproject.toml +++ b/subprojects/robotpy-cscore/pyproject.toml @@ -60,11 +60,11 @@ extract_to = "lib" [[tool.hatch.build.hooks.robotpy.maven_lib_download]] artifact_id = "opencv-cpp" -group_id = "edu.wpi.first.thirdparty.frc2024.opencv" +group_id = "edu.wpi.first.thirdparty.frc2025.opencv" repo_url = "https://frcmaven.wpi.edu/artifactory/release" -version = "4.8.0-1" +version = "4.10.0-3" -staticlibs = ["opencv480"] +staticlibs = ["opencv4100"] extract_to = "lib" diff --git a/subprojects/robotpy-cscore/semiwrap/CameraServer.yml b/subprojects/robotpy-cscore/semiwrap/CameraServer.yml index ad06074b..5da9f0f9 100644 --- a/subprojects/robotpy-cscore/semiwrap/CameraServer.yml +++ b/subprojects/robotpy-cscore/semiwrap/CameraServer.yml @@ -4,6 +4,8 @@ extra_includes: classes: frc::CameraServer: + force_type_casters: + - std::optional attributes: kBasePort: kSize640x480: From e11f707dc2b9cce182ff1d67b6d886cbd7d9e4e2 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sun, 25 May 2025 01:31:55 -0400 Subject: [PATCH 8/9] Update wpilib for 2027 --- subprojects/robotpy-wpilib/meson.build | 5 - subprojects/robotpy-wpilib/pyproject.toml | 83 +-------- .../robotpy-wpilib/semiwrap/ADIS16448_IMU.yml | 45 ----- .../robotpy-wpilib/semiwrap/ADIS16470_IMU.yml | 44 ----- .../robotpy-wpilib/semiwrap/ADXL345_SPI.yml | 40 ----- .../robotpy-wpilib/semiwrap/ADXL362.yml | 31 ---- .../robotpy-wpilib/semiwrap/ADXRS450_Gyro.yml | 21 --- .../robotpy-wpilib/semiwrap/AnalogInput.yml | 2 - .../robotpy-wpilib/semiwrap/AnalogOutput.yml | 23 --- .../robotpy-wpilib/semiwrap/AnalogTrigger.yml | 37 ---- .../semiwrap/AnalogTriggerOutput.yml | 18 -- .../semiwrap/AnalogTriggerType.yml | 3 - .../semiwrap/BuiltInAccelerometer.yml | 19 -- subprojects/robotpy-wpilib/semiwrap/CAN.yml | 13 -- .../robotpy-wpilib/semiwrap/Counter.yml | 79 --------- subprojects/robotpy-wpilib/semiwrap/DMA.yml | 26 --- .../robotpy-wpilib/semiwrap/DMASample.yml | 19 -- .../semiwrap/DataLogManager.yml | 2 +- .../semiwrap/DigitalGlitchFilter.yml | 26 --- .../robotpy-wpilib/semiwrap/DigitalInput.yml | 1 - .../robotpy-wpilib/semiwrap/DigitalSource.yml | 16 -- .../robotpy-wpilib/semiwrap/DriverStation.yml | 2 +- .../robotpy-wpilib/semiwrap/DutyCycle.yml | 4 - .../semiwrap/DutyCycleEncoder.yml | 1 - .../robotpy-wpilib/semiwrap/Encoder.yml | 4 - .../robotpy-wpilib/semiwrap/Koors40.yml | 6 + .../robotpy-wpilib/semiwrap/LiveWindow.yml | 31 ---- .../semiwrap/NidecBrushless.yml | 22 --- .../semiwrap/PWMMotorController.yml | 1 - subprojects/robotpy-wpilib/semiwrap/Relay.yml | 28 --- subprojects/robotpy-wpilib/semiwrap/SPI.yml | 80 --------- subprojects/robotpy-wpilib/semiwrap/Servo.yml | 2 + .../robotpy-wpilib/semiwrap/SparkMini.yml | 6 + .../semiwrap/SynchronousInterrupt.yml | 19 -- .../robotpy-wpilib/semiwrap/SystemServer.yml | 6 + .../robotpy-wpilib/semiwrap/Ultrasonic.yml | 38 ---- .../counter/ExternalDirectionCounter.yml | 17 -- .../semiwrap/counter/Tachometer.yml | 2 - .../semiwrap/counter/UpDownCounter.yml | 3 - .../semiwrap/shuffleboard/BuiltInLayouts.yml | 3 - .../semiwrap/shuffleboard/BuiltInWidgets.yml | 3 - .../semiwrap/shuffleboard/ComplexWidget.yml | 15 -- .../semiwrap/shuffleboard/LayoutType.yml | 6 - .../shuffleboard/RecordingController.yml | 10 -- .../semiwrap/shuffleboard/Shuffleboard.yml | 26 --- .../shuffleboard/ShuffleboardComponent.yml | 80 --------- .../ShuffleboardComponentBase.yml | 24 --- .../shuffleboard/ShuffleboardContainer.yml | 163 ------------------ .../ShuffleboardEventImportance.yml | 5 - .../shuffleboard/ShuffleboardInstance.yml | 20 --- .../shuffleboard/ShuffleboardLayout.yml | 8 - .../shuffleboard/ShuffleboardRoot.yml | 17 -- .../semiwrap/shuffleboard/ShuffleboardTab.yml | 13 -- .../shuffleboard/ShuffleboardValue.yml | 12 -- .../shuffleboard/ShuffleboardWidget.yml | 79 --------- .../semiwrap/shuffleboard/SimpleWidget.yml | 17 -- .../shuffleboard/SuppliedValueWidget.yml | 58 ------- .../semiwrap/shuffleboard/WidgetType.yml | 6 - .../semiwrap/simulation/ADXL345Sim.yml | 2 - .../simulation/PWMMotorControllerSim.yml | 10 ++ .../semiwrap/simulation/ServoSim.yml | 11 ++ .../robotpy-wpilib/tests/test_wpilib.py | 4 - subprojects/robotpy-wpilib/wpilib/__init__.py | 48 +----- .../robotpy-wpilib/wpilib/counter/__init__.py | 14 +- .../wpilib/shuffleboard/ShuffleboardData.cpp | 43 ----- .../wpilib/shuffleboard/ShuffleboardData.h | 17 -- .../wpilib/shuffleboard/__init__.py | 60 ------- .../wpilib/shuffleboard/shuffleboard.cpp | 16 -- .../wpilib/simulation/__init__.py | 26 +-- .../wpilib/simulation/simulation.cpp | 13 -- .../wpilib/src/rpy/MotorControllerGroup.cpp | 1 - .../wpilib/src/rpy/Notifier.cpp | 1 - 72 files changed, 60 insertions(+), 1596 deletions(-) delete mode 100644 subprojects/robotpy-wpilib/semiwrap/ADIS16448_IMU.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/ADIS16470_IMU.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/ADXL345_SPI.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/ADXL362.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/ADXRS450_Gyro.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/AnalogOutput.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/AnalogTrigger.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/AnalogTriggerOutput.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/AnalogTriggerType.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/BuiltInAccelerometer.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/Counter.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/DMA.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/DMASample.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/DigitalGlitchFilter.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/DigitalSource.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/Koors40.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/LiveWindow.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/NidecBrushless.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/Relay.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/SPI.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/SparkMini.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/SynchronousInterrupt.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/SystemServer.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/Ultrasonic.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/counter/ExternalDirectionCounter.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/BuiltInLayouts.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/BuiltInWidgets.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ComplexWidget.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/LayoutType.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/RecordingController.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/Shuffleboard.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardComponent.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardComponentBase.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardContainer.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardEventImportance.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardInstance.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardLayout.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardRoot.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardTab.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardValue.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardWidget.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/SimpleWidget.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/SuppliedValueWidget.yml delete mode 100644 subprojects/robotpy-wpilib/semiwrap/shuffleboard/WidgetType.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/simulation/PWMMotorControllerSim.yml create mode 100644 subprojects/robotpy-wpilib/semiwrap/simulation/ServoSim.yml delete mode 100644 subprojects/robotpy-wpilib/wpilib/shuffleboard/ShuffleboardData.cpp delete mode 100644 subprojects/robotpy-wpilib/wpilib/shuffleboard/ShuffleboardData.h delete mode 100644 subprojects/robotpy-wpilib/wpilib/shuffleboard/__init__.py delete mode 100644 subprojects/robotpy-wpilib/wpilib/shuffleboard/shuffleboard.cpp diff --git a/subprojects/robotpy-wpilib/meson.build b/subprojects/robotpy-wpilib/meson.build index 6343d6a5..6414c300 100644 --- a/subprojects/robotpy-wpilib/meson.build +++ b/subprojects/robotpy-wpilib/meson.build @@ -28,11 +28,6 @@ wpilib_interfaces_sources += files( 'wpilib/interfaces/interfaces.cpp', ) -wpilib_shuffleboard_sources += files( - 'wpilib/shuffleboard/shuffleboard.cpp', - 'wpilib/shuffleboard/ShuffleboardData.cpp', -) - wpilib_simulation_sources += files( 'wpilib/simulation/simulation.cpp', ) diff --git a/subprojects/robotpy-wpilib/pyproject.toml b/subprojects/robotpy-wpilib/pyproject.toml index 38b703ce..83f68a01 100644 --- a/subprojects/robotpy-wpilib/pyproject.toml +++ b/subprojects/robotpy-wpilib/pyproject.toml @@ -54,7 +54,6 @@ update_init = [ "wpilib.drive", "wpilib.event", "wpilib.interfaces", - "wpilib.shuffleboard", "wpilib.simulation", "wpilib.sysid wpilib._wpilib.sysid", ] @@ -64,10 +63,6 @@ scan_headers_ignore = [ # needs a python wrapper "frc/AsynchronousInterrupt.h", - # Needs HAL object support, not sure if this is a good idea for python - "frc/DMA.h", - "frc/DMASample.h", - "frc/Filesystem.h", "frc/Notifier.h", # wrapped separately "frc/Resource.h", @@ -75,16 +70,11 @@ scan_headers_ignore = [ "frc/motorcontrol/MotorControllerGroup.h", # wrapped separately - # Not possible - "frc/shuffleboard/RecordingController.h", - "frc/shuffleboard/SendableCameraWrapper.h", - "frc/smartdashboard/ListenerExecutor.h", # internal detail # Internals "rpy/ControlWord.h", "rpy/SmartDashboardData.h", - "ShuffleboardData.h", ] [tool.semiwrap.extension_modules."wpilib._wpilib"] @@ -102,34 +92,21 @@ DYNAMIC_CAMERA_SERVER = 1 [tool.semiwrap.extension_modules."wpilib._wpilib".headers] # frc -ADIS16448_IMU = "frc/ADIS16448_IMU.h" -ADIS16470_IMU = "frc/ADIS16470_IMU.h" ADXL345_I2C = "frc/ADXL345_I2C.h" -ADXL345_SPI = "frc/ADXL345_SPI.h" -ADXL362 = "frc/ADXL362.h" -ADXRS450_Gyro = "frc/ADXRS450_Gyro.h" AddressableLED = "frc/AddressableLED.h" Alert = "frc/Alert.h" AnalogAccelerometer = "frc/AnalogAccelerometer.h" AnalogEncoder = "frc/AnalogEncoder.h" AnalogGyro = "frc/AnalogGyro.h" AnalogInput = "frc/AnalogInput.h" -AnalogOutput = "frc/AnalogOutput.h" AnalogPotentiometer = "frc/AnalogPotentiometer.h" -AnalogTrigger = "frc/AnalogTrigger.h" -AnalogTriggerOutput = "frc/AnalogTriggerOutput.h" -AnalogTriggerType = "frc/AnalogTriggerType.h" -BuiltInAccelerometer = "frc/BuiltInAccelerometer.h" CAN = "frc/CAN.h" Compressor = "frc/Compressor.h" CompressorConfigType = "frc/CompressorConfigType.h" -Counter = "frc/Counter.h" DataLogManager = "frc/DataLogManager.h" DSControlWord = "frc/DSControlWord.h" -DigitalGlitchFilter = "frc/DigitalGlitchFilter.h" DigitalInput = "frc/DigitalInput.h" DigitalOutput = "frc/DigitalOutput.h" -DigitalSource = "frc/DigitalSource.h" DoubleSolenoid = "frc/DoubleSolenoid.h" DriverStation = "frc/DriverStation.h" DutyCycle = "frc/DutyCycle.h" @@ -152,39 +129,33 @@ PneumaticsControlModule = "frc/PneumaticsControlModule.h" PneumaticsModuleType = "frc/PneumaticsModuleType.h" PowerDistribution = "frc/PowerDistribution.h" Preferences = "frc/Preferences.h" -Relay = "frc/Relay.h" RobotBase = "frc/RobotBase.h" RobotController = "frc/RobotController.h" RobotState = "frc/RobotState.h" RuntimeType = "frc/RuntimeType.h" -SPI = "frc/SPI.h" SensorUtil = "frc/SensorUtil.h" SerialPort = "frc/SerialPort.h" Servo = "frc/Servo.h" SharpIR = "frc/SharpIR.h" Solenoid = "frc/Solenoid.h" StadiaController = "frc/StadiaController.h" -SynchronousInterrupt = "frc/SynchronousInterrupt.h" +SystemServer = "frc/SystemServer.h" Threads = "frc/Threads.h" TimedRobot = "frc/TimedRobot.h" Timer = "frc/Timer.h" TimesliceRobot = "frc/TimesliceRobot.h" Tracer = "frc/Tracer.h" -Ultrasonic = "frc/Ultrasonic.h" Watchdog = "frc/Watchdog.h" XboxController = "frc/XboxController.h" # frc/internal DriverStationModeThread = "frc/internal/DriverStationModeThread.h" -# frc/livewindow -LiveWindow = "frc/livewindow/LiveWindow.h" - # frc/motorcontrol DMC60 = "frc/motorcontrol/DMC60.h" Jaguar = "frc/motorcontrol/Jaguar.h" +Koors40 = "frc/motorcontrol/Koors40.h" MotorControllerGroup = "rpy/MotorControllerGroup.h" -NidecBrushless = "frc/motorcontrol/NidecBrushless.h" PWMMotorController = "frc/motorcontrol/PWMMotorController.h" PWMSparkFlex = "frc/motorcontrol/PWMSparkFlex.h" PWMSparkMax = "frc/motorcontrol/PWMSparkMax.h" @@ -194,6 +165,7 @@ PWMVenom = "frc/motorcontrol/PWMVenom.h" PWMVictorSPX = "frc/motorcontrol/PWMVictorSPX.h" SD540 = "frc/motorcontrol/SD540.h" Spark = "frc/motorcontrol/Spark.h" +SparkMini = "frc/motorcontrol/SparkMini.h" Talon = "frc/motorcontrol/Talon.h" Victor = "frc/motorcontrol/Victor.h" VictorSP = "frc/motorcontrol/VictorSP.h" @@ -227,7 +199,6 @@ yaml_path = "semiwrap/counter" [tool.semiwrap.extension_modules."wpilib.counter._counter".headers] # frc/counter EdgeConfiguration = "frc/counter/EdgeConfiguration.h" -ExternalDirectionCounter = "frc/counter/ExternalDirectionCounter.h" Tachometer = "frc/counter/Tachometer.h" UpDownCounter = "frc/counter/UpDownCounter.h" @@ -272,41 +243,6 @@ GenericHID = "frc/GenericHID.h" MotorController = "frc/motorcontrol/MotorController.h" -[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard"] -name = "wpilib_shuffleboard" -wraps = ["robotpy-native-wpilib"] -depends = ["wpilib", "wpilib_interfaces"] -yaml_path = "semiwrap/shuffleboard" - -[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard".defines] -DYNAMIC_CAMERA_SERVER = 1 - - -[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard".headers] -# frc/shuffleboard - -BuiltInLayouts = "frc/shuffleboard/BuiltInLayouts.h" -BuiltInWidgets = "frc/shuffleboard/BuiltInWidgets.h" -ComplexWidget = "frc/shuffleboard/ComplexWidget.h" -LayoutType = "frc/shuffleboard/LayoutType.h" -# RecordingController = "frc/shuffleboard/RecordingController.h" -# SendableCameraWrapper = "frc/shuffleboard/SendableCameraWrapper.h" -Shuffleboard = "frc/shuffleboard/Shuffleboard.h" -ShuffleboardComponent = "frc/shuffleboard/ShuffleboardComponent.h" -ShuffleboardComponentBase = "frc/shuffleboard/ShuffleboardComponentBase.h" -ShuffleboardContainer = "frc/shuffleboard/ShuffleboardContainer.h" -ShuffleboardEventImportance = "frc/shuffleboard/ShuffleboardEventImportance.h" -ShuffleboardInstance = "frc/shuffleboard/ShuffleboardInstance.h" -ShuffleboardLayout = "frc/shuffleboard/ShuffleboardLayout.h" -ShuffleboardRoot = "frc/shuffleboard/ShuffleboardRoot.h" -ShuffleboardTab = "frc/shuffleboard/ShuffleboardTab.h" -ShuffleboardValue = "frc/shuffleboard/ShuffleboardValue.h" -ShuffleboardWidget = "frc/shuffleboard/ShuffleboardWidget.h" -SimpleWidget = "frc/shuffleboard/SimpleWidget.h" -SuppliedValueWidget = "frc/shuffleboard/SuppliedValueWidget.h" -WidgetType = "frc/shuffleboard/WidgetType.h" - - [tool.semiwrap.extension_modules."wpilib.simulation._simulation"] name = "wpilib_simulation" wraps = ["robotpy-native-wpilib"] @@ -315,19 +251,11 @@ yaml_path = "semiwrap/simulation" [tool.semiwrap.extension_modules."wpilib.simulation._simulation".headers] # frc/simulation -ADIS16448_IMUSim = "frc/simulation/ADIS16448_IMUSim.h" -ADIS16470_IMUSim = "frc/simulation/ADIS16470_IMUSim.h" ADXL345Sim = "frc/simulation/ADXL345Sim.h" -ADXL362Sim = "frc/simulation/ADXL362Sim.h" -ADXRS450_GyroSim = "frc/simulation/ADXRS450_GyroSim.h" AddressableLEDSim = "frc/simulation/AddressableLEDSim.h" AnalogEncoderSim = "frc/simulation/AnalogEncoderSim.h" -AnalogGyroSim = "frc/simulation/AnalogGyroSim.h" AnalogInputSim = "frc/simulation/AnalogInputSim.h" -AnalogOutputSim = "frc/simulation/AnalogOutputSim.h" -AnalogTriggerSim = "frc/simulation/AnalogTriggerSim.h" BatterySim = "frc/simulation/BatterySim.h" -BuiltInAccelerometerSim = "frc/simulation/BuiltInAccelerometerSim.h" CTREPCMSim = "frc/simulation/CTREPCMSim.h" CallbackStore = "frc/simulation/CallbackStore.h" DCMotorSim = "frc/simulation/DCMotorSim.h" @@ -349,16 +277,15 @@ PS5ControllerSim = "frc/simulation/PS5ControllerSim.h" PWMSim = "frc/simulation/PWMSim.h" PneumaticsBaseSim = "frc/simulation/PneumaticsBaseSim.h" PowerDistributionSim = "frc/simulation/PowerDistributionSim.h" +PWMMotorControllerSim = "frc/simulation/PWMMotorControllerSim.h" REVPHSim = "frc/simulation/REVPHSim.h" -RelaySim = "frc/simulation/RelaySim.h" RoboRioSim = "frc/simulation/RoboRioSim.h" -SPIAccelerometerSim = "frc/simulation/SPIAccelerometerSim.h" SendableChooserSim = "frc/simulation/SendableChooserSim.h" +ServoSim = "frc/simulation/ServoSim.h" SharpIRSim = "frc/simulation/SharpIRSim.h" SimDeviceSim = "frc/simulation/SimDeviceSim.h" SimHooks = "frc/simulation/SimHooks.h" SingleJointedArmSim = "frc/simulation/SingleJointedArmSim.h" SolenoidSim = "frc/simulation/SolenoidSim.h" StadiaControllerSim = "frc/simulation/StadiaControllerSim.h" -UltrasonicSim = "frc/simulation/UltrasonicSim.h" XboxControllerSim = "frc/simulation/XboxControllerSim.h" diff --git a/subprojects/robotpy-wpilib/semiwrap/ADIS16448_IMU.yml b/subprojects/robotpy-wpilib/semiwrap/ADIS16448_IMU.yml deleted file mode 100644 index 2fdcd2c9..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/ADIS16448_IMU.yml +++ /dev/null @@ -1,45 +0,0 @@ - -extra_includes: -- networktables/NTSendableBuilder.h - -classes: - frc::ADIS16448_IMU: - enums: - CalibrationTime: - IMUAxis: - ignored_bases: - - wpi::SendableHelper - methods: - ADIS16448_IMU: - overloads: - '': - IMUAxis, SPI::Port, CalibrationTime: - Calibrate: - ConfigCalTime: - Reset: - GetAngle: - GetRate: - GetGyroAngleX: - GetGyroAngleY: - GetGyroAngleZ: - GetGyroRateX: - GetGyroRateY: - GetGyroRateZ: - GetAccelX: - GetAccelY: - GetAccelZ: - GetXComplementaryAngle: - GetYComplementaryAngle: - GetXFilteredAccelAngle: - GetYFilteredAccelAngle: - GetMagneticFieldX: - GetMagneticFieldY: - GetMagneticFieldZ: - GetBarometricPressure: - GetTemperature: - GetYawAxis: - SetYawAxis: - IsConnected: - ConfigDecRate: - GetPort: - InitSendable: diff --git a/subprojects/robotpy-wpilib/semiwrap/ADIS16470_IMU.yml b/subprojects/robotpy-wpilib/semiwrap/ADIS16470_IMU.yml deleted file mode 100644 index 36cb45e2..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/ADIS16470_IMU.yml +++ /dev/null @@ -1,44 +0,0 @@ - -extra_includes: -- networktables/NTSendableBuilder.h - -classes: - frc::ADIS16470_IMU: - attributes: - m_yaw_axis: - m_pitch_axis: - m_roll_axis: - enums: - CalibrationTime: - IMUAxis: - ignored_bases: - - wpi::SendableHelper - methods: - ADIS16470_IMU: - overloads: - '': - IMUAxis, IMUAxis, IMUAxis: - IMUAxis, IMUAxis, IMUAxis, frc::SPI::Port, CalibrationTime: - ConfigDecRate: - Calibrate: - ConfigCalTime: - Reset: - SetGyroAngle: - SetGyroAngleX: - SetGyroAngleY: - SetGyroAngleZ: - GetAngle: - GetRate: - GetAccelX: - GetAccelY: - GetAccelZ: - GetXComplementaryAngle: - GetYComplementaryAngle: - GetXFilteredAccelAngle: - GetYFilteredAccelAngle: - GetYawAxis: - GetPitchAxis: - GetRollAxis: - IsConnected: - GetPort: - InitSendable: diff --git a/subprojects/robotpy-wpilib/semiwrap/ADXL345_SPI.yml b/subprojects/robotpy-wpilib/semiwrap/ADXL345_SPI.yml deleted file mode 100644 index 29c4a29b..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/ADXL345_SPI.yml +++ /dev/null @@ -1,40 +0,0 @@ -extra_includes: -- networktables/NTSendableBuilder.h -- frc/DigitalSource.h - -classes: - frc::ADXL345_SPI: - constants: - - frc::ADXL345_SPI::Range::kRange_2G - ignored_bases: - - wpi::SendableHelper - attributes: - m_spi: - ignore: true - m_simDevice: - m_simRange: - m_simX: - m_simY: - m_simZ: - kPowerCtlRegister: - kDataFormatRegister: - kDataRegister: - kGsPerLSB: - enums: - Axes: - Range: - methods: - ADXL345_SPI: - GetSpiPort: - SetRange: - GetX: - GetY: - GetZ: - GetAcceleration: - GetAccelerations: - InitSendable: - frc::ADXL345_SPI::AllAxes: - attributes: - XAxis: - YAxis: - ZAxis: diff --git a/subprojects/robotpy-wpilib/semiwrap/ADXL362.yml b/subprojects/robotpy-wpilib/semiwrap/ADXL362.yml deleted file mode 100644 index 87ffdc4c..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/ADXL362.yml +++ /dev/null @@ -1,31 +0,0 @@ -extra_includes: -- networktables/NTSendableBuilder.h -- frc/DigitalSource.h - -classes: - frc::ADXL362: - constants: - - frc::ADXL362::Range::kRange_2G - ignored_bases: - - wpi::SendableHelper - enums: - Axes: - Range: - methods: - ADXL362: - overloads: - Range: - SPI::Port, Range: - GetSpiPort: - SetRange: - GetX: - GetY: - GetZ: - GetAcceleration: - GetAccelerations: - InitSendable: - frc::ADXL362::AllAxes: - attributes: - XAxis: - YAxis: - ZAxis: diff --git a/subprojects/robotpy-wpilib/semiwrap/ADXRS450_Gyro.yml b/subprojects/robotpy-wpilib/semiwrap/ADXRS450_Gyro.yml deleted file mode 100644 index 9acf9229..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/ADXRS450_Gyro.yml +++ /dev/null @@ -1,21 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/DigitalSource.h - -classes: - frc::ADXRS450_Gyro: - ignored_bases: - - wpi::SendableHelper - methods: - ADXRS450_Gyro: - overloads: - '': - SPI::Port: - IsConnected: - GetAngle: - GetRate: - Reset: - Calibrate: - GetRotation2d: - GetPort: - InitSendable: diff --git a/subprojects/robotpy-wpilib/semiwrap/AnalogInput.yml b/subprojects/robotpy-wpilib/semiwrap/AnalogInput.yml index 29cf3dbd..e81d2d45 100644 --- a/subprojects/robotpy-wpilib/semiwrap/AnalogInput.yml +++ b/subprojects/robotpy-wpilib/semiwrap/AnalogInput.yml @@ -1,7 +1,5 @@ extra_includes: - wpi/sendable/SendableBuilder.h -- frc/DMA.h -- frc/DMASample.h classes: frc::AnalogInput: diff --git a/subprojects/robotpy-wpilib/semiwrap/AnalogOutput.yml b/subprojects/robotpy-wpilib/semiwrap/AnalogOutput.yml deleted file mode 100644 index 56ce9ee3..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/AnalogOutput.yml +++ /dev/null @@ -1,23 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h - -classes: - frc::AnalogOutput: - ignored_bases: - - wpi::SendableHelper - attributes: - m_channel: - m_port: - ignore: true - methods: - AnalogOutput: - SetVoltage: - GetVoltage: - GetChannel: - InitSendable: - -inline_code: | - cls_AnalogOutput - .def("__repr__", [](const AnalogOutput &self) { - return py::str("").format(self.GetChannel()); - }); diff --git a/subprojects/robotpy-wpilib/semiwrap/AnalogTrigger.yml b/subprojects/robotpy-wpilib/semiwrap/AnalogTrigger.yml deleted file mode 100644 index 2667829b..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/AnalogTrigger.yml +++ /dev/null @@ -1,37 +0,0 @@ - -extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/AnalogInput.h -- frc/DutyCycle.h - - -classes: - frc::AnalogTrigger: - ignored_bases: - - wpi::SendableHelper - methods: - AnalogTrigger: - overloads: - int: - AnalogInput&: - ignore: true - AnalogInput*: - ignore: true - std::shared_ptr: - DutyCycle&: - ignore: true - DutyCycle*: - ignore: true - std::shared_ptr: - SetLimitsVoltage: - SetLimitsDutyCycle: - SetLimitsRaw: - SetAveraged: - SetDutyCycle: - ignore: true # not implemented - SetFiltered: - GetIndex: - GetInWindow: - GetTriggerState: - CreateOutput: - InitSendable: diff --git a/subprojects/robotpy-wpilib/semiwrap/AnalogTriggerOutput.yml b/subprojects/robotpy-wpilib/semiwrap/AnalogTriggerOutput.yml deleted file mode 100644 index 8e9aacc4..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/AnalogTriggerOutput.yml +++ /dev/null @@ -1,18 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/AnalogInput.h -- frc/DutyCycle.h -- frc/AnalogTrigger.h - -classes: - frc::AnalogTriggerOutput: - ignored_bases: - - wpi::SendableHelper - methods: - Get: - GetPortHandleForRouting: - GetAnalogTriggerTypeForRouting: - IsAnalogTrigger: - GetChannel: - InitSendable: - AnalogTriggerOutput: diff --git a/subprojects/robotpy-wpilib/semiwrap/AnalogTriggerType.yml b/subprojects/robotpy-wpilib/semiwrap/AnalogTriggerType.yml deleted file mode 100644 index eef4f8e0..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/AnalogTriggerType.yml +++ /dev/null @@ -1,3 +0,0 @@ - -enums: - AnalogTriggerType: diff --git a/subprojects/robotpy-wpilib/semiwrap/BuiltInAccelerometer.yml b/subprojects/robotpy-wpilib/semiwrap/BuiltInAccelerometer.yml deleted file mode 100644 index 30a2db49..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/BuiltInAccelerometer.yml +++ /dev/null @@ -1,19 +0,0 @@ - -extra_includes: -- wpi/sendable/SendableBuilder.h - -classes: - frc::BuiltInAccelerometer: - ignored_bases: - - wpi::SendableHelper - constants: - - frc::BuiltInAccelerometer::Range::kRange_8G - enums: - Range: - methods: - BuiltInAccelerometer: - SetRange: - GetX: - GetY: - GetZ: - InitSendable: diff --git a/subprojects/robotpy-wpilib/semiwrap/CAN.yml b/subprojects/robotpy-wpilib/semiwrap/CAN.yml index 1f4e40c0..bdd22e04 100644 --- a/subprojects/robotpy-wpilib/semiwrap/CAN.yml +++ b/subprojects/robotpy-wpilib/semiwrap/CAN.yml @@ -1,9 +1,4 @@ classes: - frc::CANData: - attributes: - data: - length: - timestamp: frc::CAN: attributes: kTeamManufacturer: @@ -14,17 +9,9 @@ classes: int: int, int, int: WritePacket: - buffers: - - {type: IN, src: data, len: length} WritePacketNoError: - buffers: - - {type: IN, src: data, len: length} WritePacketRepeating: - buffers: - - {type: IN, src: data, len: length} WritePacketRepeatingNoError: - buffers: - - {type: IN, src: data, len: length} WriteRTRFrame: WriteRTRFrameNoError: StopPacketRepeating: diff --git a/subprojects/robotpy-wpilib/semiwrap/Counter.yml b/subprojects/robotpy-wpilib/semiwrap/Counter.yml deleted file mode 100644 index 625bc9fd..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/Counter.yml +++ /dev/null @@ -1,79 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/DigitalGlitchFilter.h -- frc/DMA.h -- frc/DMASample.h - -classes: - frc::Counter: - ignored_bases: - - wpi::SendableHelper - typealias: - - frc::CounterBase::EncodingType - attributes: - m_upSource: - m_downSource: - m_counter: - ignore: true - enums: - Mode: - methods: - Counter: - overloads: - Mode: - param_override: - mode: - default: frc::Counter::Mode::kTwoPulse - int: - DigitalSource*: - ignore: true - std::shared_ptr: - const AnalogTrigger&: - EncodingType, DigitalSource*, DigitalSource*, bool: - ignore: true - EncodingType, std::shared_ptr, std::shared_ptr, bool: - SetUpSource: - overloads: - int: - AnalogTrigger*, AnalogTriggerType: - ignore: true - std::shared_ptr, AnalogTriggerType: - DigitalSource*: - ignore: true - std::shared_ptr: - DigitalSource&: - ignore: true - SetUpSourceEdge: - ClearUpSource: - SetDownSource: - overloads: - int: - AnalogTrigger*, AnalogTriggerType: - ignore: true - std::shared_ptr, AnalogTriggerType: - DigitalSource*: - ignore: true - DigitalSource&: - ignore: true - std::shared_ptr: - SetDownSourceEdge: - ClearDownSource: - SetUpDownCounterMode: - SetExternalDirectionMode: - SetSemiPeriodMode: - SetPulseLengthMode: - SetReverseDirection: - SetSamplesToAverage: - GetSamplesToAverage: - GetFPGAIndex: - SetDistancePerPulse: - GetDistance: - GetRate: - Get: - Reset: - GetPeriod: - SetMaxPeriod: - SetUpdateWhenEmpty: - GetStopped: - GetDirection: - InitSendable: diff --git a/subprojects/robotpy-wpilib/semiwrap/DMA.yml b/subprojects/robotpy-wpilib/semiwrap/DMA.yml deleted file mode 100644 index 568810f1..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/DMA.yml +++ /dev/null @@ -1,26 +0,0 @@ -extra_includes: -- frc/AnalogInput.h -- frc/Counter.h -- frc/DigitalSource.h -- frc/DMASample.h -- frc/DutyCycle.h -- frc/Encoder.h - -classes: - frc::DMA: - methods: - DMA: - SetPause: - SetRate: - AddEncoder: - AddEncoderPeriod: - AddCounter: - AddCounterPeriod: - AddDigitalSource: - AddDutyCycle: - AddAnalogInput: - AddAveragedAnalogInput: - AddAnalogAccumulator: - SetExternalTrigger: - StartDMA: - StopDMA: diff --git a/subprojects/robotpy-wpilib/semiwrap/DMASample.yml b/subprojects/robotpy-wpilib/semiwrap/DMASample.yml deleted file mode 100644 index 55663c44..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/DMASample.yml +++ /dev/null @@ -1,19 +0,0 @@ -classes: - frc::DMASample: - methods: - Update: - GetTime: - GetTimeStamp: - GetEncoderRaw: - GetEncoderDistance: - GetEncoderPeriodRaw: - GetCounter: - GetCounterPeriod: - GetDigitalSource: - GetAnalogInputRaw: - GetAnalogInputVoltage: - GetAveragedAnalogInputRaw: - GetAveragedAnalogInputVoltage: - GetAnalogAccumulator: - GetDutyCycleOutputRaw: - GetDutyCycleOutput: diff --git a/subprojects/robotpy-wpilib/semiwrap/DataLogManager.yml b/subprojects/robotpy-wpilib/semiwrap/DataLogManager.yml index 36eb75ad..5baf09d3 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DataLogManager.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DataLogManager.yml @@ -1,6 +1,6 @@ extra_includes: -- wpi/DataLog.h +- wpi/datalog/DataLog.h classes: frc::DataLogManager: diff --git a/subprojects/robotpy-wpilib/semiwrap/DigitalGlitchFilter.yml b/subprojects/robotpy-wpilib/semiwrap/DigitalGlitchFilter.yml deleted file mode 100644 index 2a944a40..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/DigitalGlitchFilter.yml +++ /dev/null @@ -1,26 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/Counter.h -- frc/Encoder.h - -classes: - frc::DigitalGlitchFilter: - ignored_bases: - - wpi::SendableHelper - methods: - DigitalGlitchFilter: - Add: - overloads: - DigitalSource*: - Encoder*: - Counter*: - Remove: - overloads: - DigitalSource*: - Encoder*: - Counter*: - SetPeriodCycles: - SetPeriodNanoSeconds: - GetPeriodCycles: - GetPeriodNanoSeconds: - InitSendable: diff --git a/subprojects/robotpy-wpilib/semiwrap/DigitalInput.yml b/subprojects/robotpy-wpilib/semiwrap/DigitalInput.yml index 789653c8..766bb654 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DigitalInput.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DigitalInput.yml @@ -1,6 +1,5 @@ extra_includes: - wpi/sendable/SendableBuilder.h -- frc/DigitalGlitchFilter.h classes: frc::DigitalInput: diff --git a/subprojects/robotpy-wpilib/semiwrap/DigitalSource.yml b/subprojects/robotpy-wpilib/semiwrap/DigitalSource.yml deleted file mode 100644 index 5666268d..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/DigitalSource.yml +++ /dev/null @@ -1,16 +0,0 @@ -classes: - frc::DigitalSource: - methods: - DigitalSource: - GetPortHandleForRouting: - GetAnalogTriggerTypeForRouting: - IsAnalogTrigger: - GetChannel: - -inline_code: | - cls_DigitalSource - .def("__repr__", [](py::handle self) { - py::object type_name = self.get_type().attr("__qualname__"); - int channel = self.cast().GetChannel(); - return py::str("<{} {}>").format(type_name, channel); - }); diff --git a/subprojects/robotpy-wpilib/semiwrap/DriverStation.yml b/subprojects/robotpy-wpilib/semiwrap/DriverStation.yml index 3a75ed8e..52a9fc1e 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DriverStation.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DriverStation.yml @@ -1,7 +1,7 @@ extra_includes: - rpy/ControlWord.h -- wpi/DataLog.h +- wpi/datalog/DataLog.h classes: frc::DriverStation: diff --git a/subprojects/robotpy-wpilib/semiwrap/DutyCycle.yml b/subprojects/robotpy-wpilib/semiwrap/DutyCycle.yml index 50cc174d..022061b6 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DutyCycle.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DutyCycle.yml @@ -1,9 +1,5 @@ extra_includes: - wpi/sendable/SendableBuilder.h -- frc/AnalogTrigger.h -- frc/DigitalSource.h -- frc/DMA.h -- frc/DMASample.h classes: frc::DutyCycle: diff --git a/subprojects/robotpy-wpilib/semiwrap/DutyCycleEncoder.yml b/subprojects/robotpy-wpilib/semiwrap/DutyCycleEncoder.yml index aaa847df..4b5b93fe 100644 --- a/subprojects/robotpy-wpilib/semiwrap/DutyCycleEncoder.yml +++ b/subprojects/robotpy-wpilib/semiwrap/DutyCycleEncoder.yml @@ -1,7 +1,6 @@ extra_includes: - wpi/sendable/SendableBuilder.h - frc/DutyCycle.h -- frc/DigitalSource.h classes: frc::DutyCycleEncoder: diff --git a/subprojects/robotpy-wpilib/semiwrap/Encoder.yml b/subprojects/robotpy-wpilib/semiwrap/Encoder.yml index c9a55951..c9e80c46 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Encoder.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Encoder.yml @@ -1,9 +1,5 @@ extra_includes: - wpi/sendable/SendableBuilder.h -- frc/DigitalSource.h -- frc/DigitalGlitchFilter.h -- frc/DMA.h -- frc/DMASample.h classes: frc::Encoder: diff --git a/subprojects/robotpy-wpilib/semiwrap/Koors40.yml b/subprojects/robotpy-wpilib/semiwrap/Koors40.yml new file mode 100644 index 00000000..2b9af2bf --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/Koors40.yml @@ -0,0 +1,6 @@ +--- + +classes: + frc::Koors40: + methods: + Koors40: diff --git a/subprojects/robotpy-wpilib/semiwrap/LiveWindow.yml b/subprojects/robotpy-wpilib/semiwrap/LiveWindow.yml deleted file mode 100644 index adb1988f..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/LiveWindow.yml +++ /dev/null @@ -1,31 +0,0 @@ - -extra_includes: -- wpi/sendable/Sendable.h -- pybind11/functional.h - -classes: - frc::LiveWindow: - methods: - GetInstance: - ignore: true - SetEnabledCallback: - SetDisabledCallback: - EnableTelemetry: - keepalive: - - [1, 2] - DisableTelemetry: - keepalive: - - [1, 2] - DisableAllTelemetry: - EnableAllTelemetry: - IsEnabled: - SetEnabled: - UpdateValues: - -inline_code: | - static int unused; - py::capsule cleanup(&unused, [](void *) { - frc::LiveWindow::SetEnabledCallback(nullptr); - frc::LiveWindow::SetDisabledCallback(nullptr); - }); - m.add_object("_lw_cleanup", cleanup); diff --git a/subprojects/robotpy-wpilib/semiwrap/NidecBrushless.yml b/subprojects/robotpy-wpilib/semiwrap/NidecBrushless.yml deleted file mode 100644 index 89455f37..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/NidecBrushless.yml +++ /dev/null @@ -1,22 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h -- wpi/SmallString.h - -classes: - frc::NidecBrushless: - ignored_bases: - - wpi::SendableHelper - methods: - NidecBrushless: - Set: - Get: - SetInverted: - GetInverted: - Disable: - Enable: - PIDWrite: - rename: pidWrite - StopMotor: - GetDescription: - GetChannel: - InitSendable: diff --git a/subprojects/robotpy-wpilib/semiwrap/PWMMotorController.yml b/subprojects/robotpy-wpilib/semiwrap/PWMMotorController.yml index 676b0f8a..53296c2a 100644 --- a/subprojects/robotpy-wpilib/semiwrap/PWMMotorController.yml +++ b/subprojects/robotpy-wpilib/semiwrap/PWMMotorController.yml @@ -1,7 +1,6 @@ extra_includes: - wpi/sendable/SendableBuilder.h -- frc/DMA.h classes: frc::PWMMotorController: diff --git a/subprojects/robotpy-wpilib/semiwrap/Relay.yml b/subprojects/robotpy-wpilib/semiwrap/Relay.yml deleted file mode 100644 index e42fc0f0..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/Relay.yml +++ /dev/null @@ -1,28 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h -- wpi/SmallString.h - -classes: - frc::Relay: - ignored_bases: - - wpi::SendableHelper - enums: - Value: - Direction: - methods: - Relay: - param_override: - direction: - default: frc::Relay::Direction::kBothDirections - Set: - Get: - GetChannel: - StopMotor: - GetDescription: - InitSendable: - -inline_code: | - cls_Relay - .def("__repr__", [](const Relay &self) { - return py::str("").format(self.GetChannel()); - }); diff --git a/subprojects/robotpy-wpilib/semiwrap/SPI.yml b/subprojects/robotpy-wpilib/semiwrap/SPI.yml deleted file mode 100644 index a703b7e8..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/SPI.yml +++ /dev/null @@ -1,80 +0,0 @@ -extra_includes: -- frc/DigitalSource.h - -classes: - frc::SPI: - attributes: - m_port: - ignore: true - m_mode: - m_msbFirst: - m_sampleOnTrailing: - m_clockIdleHigh: - enums: - Mode: - Port: - methods: - SPI: - GetPort: - SetClockRate: - SetMSBFirst: - SetLSBFirst: - SetSampleDataOnLeadingEdge: - SetSampleDataOnTrailingEdge: - SetSampleDataOnFalling: - ignore: true - SetSampleDataOnRising: - ignore: true - SetClockActiveLow: - SetClockActiveHigh: - SetMode: - SetChipSelectActiveHigh: - SetChipSelectActiveLow: - Write: - buffers: - - {type: IN, src: data, len: size} - Read: - buffers: - - {type: OUT, src: dataReceived, len: size} - Transaction: - buffers: - - {type: IN, src: dataToSend, len: size} - - {type: OUT, src: dataReceived, len: size} - # TODO: dataToSend buffer must be at least as long as dataReceived buffer - InitAuto: - FreeAuto: - SetAutoTransmitData: - StartAutoRate: - overloads: - units::second_t: - double: - ignore: true - StartAutoTrigger: - StopAuto: - ForceAutoRead: - ReadAutoReceivedData: - overloads: - uint32_t*, int, units::second_t: - buffers: - - {type: OUT, src: buffer, len: numToRead} - uint32_t*, int, double: - ignore: true - GetAutoDroppedCount: - ConfigureAutoStall: - InitAccumulator: - overloads: - units::second_t, int, int, int, int, int, int, bool, bool: - double, int, int, int, int, int, int, bool, bool: - ignore: true - FreeAccumulator: - ResetAccumulator: - SetAccumulatorCenter: - SetAccumulatorDeadband: - GetAccumulatorLastValue: - GetAccumulatorValue: - GetAccumulatorCount: - GetAccumulatorAverage: - GetAccumulatorOutput: - SetAccumulatorIntegratedCenter: - GetAccumulatorIntegratedValue: - GetAccumulatorIntegratedAverage: diff --git a/subprojects/robotpy-wpilib/semiwrap/Servo.yml b/subprojects/robotpy-wpilib/semiwrap/Servo.yml index 1c1c8a9a..908ecab0 100644 --- a/subprojects/robotpy-wpilib/semiwrap/Servo.yml +++ b/subprojects/robotpy-wpilib/semiwrap/Servo.yml @@ -3,6 +3,8 @@ extra_includes: classes: frc::Servo: + ignored_bases: + - wpi::SendableHelper methods: Servo: Set: diff --git a/subprojects/robotpy-wpilib/semiwrap/SparkMini.yml b/subprojects/robotpy-wpilib/semiwrap/SparkMini.yml new file mode 100644 index 00000000..a0e57b7f --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/SparkMini.yml @@ -0,0 +1,6 @@ +--- + +classes: + frc::SparkMini: + methods: + SparkMini: diff --git a/subprojects/robotpy-wpilib/semiwrap/SynchronousInterrupt.yml b/subprojects/robotpy-wpilib/semiwrap/SynchronousInterrupt.yml deleted file mode 100644 index 76dcd740..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/SynchronousInterrupt.yml +++ /dev/null @@ -1,19 +0,0 @@ - -extra_includes: -- frc/DigitalSource.h - -classes: - frc::SynchronousInterrupt: - enums: - WaitResult: - methods: - SynchronousInterrupt: - overloads: - DigitalSource&: - DigitalSource*: - std::shared_ptr: - WaitForInterrupt: - SetInterruptEdges: - GetRisingTimestamp: - GetFallingTimestamp: - WakeupWaitingInterrupt: diff --git a/subprojects/robotpy-wpilib/semiwrap/SystemServer.yml b/subprojects/robotpy-wpilib/semiwrap/SystemServer.yml new file mode 100644 index 00000000..9a65a915 --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/SystemServer.yml @@ -0,0 +1,6 @@ +--- + +classes: + frc::SystemServer: + methods: + GetSystemServer: diff --git a/subprojects/robotpy-wpilib/semiwrap/Ultrasonic.yml b/subprojects/robotpy-wpilib/semiwrap/Ultrasonic.yml deleted file mode 100644 index 9cadb649..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/Ultrasonic.yml +++ /dev/null @@ -1,38 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/DigitalInput.h -- frc/DigitalOutput.h - -classes: - frc::Ultrasonic: - ignored_bases: - - wpi::SendableHelper - enums: - DistanceUnit: - methods: - Ultrasonic: - overloads: - int, int: - DigitalOutput*, DigitalInput*: - ignore: true - DigitalOutput&, DigitalInput&: - ignore: true - std::shared_ptr, std::shared_ptr: - GetEchoChannel: - GetRange: - Ping: - IsRangeValid: - SetAutomaticMode: - IsEnabled: - SetEnabled: - InitSendable: - -inline_code: | - cls_Ultrasonic - .def("getRangeMM", [](const frc::Ultrasonic &self) -> units::millimeter_t { - return self.GetRange(); - }) - .def("getRangeInches", [](const frc::Ultrasonic &self) -> units::inch_t { - return self.GetRange(); - }) - ; diff --git a/subprojects/robotpy-wpilib/semiwrap/counter/ExternalDirectionCounter.yml b/subprojects/robotpy-wpilib/semiwrap/counter/ExternalDirectionCounter.yml deleted file mode 100644 index ff6eaec3..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/counter/ExternalDirectionCounter.yml +++ /dev/null @@ -1,17 +0,0 @@ -extra_includes: -- frc/DigitalSource.h - -classes: - frc::ExternalDirectionCounter: - ignored_bases: - - wpi::SendableHelper - methods: - ExternalDirectionCounter: - overloads: - DigitalSource&, DigitalSource&: - std::shared_ptr, std::shared_ptr: - GetCount: - SetReverseDirection: - Reset: - SetEdgeConfiguration: - InitSendable: diff --git a/subprojects/robotpy-wpilib/semiwrap/counter/Tachometer.yml b/subprojects/robotpy-wpilib/semiwrap/counter/Tachometer.yml index 5a8440ed..78a7554e 100644 --- a/subprojects/robotpy-wpilib/semiwrap/counter/Tachometer.yml +++ b/subprojects/robotpy-wpilib/semiwrap/counter/Tachometer.yml @@ -1,5 +1,3 @@ -extra_includes: -- frc/DigitalSource.h classes: frc::Tachometer: diff --git a/subprojects/robotpy-wpilib/semiwrap/counter/UpDownCounter.yml b/subprojects/robotpy-wpilib/semiwrap/counter/UpDownCounter.yml index 3314e10c..a57f2fea 100644 --- a/subprojects/robotpy-wpilib/semiwrap/counter/UpDownCounter.yml +++ b/subprojects/robotpy-wpilib/semiwrap/counter/UpDownCounter.yml @@ -1,7 +1,4 @@ -extra_includes: -- frc/DigitalSource.h - classes: frc::UpDownCounter: ignored_bases: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/BuiltInLayouts.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/BuiltInLayouts.yml deleted file mode 100644 index 38ed2e11..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/BuiltInLayouts.yml +++ /dev/null @@ -1,3 +0,0 @@ - -enums: - BuiltInLayouts: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/BuiltInWidgets.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/BuiltInWidgets.yml deleted file mode 100644 index fbd93b6a..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/BuiltInWidgets.yml +++ /dev/null @@ -1,3 +0,0 @@ - -enums: - BuiltInWidgets: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ComplexWidget.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ComplexWidget.yml deleted file mode 100644 index cc6197da..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ComplexWidget.yml +++ /dev/null @@ -1,15 +0,0 @@ - -extra_includes: -- wpi/sendable/Sendable.h -- wpi/sendable/SendableBuilder.h -- frc/shuffleboard/ShuffleboardContainer.h - -classes: - frc::ComplexWidget: - # virtual base issue: robotpy-build/166 - force_no_trampoline: true - methods: - ComplexWidget: - EnableIfActuator: - DisableIfActuator: - BuildInto: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/LayoutType.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/LayoutType.yml deleted file mode 100644 index 177c6575..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/LayoutType.yml +++ /dev/null @@ -1,6 +0,0 @@ - -classes: - frc::LayoutType: - methods: - LayoutType: - GetLayoutName: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/RecordingController.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/RecordingController.yml deleted file mode 100644 index f68a7c6a..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/RecordingController.yml +++ /dev/null @@ -1,10 +0,0 @@ - -classes: - frc::RecordingController: - methods: - RecordingController: - StartRecording: - StopRecording: - SetRecordingFileNameFormat: - ClearRecordingFileNameFormat: - AddEventMarker: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/Shuffleboard.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/Shuffleboard.yml deleted file mode 100644 index 4184bb7a..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/Shuffleboard.yml +++ /dev/null @@ -1,26 +0,0 @@ - -extra_includes: -- frc/shuffleboard/ShuffleboardTab.h - -classes: - frc::Shuffleboard: - attributes: - kBaseTableName: - methods: - Update: - GetTab: - return_value_policy: reference_internal - SelectTab: - overloads: - int: - std::string_view: - EnableActuatorWidgets: - DisableActuatorWidgets: - StartRecording: - StopRecording: - SetRecordingFileNameFormat: - ClearRecordingFileNameFormat: - AddEventMarker: - overloads: - std::string_view, std::string_view, ShuffleboardEventImportance: - std::string_view, ShuffleboardEventImportance: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardComponent.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardComponent.yml deleted file mode 100644 index c59b824d..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardComponent.yml +++ /dev/null @@ -1,80 +0,0 @@ - -extra_includes: -- frc/shuffleboard/ShuffleboardContainer.h - -classes: - frc::ShuffleboardComponent: - # virtual base issue: robotpy-build/166 - force_no_trampoline: true - template_params: - - Derived - methods: - ShuffleboardComponent: - ignore: true - WithProperties: - return_value_policy: reference_internal - WithPosition: - return_value_policy: reference_internal - WithSize: - return_value_policy: reference_internal - - -templates: - _SimpleComponent: - qualname: frc::ShuffleboardComponent - params: - - frc::SimpleWidget - _ComplexComponent: - qualname: frc::ShuffleboardComponent - params: - - frc::ComplexWidget - - _LayoutComponent: - qualname: frc::ShuffleboardComponent - params: - - frc::ShuffleboardLayout - - _SuppliedValueComponent_string: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget - _SuppliedValueComponent_double: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget - _SuppliedValueComponent_float: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget - _SuppliedValueComponent_integer: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget - _SuppliedValueComponent_bool: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget - _SuppliedValueComponent_vector_string: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget> - _SuppliedValueComponent_vector_double: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget> - _SuppliedValueComponent_vector_float: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget> - _SuppliedValueComponent_vector_int: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget> - _SuppliedValueComponent_vector_bool: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget> - _SuppliedValueComponent_vector_raw: - qualname: frc::ShuffleboardComponent - params: - - frc::SuppliedValueWidget> diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardComponentBase.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardComponentBase.yml deleted file mode 100644 index 1218f577..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardComponentBase.yml +++ /dev/null @@ -1,24 +0,0 @@ - -extra_includes: -- frc/shuffleboard/ShuffleboardContainer.h - - -classes: - frc::ShuffleboardComponentBase: - # virtual base issue: robotpy-build/166 - force_no_trampoline: true - attributes: - m_properties: - m_metadataDirty: - m_column: - m_row: - m_width: - m_height: - methods: - ShuffleboardComponentBase: - ignore: true # cannot construct without trampoline - SetType: - BuildMetadata: - GetParent: - return_value_policy: reference_internal - GetType: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardContainer.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardContainer.yml deleted file mode 100644 index 859872fc..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardContainer.yml +++ /dev/null @@ -1,163 +0,0 @@ - -extra_includes: -- frc/shuffleboard/ComplexWidget.h -- wpi/sendable/Sendable.h -- frc/shuffleboard/ShuffleboardLayout.h -- frc/shuffleboard/SimpleWidget.h -- ShuffleboardData.h -- frc/Errors.h -- wpi/sendable/SendableRegistry.h - -classes: - frc::ShuffleboardContainer: - # virtual base issue: robotpy-build/166 - force_no_trampoline: true - attributes: - m_isLayout: - methods: - ShuffleboardContainer: - # this is abstract, so can't construct it without a trampoline - ignore: true - GetComponents: - GetLayout: - overloads: - std::string_view, BuiltInLayouts: - return_value_policy: reference_internal - std::string_view, const LayoutType&: - return_value_policy: reference_internal - std::string_view, std::string_view: - return_value_policy: reference_internal - std::string_view: - return_value_policy: reference_internal - Add: - overloads: - std::string_view, wpi::Sendable&: - return_value_policy: reference_internal - param_override: - sendable: - name: defaultValue - cpp_code: | - [](ShuffleboardContainer *self, py::str &key, std::shared_ptr sendable) -> frc::ComplexWidget& { - if (!sendable) { - throw FRC_MakeError(err::NullParameter, "{}", "value"); - } - - // convert key to a raw string so that we can create a StringRef - Py_ssize_t raw_size; - const char *raw_str = PyUnicode_AsUTF8AndSize(key.ptr(), &raw_size); - if (raw_str == NULL) { - throw py::error_already_set(); - } - - std::string_view keyRef(raw_str, raw_size); - auto &rval = self->Add(keyRef, *sendable); - - // this comes after the Add to ensure that the original object doesn't die - // while Add is called - rpy::addShuffleboardData(key, sendable); - - return rval; - } - std::string_view, const cs::VideoSource&: - ignore: true - wpi::Sendable&: - return_value_policy: reference_internal - param_override: - sendable: - name: defaultValue - cpp_code: | - [](ShuffleboardContainer *self, std::shared_ptr value) -> frc::ComplexWidget& { - auto &rval = self->Add(*value); - // this comes after the PutData to ensure that the original object doesn't die - // while PutData is called - auto name = wpi::SendableRegistry::GetName(value.get()); - if (!name.empty()) { - py::str key(name); - rpy::addShuffleboardData(key, value); - } - return rval; - } - const cs::VideoSource&: - ignore: true - std::string_view, const nt::Value&: - return_value_policy: reference_internal - std::string_view, bool: - return_value_policy: reference_internal - std::string_view, double: - return_value_policy: reference_internal - std::string_view, float: - return_value_policy: reference_internal - std::string_view, int: - return_value_policy: reference_internal - std::string_view, std::string_view: - return_value_policy: reference_internal - std::string_view, const char*: - ignore: true - std::string_view, std::span: - return_value_policy: reference_internal - std::string_view, std::span: - return_value_policy: reference_internal - std::string_view, std::span: - return_value_policy: reference_internal - std::string_view, std::span: - return_value_policy: reference_internal - std::string_view, std::span: - return_value_policy: reference_internal - AddCamera: - ignore: true # AddCamera is broken when DYNAMIC_CAMERA_SERVER is defined - AddString: - return_value_policy: reference_internal - AddNumber: - return_value_policy: reference_internal - AddDouble: - return_value_policy: reference_internal - AddFloat: - return_value_policy: reference_internal - AddInteger: - return_value_policy: reference_internal - AddBoolean: - return_value_policy: reference_internal - AddStringArray: - return_value_policy: reference_internal - AddNumberArray: - return_value_policy: reference_internal - AddDoubleArray: - return_value_policy: reference_internal - AddFloatArray: - return_value_policy: reference_internal - AddIntegerArray: - return_value_policy: reference_internal - AddBooleanArray: - return_value_policy: reference_internal - AddRaw: - overloads: - std::string_view, std::function ()>: - return_value_policy: reference_internal - std::string_view, std::string_view, std::function ()>: - return_value_policy: reference_internal - AddPersistent: - overloads: - std::string_view, const nt::Value&: - return_value_policy: reference_internal - std::string_view, bool: - return_value_policy: reference_internal - std::string_view, double: - return_value_policy: reference_internal - std::string_view, float: - return_value_policy: reference_internal - std::string_view, int: - return_value_policy: reference_internal - std::string_view, std::string_view: - return_value_policy: reference_internal - std::string_view, std::span: - return_value_policy: reference_internal - std::string_view, std::span: - return_value_policy: reference_internal - std::string_view, std::span: - return_value_policy: reference_internal - std::string_view, std::span: - return_value_policy: reference_internal - std::string_view, std::span: - return_value_policy: reference_internal - EnableIfActuator: - DisableIfActuator: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardEventImportance.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardEventImportance.yml deleted file mode 100644 index 3fabb79b..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardEventImportance.yml +++ /dev/null @@ -1,5 +0,0 @@ - -enums: - ShuffleboardEventImportance: -functions: - ShuffleboardEventImportanceName: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardInstance.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardInstance.yml deleted file mode 100644 index 523c5401..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardInstance.yml +++ /dev/null @@ -1,20 +0,0 @@ - -extra_includes: -- networktables/NetworkTableInstance.h - -classes: - frc::detail::ShuffleboardInstance: - rename: _ShuffleboardInstance - base_qualnames: - ShuffleboardRoot: frc::ShuffleboardRoot - methods: - ShuffleboardInstance: - GetTab: - return_value_policy: reference_internal - Update: - EnableActuatorWidgets: - DisableActuatorWidgets: - SelectTab: - overloads: - int: - std::string_view: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardLayout.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardLayout.yml deleted file mode 100644 index 7c25215f..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardLayout.yml +++ /dev/null @@ -1,8 +0,0 @@ - -classes: - frc::ShuffleboardLayout: - # virtual base issue: robotpy-build/166 - force_no_trampoline: true - methods: - ShuffleboardLayout: - BuildInto: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardRoot.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardRoot.yml deleted file mode 100644 index 1c527957..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardRoot.yml +++ /dev/null @@ -1,17 +0,0 @@ - -extra_includes: -- frc/shuffleboard/ShuffleboardTab.h - -classes: - frc::ShuffleboardRoot: - rename: _ShuffleboardRoot - methods: - GetTab: - return_value_policy: reference_internal - Update: - EnableActuatorWidgets: - DisableActuatorWidgets: - SelectTab: - overloads: - int: - std::string_view: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardTab.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardTab.yml deleted file mode 100644 index 1fd20318..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardTab.yml +++ /dev/null @@ -1,13 +0,0 @@ - -extra_includes: -- frc/shuffleboard/ShuffleboardRoot.h - -classes: - frc::ShuffleboardTab: - # virtual base issue: robotpy-build/166 - force_no_trampoline: true - methods: - ShuffleboardTab: - return_value_policy: reference_internal - GetRoot: - BuildInto: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardValue.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardValue.yml deleted file mode 100644 index 99e1e246..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardValue.yml +++ /dev/null @@ -1,12 +0,0 @@ - -classes: - frc::ShuffleboardValue: - # virtual base issue: robotpy-build/166 - force_no_trampoline: true - methods: - ShuffleboardValue: - ignore: true - GetTitle: - BuildInto: - EnableIfActuator: - DisableIfActuator: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardWidget.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardWidget.yml deleted file mode 100644 index 3683843e..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/ShuffleboardWidget.yml +++ /dev/null @@ -1,79 +0,0 @@ - -extra_includes: -- frc/shuffleboard/ShuffleboardContainer.h - -functions: - GetStringForWidgetType: - rename: _getStringForWidgetType -classes: - frc::ShuffleboardWidget: - # virtual base issue: robotpy-build/166 - force_no_trampoline: true - template_params: - - Derived - methods: - ShuffleboardWidget: - ignore: true - WithWidget: - overloads: - BuiltInWidgets: - return_value_policy: reference_internal - const WidgetType&: - return_value_policy: reference_internal - std::string_view: - return_value_policy: reference_internal - -templates: - _SimpleWidget: - qualname: frc::ShuffleboardWidget - params: - - frc::SimpleWidget - _ComplexWidget: - qualname: frc::ShuffleboardWidget - params: - - frc::ComplexWidget - - _SuppliedValueWidget_string: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget - _SuppliedValueWidget_double: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget - _SuppliedValueWidget_float: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget - _SuppliedValueWidget_integer: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget - _SuppliedValueWidget_bool: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget - _SuppliedValueWidget_vector_string: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget> - _SuppliedValueWidget_vector_double: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget> - _SuppliedValueWidget_vector_float: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget> - _SuppliedValueWidget_vector_int: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget> - _SuppliedValueWidget_vector_bool: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget> - _SuppliedValueWidget_vector_raw: - qualname: frc::ShuffleboardWidget - params: - - frc::SuppliedValueWidget> diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/SimpleWidget.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/SimpleWidget.yml deleted file mode 100644 index 32d06177..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/SimpleWidget.yml +++ /dev/null @@ -1,17 +0,0 @@ - -extra_includes: -- frc/shuffleboard/ShuffleboardContainer.h - -classes: - frc::SimpleWidget: - # virtual base issue: robotpy-build/166 - force_no_trampoline: true - methods: - SimpleWidget: - GetEntry: - overloads: - '': - return_value_policy: reference_internal - std::string_view: - return_value_policy: reference_internal - BuildInto: diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/SuppliedValueWidget.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/SuppliedValueWidget.yml deleted file mode 100644 index 9792610f..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/SuppliedValueWidget.yml +++ /dev/null @@ -1,58 +0,0 @@ - -classes: - frc::SuppliedValueWidget: - # virtual base issue: robotpy-build/166 - force_no_trampoline: true - template_params: - - T - methods: - SuppliedValueWidget: - ignore: true - BuildInto: - - -templates: - SuppliedStringValueWidget: - qualname: frc::SuppliedValueWidget - params: - - std::string - SuppliedDoubleValueWidget: - qualname: frc::SuppliedValueWidget - params: - - double - SuppliedFloatValueWidget: - qualname: frc::SuppliedValueWidget - params: - - float - SuppliedIntegerValueWidget: - qualname: frc::SuppliedValueWidget - params: - - int64_t - SuppliedBoolValueWidget: - qualname: frc::SuppliedValueWidget - params: - - bool - SuppliedStringListValueWidget: - qualname: frc::SuppliedValueWidget - params: - - std::vector - SuppliedDoubleListValueWidget: - qualname: frc::SuppliedValueWidget - params: - - std::vector - SuppliedFloatListValueWidget: - qualname: frc::SuppliedValueWidget - params: - - std::vector - SuppliedIntListValueWidget: - qualname: frc::SuppliedValueWidget - params: - - std::vector - SuppliedBoolListValueWidget: - qualname: frc::SuppliedValueWidget - params: - - std::vector - SuppliedRawValueWidget: - qualname: frc::SuppliedValueWidget - params: - - std::vector diff --git a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/WidgetType.yml b/subprojects/robotpy-wpilib/semiwrap/shuffleboard/WidgetType.yml deleted file mode 100644 index 63e5b6ce..00000000 --- a/subprojects/robotpy-wpilib/semiwrap/shuffleboard/WidgetType.yml +++ /dev/null @@ -1,6 +0,0 @@ - -classes: - frc::WidgetType: - methods: - WidgetType: - GetWidgetName: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/ADXL345Sim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/ADXL345Sim.yml index d80b04f6..d559f831 100644 --- a/subprojects/robotpy-wpilib/semiwrap/simulation/ADXL345Sim.yml +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/ADXL345Sim.yml @@ -1,7 +1,6 @@ extra_includes: - frc/ADXL345_I2C.h -- frc/ADXL345_SPI.h classes: frc::sim::ADXL345Sim: @@ -9,7 +8,6 @@ classes: ADXL345Sim: overloads: const ADXL345_I2C&: - const ADXL345_SPI&: SetX: SetY: SetZ: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/PWMMotorControllerSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/PWMMotorControllerSim.yml new file mode 100644 index 00000000..867e88f4 --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/PWMMotorControllerSim.yml @@ -0,0 +1,10 @@ +--- + +classes: + frc::sim::PWMMotorControllerSim: + methods: + PWMMotorControllerSim: + overloads: + const PWMMotorController&: + int: + GetSpeed: diff --git a/subprojects/robotpy-wpilib/semiwrap/simulation/ServoSim.yml b/subprojects/robotpy-wpilib/semiwrap/simulation/ServoSim.yml new file mode 100644 index 00000000..7aafd747 --- /dev/null +++ b/subprojects/robotpy-wpilib/semiwrap/simulation/ServoSim.yml @@ -0,0 +1,11 @@ +--- + +classes: + frc::sim::ServoSim: + methods: + ServoSim: + overloads: + const Servo&: + int: + GetPosition: + GetAngle: diff --git a/subprojects/robotpy-wpilib/tests/test_wpilib.py b/subprojects/robotpy-wpilib/tests/test_wpilib.py index 1322b976..2882de31 100644 --- a/subprojects/robotpy-wpilib/tests/test_wpilib.py +++ b/subprojects/robotpy-wpilib/tests/test_wpilib.py @@ -41,7 +41,3 @@ def test_motorcontrollergroup_error(): TypeError, match=re.escape("Argument 1 must be a MotorController (got '1')") ): wpilib.MotorControllerGroup(1) - - -def test_adis_16470(): - wpilib.ADIS16470_IMU() diff --git a/subprojects/robotpy-wpilib/wpilib/__init__.py b/subprojects/robotpy-wpilib/wpilib/__init__.py index fd50fc34..42e5c03e 100644 --- a/subprojects/robotpy-wpilib/wpilib/__init__.py +++ b/subprojects/robotpy-wpilib/wpilib/__init__.py @@ -5,39 +5,25 @@ # autogenerated by 'semiwrap create-imports wpilib wpilib._wpilib' from ._wpilib import ( - ADIS16448_IMU, - ADIS16470_IMU, ADXL345_I2C, - ADXL345_SPI, - ADXL362, - ADXRS450_Gyro, AddressableLED, Alert, AnalogAccelerometer, AnalogEncoder, AnalogGyro, AnalogInput, - AnalogOutput, AnalogPotentiometer, - AnalogTrigger, - AnalogTriggerOutput, - AnalogTriggerType, - BuiltInAccelerometer, CAN, - CANData, CANStatus, Color, Color8Bit, Compressor, CompressorConfigType, - Counter, DMC60, DSControlWord, DataLogManager, - DigitalGlitchFilter, DigitalInput, DigitalOutput, - DigitalSource, DoubleSolenoid, DriverStation, DutyCycle, @@ -49,15 +35,14 @@ IterativeRobotBase, Jaguar, Joystick, + Koors40, LEDPattern, - LiveWindow, Mechanism2d, MechanismLigament2d, MechanismObject2d, MechanismRoot2d, MotorControllerGroup, MotorSafety, - NidecBrushless, Notifier, PS4Controller, PS5Controller, @@ -75,14 +60,11 @@ PneumaticsModuleType, PowerDistribution, Preferences, - RadioLEDState, - Relay, RobotBase, RobotController, RobotState, RuntimeType, SD540, - SPI, SendableBuilderImpl, SendableChooser, SendableChooserBase, @@ -93,14 +75,14 @@ SmartDashboard, Solenoid, Spark, + SparkMini, StadiaController, - SynchronousInterrupt, + SystemServer, Talon, TimedRobot, Timer, TimesliceRobot, Tracer, - Ultrasonic, Victor, VictorSP, Watchdog, @@ -115,39 +97,25 @@ ) __all__ = [ - "ADIS16448_IMU", - "ADIS16470_IMU", "ADXL345_I2C", - "ADXL345_SPI", - "ADXL362", - "ADXRS450_Gyro", "AddressableLED", "Alert", "AnalogAccelerometer", "AnalogEncoder", "AnalogGyro", "AnalogInput", - "AnalogOutput", "AnalogPotentiometer", - "AnalogTrigger", - "AnalogTriggerOutput", - "AnalogTriggerType", - "BuiltInAccelerometer", "CAN", - "CANData", "CANStatus", "Color", "Color8Bit", "Compressor", "CompressorConfigType", - "Counter", "DMC60", "DSControlWord", "DataLogManager", - "DigitalGlitchFilter", "DigitalInput", "DigitalOutput", - "DigitalSource", "DoubleSolenoid", "DriverStation", "DutyCycle", @@ -159,15 +127,14 @@ "IterativeRobotBase", "Jaguar", "Joystick", + "Koors40", "LEDPattern", - "LiveWindow", "Mechanism2d", "MechanismLigament2d", "MechanismObject2d", "MechanismRoot2d", "MotorControllerGroup", "MotorSafety", - "NidecBrushless", "Notifier", "PS4Controller", "PS5Controller", @@ -185,14 +152,11 @@ "PneumaticsModuleType", "PowerDistribution", "Preferences", - "RadioLEDState", - "Relay", "RobotBase", "RobotController", "RobotState", "RuntimeType", "SD540", - "SPI", "SendableBuilderImpl", "SendableChooser", "SendableChooserBase", @@ -203,14 +167,14 @@ "SmartDashboard", "Solenoid", "Spark", + "SparkMini", "StadiaController", - "SynchronousInterrupt", + "SystemServer", "Talon", "TimedRobot", "Timer", "TimesliceRobot", "Tracer", - "Ultrasonic", "Victor", "VictorSP", "Watchdog", diff --git a/subprojects/robotpy-wpilib/wpilib/counter/__init__.py b/subprojects/robotpy-wpilib/wpilib/counter/__init__.py index eddbdaa6..756950c3 100644 --- a/subprojects/robotpy-wpilib/wpilib/counter/__init__.py +++ b/subprojects/robotpy-wpilib/wpilib/counter/__init__.py @@ -1,16 +1,6 @@ from . import _init__counter # autogenerated by 'semiwrap create-imports wpilib.counter wpilib.counter._counter' -from ._counter import ( - EdgeConfiguration, - ExternalDirectionCounter, - Tachometer, - UpDownCounter, -) +from ._counter import EdgeConfiguration, Tachometer, UpDownCounter -__all__ = [ - "EdgeConfiguration", - "ExternalDirectionCounter", - "Tachometer", - "UpDownCounter", -] +__all__ = ["EdgeConfiguration", "Tachometer", "UpDownCounter"] diff --git a/subprojects/robotpy-wpilib/wpilib/shuffleboard/ShuffleboardData.cpp b/subprojects/robotpy-wpilib/wpilib/shuffleboard/ShuffleboardData.cpp deleted file mode 100644 index ba09b5f9..00000000 --- a/subprojects/robotpy-wpilib/wpilib/shuffleboard/ShuffleboardData.cpp +++ /dev/null @@ -1,43 +0,0 @@ - -#include "ShuffleboardData.h" - -namespace rpy { - -// -// Ensures that python objects added to the Shuffleboard have at least one -// reference to them -// -// All functions here must be called with the GIL held -// - -static py::dict &getShuffleboardData() { - static py::dict data; - return data; -} - -void addShuffleboardData(py::str &key, std::shared_ptr data) { - auto &sdData = getShuffleboardData(); - sdData[key] = py::cast(data); -} - -void clearShuffleboardData() { - auto &sdData = getShuffleboardData(); - if (sdData) { - sdData.clear(); - } -} - -void destroyShuffleboardData() { - auto &sdData = getShuffleboardData(); - if (sdData) { - sdData.clear(); - // force the dictionary to be deleted otherwise it'll crash when libc++ - // is unwinding static objects after interpreter destruction - sdData.dec_ref(); - // release our reference to this otherwise the destructor will try to - // delete a non-existant PyObject* after interpreter destruction - sdData.release(); - } -} - -} // namespace rpy diff --git a/subprojects/robotpy-wpilib/wpilib/shuffleboard/ShuffleboardData.h b/subprojects/robotpy-wpilib/wpilib/shuffleboard/ShuffleboardData.h deleted file mode 100644 index df17d365..00000000 --- a/subprojects/robotpy-wpilib/wpilib/shuffleboard/ShuffleboardData.h +++ /dev/null @@ -1,17 +0,0 @@ - -#pragma once - -#include -#include - -namespace rpy { - -// -// These functions must be called with the GIL held -// - -void addShuffleboardData(py::str &key, std::shared_ptr data); -void clearShuffleboardData(); -void destroyShuffleboardData(); - -} // namespace rpy \ No newline at end of file diff --git a/subprojects/robotpy-wpilib/wpilib/shuffleboard/__init__.py b/subprojects/robotpy-wpilib/wpilib/shuffleboard/__init__.py deleted file mode 100644 index deac6153..00000000 --- a/subprojects/robotpy-wpilib/wpilib/shuffleboard/__init__.py +++ /dev/null @@ -1,60 +0,0 @@ -from . import _init__shuffleboard - -# autogenerated by 'semiwrap create-imports wpilib.shuffleboard wpilib.shuffleboard._shuffleboard' -from ._shuffleboard import ( - BuiltInLayouts, - BuiltInWidgets, - ComplexWidget, - LayoutType, - Shuffleboard, - ShuffleboardComponentBase, - ShuffleboardContainer, - ShuffleboardEventImportance, - ShuffleboardLayout, - ShuffleboardTab, - ShuffleboardValue, - SimpleWidget, - SuppliedBoolListValueWidget, - SuppliedBoolValueWidget, - SuppliedDoubleListValueWidget, - SuppliedDoubleValueWidget, - SuppliedFloatListValueWidget, - SuppliedFloatValueWidget, - SuppliedIntListValueWidget, - SuppliedIntegerValueWidget, - SuppliedRawValueWidget, - SuppliedStringListValueWidget, - SuppliedStringValueWidget, - WidgetType, - shuffleboardEventImportanceName, -) - -__all__ = [ - "BuiltInLayouts", - "BuiltInWidgets", - "ComplexWidget", - "LayoutType", - "Shuffleboard", - "ShuffleboardComponentBase", - "ShuffleboardContainer", - "ShuffleboardEventImportance", - "ShuffleboardLayout", - "ShuffleboardTab", - "ShuffleboardValue", - "SimpleWidget", - "SuppliedBoolListValueWidget", - "SuppliedBoolValueWidget", - "SuppliedDoubleListValueWidget", - "SuppliedDoubleValueWidget", - "SuppliedFloatListValueWidget", - "SuppliedFloatValueWidget", - "SuppliedIntListValueWidget", - "SuppliedIntegerValueWidget", - "SuppliedRawValueWidget", - "SuppliedStringListValueWidget", - "SuppliedStringValueWidget", - "WidgetType", - "shuffleboardEventImportanceName", -] - -del _init__shuffleboard diff --git a/subprojects/robotpy-wpilib/wpilib/shuffleboard/shuffleboard.cpp b/subprojects/robotpy-wpilib/wpilib/shuffleboard/shuffleboard.cpp deleted file mode 100644 index bb988476..00000000 --- a/subprojects/robotpy-wpilib/wpilib/shuffleboard/shuffleboard.cpp +++ /dev/null @@ -1,16 +0,0 @@ - -#include "semiwrap_init.wpilib.shuffleboard._shuffleboard.hpp" -#include "ShuffleboardData.h" - -SEMIWRAP_PYBIND11_MODULE(m) -{ - initWrapper(m); - - // ensure that the shuffleboard data is released when python shuts down - static int unused; // the capsule needs something to reference - py::capsule cleanup(&unused, [](void *) { - rpy::destroyShuffleboardData(); - }); - m.add_object("_sbd_cleanup", cleanup); - m.def("_clearShuffleboardData", &rpy::clearShuffleboardData); -} diff --git a/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py b/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py index 1c1b6c5c..fa55e172 100644 --- a/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py +++ b/subprojects/robotpy-wpilib/wpilib/simulation/__init__.py @@ -5,19 +5,11 @@ # autogenerated by 'semiwrap create-imports wpilib.simulation wpilib.simulation._simulation' from ._simulation import ( - ADIS16448_IMUSim, - ADIS16470_IMUSim, ADXL345Sim, - ADXL362Sim, - ADXRS450_GyroSim, AddressableLEDSim, AnalogEncoderSim, - AnalogGyroSim, AnalogInputSim, - AnalogOutputSim, - AnalogTriggerSim, BatterySim, - BuiltInAccelerometerSim, CTREPCMSim, CallbackStore, DCMotorSim, @@ -41,20 +33,19 @@ LinearSystemSim_2_2_2, PS4ControllerSim, PS5ControllerSim, + PWMMotorControllerSim, PWMSim, PneumaticsBaseSim, PowerDistributionSim, REVPHSim, - RelaySim, RoboRioSim, - SPIAccelerometerSim, SendableChooserSim, + ServoSim, SharpIRSim, SimDeviceSim, SingleJointedArmSim, SolenoidSim, StadiaControllerSim, - UltrasonicSim, XboxControllerSim, getProgramStarted, isTimingPaused, @@ -69,19 +60,11 @@ ) __all__ = [ - "ADIS16448_IMUSim", - "ADIS16470_IMUSim", "ADXL345Sim", - "ADXL362Sim", - "ADXRS450_GyroSim", "AddressableLEDSim", "AnalogEncoderSim", - "AnalogGyroSim", "AnalogInputSim", - "AnalogOutputSim", - "AnalogTriggerSim", "BatterySim", - "BuiltInAccelerometerSim", "CTREPCMSim", "CallbackStore", "DCMotorSim", @@ -105,20 +88,19 @@ "LinearSystemSim_2_2_2", "PS4ControllerSim", "PS5ControllerSim", + "PWMMotorControllerSim", "PWMSim", "PneumaticsBaseSim", "PowerDistributionSim", "REVPHSim", - "RelaySim", "RoboRioSim", - "SPIAccelerometerSim", "SendableChooserSim", + "ServoSim", "SharpIRSim", "SimDeviceSim", "SingleJointedArmSim", "SolenoidSim", "StadiaControllerSim", - "UltrasonicSim", "XboxControllerSim", "getProgramStarted", "isTimingPaused", diff --git a/subprojects/robotpy-wpilib/wpilib/simulation/simulation.cpp b/subprojects/robotpy-wpilib/wpilib/simulation/simulation.cpp index 9d5a7d09..8a44535a 100644 --- a/subprojects/robotpy-wpilib/wpilib/simulation/simulation.cpp +++ b/subprojects/robotpy-wpilib/wpilib/simulation/simulation.cpp @@ -4,8 +4,6 @@ #ifndef __FRC_ROBORIO__ namespace frc::impl { -void ResetLiveWindow(); -void ResetShuffleboardInstance(); void ResetSmartDashboardInstance(); void ResetMotorSafety(); } // namespace frc::impl @@ -16,8 +14,6 @@ void ResetSendableRegistry(); void resetWpilibSimulationData() { frc::impl::ResetSmartDashboardInstance(); - frc::impl::ResetShuffleboardInstance(); - frc::impl::ResetLiveWindow(); frc::impl::ResetMotorSafety(); wpi::impl::ResetSendableRegistry(); } @@ -37,13 +33,4 @@ SEMIWRAP_PYBIND11_MODULE(m) { m.def("_resetWpilibSimulationData", &resetWpilibSimulationData, release_gil()); m.def("_resetMotorSafety", &resetMotorSafety, release_gil()); - -#ifndef __FRC_ROBORIO__ - // ensure that the shuffleboard data is released when python shuts down - static int unused; // the capsule needs something to reference - py::capsule cleanup(&unused, [](void *) { - frc::impl::ResetShuffleboardInstance(); - }); - m.add_object("_sf_cleanup", cleanup); -#endif } diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.cpp b/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.cpp index e6ef3abe..7fe02391 100644 --- a/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.cpp +++ b/subprojects/robotpy-wpilib/wpilib/src/rpy/MotorControllerGroup.cpp @@ -57,7 +57,6 @@ void PyMotorControllerGroup::StopMotor() { void PyMotorControllerGroup::InitSendable(wpi::SendableBuilder& builder) { builder.SetSmartDashboardType("Motor Controller"); builder.SetActuator(true); - builder.SetSafeState([=, this]() { StopMotor(); }); builder.AddDoubleProperty("Value", [=, this]() { return Get(); }, [=, this](double value) { Set(value); }); } diff --git a/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.cpp b/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.cpp index 952292b1..2e3ced01 100644 --- a/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.cpp +++ b/subprojects/robotpy-wpilib/wpilib/src/rpy/Notifier.cpp @@ -7,7 +7,6 @@ #include #include -#include #include #include From 726cbb1c2909c3709acbfb454bd0dd688389391b Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sun, 25 May 2025 01:43:34 -0400 Subject: [PATCH 9/9] Disable roboRIO CI - TODO: add systemcore CI --- .github/workflows/dist.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 6b74011d..60ffb006 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -76,9 +76,9 @@ jobs: max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }} fail-fast: true matrix: - os: ["ubuntu-22.04", "ubuntu-22.04-arm", "macos-14", "windows-2022"] + os: ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-14", "windows-2022"] include: - - os: ubuntu-22.04-arm + - os: ubuntu-24.04-arm container: python:3.13-bookworm container: ${{ matrix.container }} @@ -89,7 +89,7 @@ jobs: fetch-depth: 0 - name: Install python - if: matrix.os != 'ubuntu-22.04-arm' + if: matrix.os != 'ubuntu-24.04-arm' uses: actions/setup-python@v5 with: python-version: '3.13' @@ -121,7 +121,7 @@ jobs: fail-fast: true matrix: os: - - "ubuntu-22.04" + - "ubuntu-24.04" - "macos-13" # x86_64 - "macos-14" # arm64 - "windows-2022" @@ -132,13 +132,13 @@ jobs: - '3.12' - '3.13' include: - - os: ubuntu-22.04-arm + - os: ubuntu-24.04-arm python_version: '3.11' container: python:3.11-bookworm - - os: ubuntu-22.04-arm + - os: ubuntu-24.04-arm python_version: '3.12' container: python:3.12-bookworm - - os: ubuntu-22.04-arm + - os: ubuntu-24.04-arm python_version: '3.13' container: python:3.13-bookworm @@ -150,7 +150,7 @@ jobs: fetch-depth: 0 - name: Install python - if: matrix.os != 'ubuntu-22.04-arm' + if: matrix.os != 'ubuntu-24.04-arm' uses: actions/setup-python@v5 with: python-version: ${{ matrix.python_version }} @@ -167,7 +167,7 @@ jobs: - name: Install libgl run: apt-get update && apt-get install -y libgl1 - if: matrix.os == 'ubuntu-22.04-arm' + if: matrix.os == 'ubuntu-24.04-arm' - name: Setup MSVC uses: bus1/cabuild/action/msdevshell@e22aba57d6e74891d059d66501b6b5aed8123c4d # v1 @@ -223,9 +223,9 @@ jobs: max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }} matrix: os: - - container: wpilib/roborio-cross-ubuntu:2025-22.04-py313 - name: roborio - - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py313 + # - container: wpilib/roborio-cross-ubuntu:2025-22.04-py313 + # name: roborio + - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py313 name: raspbian container: @@ -261,17 +261,17 @@ jobs: max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }} matrix: os: - - container: wpilib/roborio-cross-ubuntu:2025-22.04-py313 - name: roborio - base: roborio + # - container: wpilib/roborio-cross-ubuntu:2025-22.04-py313 + # name: roborio + # base: roborio - - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py311 + - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py311 name: raspbian-py311 base: raspbian - - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py312 + - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py312 name: raspbian-py312 base: raspbian - - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py313 + - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py313 name: raspbian-py313 base: raspbian