From 49e84c6b52f5bf21799cd93024da81a37d753c5b Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 1 Nov 2025 13:28:05 -0400 Subject: [PATCH] [robotpy] Sync robotpy (#8318) Project import generated by Copybara. GitOrigin-RevId: f6818c55dda55da1226e47a05a22d30f7cc477f1 --- .../src/main/python/native-pyproject.toml | 12 +++--- apriltag/src/main/python/pyproject.toml | 18 ++++----- datalog/src/main/python/native-pyproject.toml | 8 ++-- datalog/src/main/python/pyproject.toml | 14 +++---- hal/src/main/python/native-pyproject.toml | 12 +++--- hal/src/main/python/pyproject.toml | 18 ++++----- hal/src/main/python/semiwrap/HALBase.yml | 2 - ntcore/src/main/python/native-pyproject.toml | 16 ++++---- ntcore/src/main/python/pyproject.toml | 22 +++++----- ntcore/src/test/python/test_api.py | 2 - ntcore/src/test/python/test_util.py | 8 ++-- .../src/main/python/native-pyproject.toml | 8 ++-- romiVendordep/src/main/python/pyproject.toml | 14 +++---- wpilibc/src/main/python/native-pyproject.toml | 24 +++++------ wpilibc/src/main/python/pyproject.toml | 33 +++++++-------- .../src/main/python/semiwrap/AnalogGyro.yml | 29 -------------- wpilibc/src/main/python/semiwrap/Color.yml | 2 +- .../main/python/semiwrap/DriverStation.yml | 1 - .../python/semiwrap/IterativeRobotBase.yml | 1 - .../main/python/semiwrap/RobotController.yml | 2 - wpilibc/src/main/python/semiwrap/Servo.yml | 15 ------- .../python/semiwrap/simulation/ServoSim.yml | 9 ----- wpilibc/src/main/python/wpilib/__init__.py | 4 -- .../main/python/wpilib/simulation/__init__.py | 2 - wpimath/src/main/python/native-pyproject.toml | 8 ++-- wpimath/src/main/python/pyproject.toml | 19 +++++---- wpimath/src/main/python/semiwrap/MathUtil.yml | 40 +++++++++---------- .../controls/DifferentialDriveFeedforward.yml | 3 ++ .../controls/HolonomicDriveController.yml | 23 ----------- .../main/python/semiwrap/geometry/Pose2d.yml | 2 - .../main/python/semiwrap/geometry/Pose3d.yml | 9 +---- .../python/semiwrap/geometry/Transform2d.yml | 1 + .../python/semiwrap/geometry/Transform3d.yml | 1 + .../semiwrap/geometry/Translation2d.yml | 4 ++ .../semiwrap/geometry/Translation3d.yml | 4 ++ .../main/python/semiwrap/geometry/Twist2d.yml | 1 + .../main/python/semiwrap/geometry/Twist3d.yml | 1 + wpimath/src/main/python/wpimath/__init__.py | 4 -- .../python/wpimath/controller/__init__.py | 4 +- .../main/python/wpimath/geometry/__init__.py | 2 - .../python/wpimath/interpolation/__init__.py | 2 +- .../python/wpimath/kinematics/__init__.py | 26 +++++++++++- wpimath/src/test/python/cpp/pyproject.toml | 3 ++ .../src/test/python/cpp/semiwrap/module.yml | 10 +++-- wpinet/src/main/python/native-pyproject.toml | 8 ++-- wpinet/src/main/python/pyproject.toml | 16 ++++---- wpiutil/src/main/python/examples/printlog.py | 2 +- wpiutil/src/main/python/native-pyproject.toml | 4 +- wpiutil/src/main/python/pyproject.toml | 12 +++--- .../src/main/python/native-pyproject.toml | 8 ++-- xrpVendordep/src/main/python/pyproject.toml | 18 ++++----- 51 files changed, 226 insertions(+), 285 deletions(-) delete mode 100644 wpilibc/src/main/python/semiwrap/AnalogGyro.yml delete mode 100644 wpilibc/src/main/python/semiwrap/Servo.yml delete mode 100644 wpilibc/src/main/python/semiwrap/simulation/ServoSim.yml delete mode 100644 wpimath/src/main/python/semiwrap/controls/HolonomicDriveController.yml diff --git a/apriltag/src/main/python/native-pyproject.toml b/apriltag/src/main/python/native-pyproject.toml index 4d6a434ea0..ba1bded93e 100644 --- a/apriltag/src/main/python/native-pyproject.toml +++ b/apriltag/src/main/python/native-pyproject.toml @@ -4,19 +4,19 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a2", - "robotpy-native-wpimath==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpimath==0.0.0", ] [project] name = "robotpy-native-apriltag" -version = "2027.0.0a2" +version = "0.0.0" description = "WPILib AprilTag Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a2", - "robotpy-native-wpimath==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpimath==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -26,7 +26,7 @@ packages = ["src/native"] artifact_id = "apriltag-cpp" group_id = "edu.wpi.first.apriltag" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" extract_to = "src/native/apriltag" libs = ["apriltag"] diff --git a/apriltag/src/main/python/pyproject.toml b/apriltag/src/main/python/pyproject.toml index 03697cc231..5eed3fe586 100644 --- a/apriltag/src/main/python/pyproject.toml +++ b/apriltag/src/main/python/pyproject.toml @@ -1,27 +1,27 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.7", - "hatch-meson~=0.1.0b2", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-apriltag==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2", - "robotpy-wpimath==2027.0.0a2", + "robotpy-native-apriltag==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpimath==0.0.0", ] [project] name = "robotpy-apriltag" -version = "2027.0.0a2" +version = "0.0.0" 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==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2", - "robotpy-wpimath==2027.0.0a2", + "robotpy-native-apriltag==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpimath==0.0.0", ] [project.urls] diff --git a/datalog/src/main/python/native-pyproject.toml b/datalog/src/main/python/native-pyproject.toml index a10fb32e04..c9c1e733a1 100644 --- a/datalog/src/main/python/native-pyproject.toml +++ b/datalog/src/main/python/native-pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", ] [project] name = "robotpy-native-datalog" -version = "2027.0.0a2" +version = "0.0.0" description = "WPILib Utility Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -25,7 +25,7 @@ packages = ["src/native"] artifact_id = "datalog-cpp" group_id = "edu.wpi.first.datalog" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" extract_to = "src/native/datalog" libs = ["datalog"] diff --git a/datalog/src/main/python/pyproject.toml b/datalog/src/main/python/pyproject.toml index 206936f433..ba6afc01d3 100644 --- a/datalog/src/main/python/pyproject.toml +++ b/datalog/src/main/python/pyproject.toml @@ -1,24 +1,24 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.7", - "hatch-meson~=0.1.0b2", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", "hatchling", - "robotpy-native-datalog==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2" + "robotpy-native-datalog==0.0.0", + "robotpy-wpiutil==0.0.0" ] [project] name = "robotpy-wpilog" -version = "2027.0.0a2" +version = "0.0.0" 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.0a2", - "robotpy-wpiutil==2027.0.0a2" + "robotpy-native-datalog==0.0.0", + "robotpy-wpiutil==0.0.0" ] [project.urls] diff --git a/hal/src/main/python/native-pyproject.toml b/hal/src/main/python/native-pyproject.toml index ec538b5ff9..1d8be210b2 100644 --- a/hal/src/main/python/native-pyproject.toml +++ b/hal/src/main/python/native-pyproject.toml @@ -4,19 +4,19 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a2", - "robotpy-native-ntcore==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-ntcore==0.0.0", ] [project] name = "robotpy-native-wpihal" -version = "2027.0.0a2" +version = "0.0.0" description = "WPILib HAL implementation" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a2", - "robotpy-native-ntcore==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-ntcore==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -26,7 +26,7 @@ packages = ["src/native"] artifact_id = "hal-cpp" group_id = "edu.wpi.first.hal" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" extract_to = "src/native/wpihal" libs = ["wpiHal"] diff --git a/hal/src/main/python/pyproject.toml b/hal/src/main/python/pyproject.toml index 3b3e05a70b..8de92529ce 100644 --- a/hal/src/main/python/pyproject.toml +++ b/hal/src/main/python/pyproject.toml @@ -1,26 +1,26 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.7", - "hatch-meson~=0.1.0b2", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", "hatchling", - "pyntcore==2027.0.0a2", - "robotpy-native-wpihal==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2", + "pyntcore==0.0.0", + "robotpy-native-wpihal==0.0.0", + "robotpy-wpiutil==0.0.0", ] [project] name = "robotpy-hal" -version = "2027.0.0a2" +version = "0.0.0" description = "Binary wrapper for FRC HAL" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "pyntcore==2027.0.0a2", - "robotpy-native-wpihal==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2", + "pyntcore==0.0.0", + "robotpy-native-wpihal==0.0.0", + "robotpy-wpiutil==0.0.0", ] [project.urls] diff --git a/hal/src/main/python/semiwrap/HALBase.yml b/hal/src/main/python/semiwrap/HALBase.yml index 7a11cc5eef..d81d5ac322 100644 --- a/hal/src/main/python/semiwrap/HALBase.yml +++ b/hal/src/main/python/semiwrap/HALBase.yml @@ -5,8 +5,6 @@ enums: HAL_RuntimeType: functions: HAL_GetErrorMessage: - HAL_GetFPGAVersion: - HAL_GetFPGARevision: HAL_GetSerialNumber: param_override: serialNumber: diff --git a/ntcore/src/main/python/native-pyproject.toml b/ntcore/src/main/python/native-pyproject.toml index ce3dd6415c..29d4792de7 100644 --- a/ntcore/src/main/python/native-pyproject.toml +++ b/ntcore/src/main/python/native-pyproject.toml @@ -4,21 +4,21 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a2", - "robotpy-native-wpinet==2027.0.0a2", - "robotpy-native-datalog==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpinet==0.0.0", + "robotpy-native-datalog==0.0.0", ] [project] name = "robotpy-native-ntcore" -version = "2027.0.0a2" +version = "0.0.0" description = "WPILib NetworkTables Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a2", - "robotpy-native-wpinet==2027.0.0a2", - "robotpy-native-datalog==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpinet==0.0.0", + "robotpy-native-datalog==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -28,7 +28,7 @@ packages = ["src/native"] artifact_id = "ntcore-cpp" group_id = "edu.wpi.first.ntcore" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" extract_to = "src/native/ntcore" libs = ["ntcore"] diff --git a/ntcore/src/main/python/pyproject.toml b/ntcore/src/main/python/pyproject.toml index 36de800322..63b7654fa0 100644 --- a/ntcore/src/main/python/pyproject.toml +++ b/ntcore/src/main/python/pyproject.toml @@ -1,30 +1,30 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.7", - "hatch-meson~=0.1.0b2", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-ntcore==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2", - "robotpy-wpinet==2027.0.0a2", - "robotpy-wpilog==2027.0.0a2", + "robotpy-native-ntcore==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpinet==0.0.0", + "robotpy-wpilog==0.0.0", ] [project] name = "pyntcore" -version = "2027.0.0a2" +version = "0.0.0" 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==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2", - "robotpy-wpinet==2027.0.0a2", - "robotpy-wpilog==2027.0.0a2", + "robotpy-native-ntcore==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpinet==0.0.0", + "robotpy-wpilog==0.0.0", ] [project.urls] diff --git a/ntcore/src/test/python/test_api.py b/ntcore/src/test/python/test_api.py index 2375a2e253..e799906800 100644 --- a/ntcore/src/test/python/test_api.py +++ b/ntcore/src/test/python/test_api.py @@ -4,8 +4,6 @@ # works correctly # -from __future__ import print_function - import pytest import logging diff --git a/ntcore/src/test/python/test_util.py b/ntcore/src/test/python/test_util.py index 9f5d08034c..fc0d35ec6c 100644 --- a/ntcore/src/test/python/test_util.py +++ b/ntcore/src/test/python/test_util.py @@ -27,7 +27,7 @@ from ntcore.util import ntproperty, ChooserControl def test_ntproperty(nt: NetworkTableInstance): - class Foo(object): + class Foo: robotTime = ntproperty( "/SmartDashboard/robotTime", 0.0, writeDefault=False, inst=nt ) @@ -85,14 +85,14 @@ def test_ntproperty(nt: NetworkTableInstance): def test_ntproperty_emptyarray(nt: NetworkTableInstance): with pytest.raises(TypeError): - class Foo1(object): + class Foo1: testArray = ntproperty( "/SmartDashboard/testArray", [], writeDefault=True, inst=nt ) with pytest.raises(TypeError): - class Foo2(object): + class Foo2: testArray = ntproperty( "/SmartDashboard/testArray", [], writeDefault=False, inst=nt ) @@ -106,7 +106,7 @@ def test_ntproperty_multitest(nt: NetworkTableInstance): pyfrc tests """ - class Foo(object): + class Foo: robotTime = ntproperty( "/SmartDashboard/robotTime", 0.0, writeDefault=False, inst=nt ) diff --git a/romiVendordep/src/main/python/native-pyproject.toml b/romiVendordep/src/main/python/native-pyproject.toml index 6da998c155..c3ef9dc83d 100644 --- a/romiVendordep/src/main/python/native-pyproject.toml +++ b/romiVendordep/src/main/python/native-pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpilib==2027.0.0a2", + "robotpy-native-wpilib==0.0.0", ] [project] name = "robotpy-native-romi" -version = "2027.0.0a2" +version = "0.0.0" description = "WPILib Romi support library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==2027.0.0a2", + "robotpy-native-wpilib==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -24,7 +24,7 @@ packages = ["src/native"] artifact_id = "romiVendordep-cpp" group_id = "edu.wpi.first.romiVendordep" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" extract_to = "src/native/romi" libs = ["romiVendordep"] diff --git a/romiVendordep/src/main/python/pyproject.toml b/romiVendordep/src/main/python/pyproject.toml index f35effbaad..872f0987e9 100644 --- a/romiVendordep/src/main/python/pyproject.toml +++ b/romiVendordep/src/main/python/pyproject.toml @@ -1,26 +1,26 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.7", - "hatch-meson~=0.1.0b2", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-romi==2027.0.0a2", - "wpilib==2027.0.0a2", + "robotpy-native-romi==0.0.0", + "wpilib==0.0.0", ] [project] name = "robotpy-romi" -version = "2027.0.0a2" +version = "0.0.0" description = "Binary wrapper for WPILib Romi Vendor library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-romi==2027.0.0a2", - "wpilib==2027.0.0a2" + "robotpy-native-romi==0.0.0", + "wpilib==0.0.0" ] [project.urls] diff --git a/wpilibc/src/main/python/native-pyproject.toml b/wpilibc/src/main/python/native-pyproject.toml index 6bce95d48e..852e1c70ad 100644 --- a/wpilibc/src/main/python/native-pyproject.toml +++ b/wpilibc/src/main/python/native-pyproject.toml @@ -4,25 +4,25 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a2", - "robotpy-native-wpinet==2027.0.0a2", - "robotpy-native-ntcore==2027.0.0a2", - "robotpy-native-wpimath==2027.0.0a2", - "robotpy-native-wpihal==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpinet==0.0.0", + "robotpy-native-ntcore==0.0.0", + "robotpy-native-wpimath==0.0.0", + "robotpy-native-wpihal==0.0.0", ] [project] name = "robotpy-native-wpilib" -version = "2027.0.0a2" +version = "0.0.0" description = "WPILib Robotics Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a2", - "robotpy-native-wpinet==2027.0.0a2", - "robotpy-native-ntcore==2027.0.0a2", - "robotpy-native-wpimath==2027.0.0a2", - "robotpy-native-wpihal==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", + "robotpy-native-wpinet==0.0.0", + "robotpy-native-ntcore==0.0.0", + "robotpy-native-wpimath==0.0.0", + "robotpy-native-wpihal==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -32,7 +32,7 @@ packages = ["src/native"] artifact_id = "wpilibc-cpp" group_id = "edu.wpi.first.wpilibc" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" extract_to = "src/native/wpilib" libs = ["wpilibc"] diff --git a/wpilibc/src/main/python/pyproject.toml b/wpilibc/src/main/python/pyproject.toml index 8942678be3..5b8af56e55 100644 --- a/wpilibc/src/main/python/pyproject.toml +++ b/wpilibc/src/main/python/pyproject.toml @@ -1,38 +1,38 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.7", - "hatch-meson~=0.1.0b2", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-wpilib==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2", - "robotpy-wpimath==2027.0.0a2", - "robotpy-hal==2027.0.0a2", - "pyntcore==2027.0.0a2", + "robotpy-native-wpilib==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpimath==0.0.0", + "robotpy-hal==0.0.0", + "pyntcore==0.0.0", ] [project] name = "wpilib" -version = "2027.0.0a2" +version = "0.0.0" description = "Binary wrapper for FRC WPILib" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2", - "robotpy-wpimath==2027.0.0a2", - "robotpy-hal==2027.0.0a2", - "pyntcore==2027.0.0a2", - "robotpy-cli~=2024.0b" + "robotpy-native-wpilib==0.0.0", + "robotpy-wpiutil==0.0.0", + "robotpy-wpimath==0.0.0", + "robotpy-hal==0.0.0", + "pyntcore==0.0.0", + "robotpy-cli~=2027.0.0a1" ] [project.urls] "Source code" = "https://github.com/robotpy/mostrobotpy" -[project.entry-points.robotpy] +[project.entry-points."robotpy_cli.2027"] run = "wpilib._impl.start:Main" @@ -97,7 +97,6 @@ AddressableLED = "frc/AddressableLED.h" Alert = "frc/Alert.h" AnalogAccelerometer = "frc/AnalogAccelerometer.h" AnalogEncoder = "frc/AnalogEncoder.h" -AnalogGyro = "frc/AnalogGyro.h" AnalogInput = "frc/AnalogInput.h" AnalogPotentiometer = "frc/AnalogPotentiometer.h" CAN = "frc/CAN.h" @@ -136,7 +135,6 @@ RobotState = "frc/RobotState.h" RuntimeType = "frc/RuntimeType.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" @@ -274,7 +272,6 @@ PWMMotorControllerSim = "frc/simulation/PWMMotorControllerSim.h" REVPHSim = "frc/simulation/REVPHSim.h" RoboRioSim = "frc/simulation/RoboRioSim.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" diff --git a/wpilibc/src/main/python/semiwrap/AnalogGyro.yml b/wpilibc/src/main/python/semiwrap/AnalogGyro.yml deleted file mode 100644 index cee36dfc8f..0000000000 --- a/wpilibc/src/main/python/semiwrap/AnalogGyro.yml +++ /dev/null @@ -1,29 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h -- frc/AnalogInput.h - -classes: - frc::AnalogGyro: - ignored_bases: - - wpi::SendableHelper - methods: - AnalogGyro: - overloads: - int: - AnalogInput*: - ignore: true - std::shared_ptr: - int, int, double: - std::shared_ptr, int, double: - GetAngle: - GetRate: - GetCenter: - GetOffset: - SetSensitivity: - SetDeadband: - Reset: - InitGyro: - Calibrate: - GetRotation2d: - GetAnalogInput: - InitSendable: diff --git a/wpilibc/src/main/python/semiwrap/Color.yml b/wpilibc/src/main/python/semiwrap/Color.yml index 57317be742..450a6016f3 100644 --- a/wpilibc/src/main/python/semiwrap/Color.yml +++ b/wpilibc/src/main/python/semiwrap/Color.yml @@ -181,7 +181,7 @@ inline_code: | ^ (std::hash{}(self->green) << 1) ^ (std::hash{}(self->blue) << 2) ); - return h != -1 ? h : -2; + return h != static_cast(-1) ? h : -2; }) .def("__repr__", [](Color *self) { return "Color(" diff --git a/wpilibc/src/main/python/semiwrap/DriverStation.yml b/wpilibc/src/main/python/semiwrap/DriverStation.yml index 4dd5ee295d..27a9091085 100644 --- a/wpilibc/src/main/python/semiwrap/DriverStation.yml +++ b/wpilibc/src/main/python/semiwrap/DriverStation.yml @@ -42,7 +42,6 @@ classes: GetReplayNumber: GetAlliance: GetLocation: - WaitForDsConnection: GetMatchTime: GetBatteryVoltage: RefreshData: diff --git a/wpilibc/src/main/python/semiwrap/IterativeRobotBase.yml b/wpilibc/src/main/python/semiwrap/IterativeRobotBase.yml index a1c5587c4f..d13d6941cd 100644 --- a/wpilibc/src/main/python/semiwrap/IterativeRobotBase.yml +++ b/wpilibc/src/main/python/semiwrap/IterativeRobotBase.yml @@ -1,7 +1,6 @@ classes: frc::IterativeRobotBase: methods: - RobotInit: DriverStationConnected: DisabledInit: AutonomousInit: diff --git a/wpilibc/src/main/python/semiwrap/RobotController.yml b/wpilibc/src/main/python/semiwrap/RobotController.yml index 22ce23a2bd..eeaa85e4e3 100644 --- a/wpilibc/src/main/python/semiwrap/RobotController.yml +++ b/wpilibc/src/main/python/semiwrap/RobotController.yml @@ -9,8 +9,6 @@ classes: frc::RobotController: nodelete: true methods: - GetFPGAVersion: - GetFPGARevision: GetSerialNumber: GetComments: GetTeamNumber: diff --git a/wpilibc/src/main/python/semiwrap/Servo.yml b/wpilibc/src/main/python/semiwrap/Servo.yml deleted file mode 100644 index 93b46aac50..0000000000 --- a/wpilibc/src/main/python/semiwrap/Servo.yml +++ /dev/null @@ -1,15 +0,0 @@ -extra_includes: -- wpi/sendable/SendableBuilder.h - -classes: - frc::Servo: - ignored_bases: - - wpi::SendableHelper - methods: - Servo: - Set: - Get: - SetAngle: - GetAngle: - InitSendable: - GetChannel: diff --git a/wpilibc/src/main/python/semiwrap/simulation/ServoSim.yml b/wpilibc/src/main/python/semiwrap/simulation/ServoSim.yml deleted file mode 100644 index 57b3483fc2..0000000000 --- a/wpilibc/src/main/python/semiwrap/simulation/ServoSim.yml +++ /dev/null @@ -1,9 +0,0 @@ -classes: - frc::sim::ServoSim: - methods: - ServoSim: - overloads: - const Servo&: - int: - GetPosition: - GetAngle: diff --git a/wpilibc/src/main/python/wpilib/__init__.py b/wpilibc/src/main/python/wpilib/__init__.py index 8a6e799a7c..878ae63ff4 100644 --- a/wpilibc/src/main/python/wpilib/__init__.py +++ b/wpilibc/src/main/python/wpilib/__init__.py @@ -10,7 +10,6 @@ from ._wpilib import ( Alert, AnalogAccelerometer, AnalogEncoder, - AnalogGyro, AnalogInput, AnalogPotentiometer, CAN, @@ -71,7 +70,6 @@ from ._wpilib import ( SendableChooserBase, SensorUtil, SerialPort, - Servo, SharpIR, SmartDashboard, Solenoid, @@ -103,7 +101,6 @@ __all__ = [ "Alert", "AnalogAccelerometer", "AnalogEncoder", - "AnalogGyro", "AnalogInput", "AnalogPotentiometer", "CAN", @@ -164,7 +161,6 @@ __all__ = [ "SendableChooserBase", "SensorUtil", "SerialPort", - "Servo", "SharpIR", "SmartDashboard", "Solenoid", diff --git a/wpilibc/src/main/python/wpilib/simulation/__init__.py b/wpilibc/src/main/python/wpilib/simulation/__init__.py index fa55e172eb..3e3260b404 100644 --- a/wpilibc/src/main/python/wpilib/simulation/__init__.py +++ b/wpilibc/src/main/python/wpilib/simulation/__init__.py @@ -40,7 +40,6 @@ from ._simulation import ( REVPHSim, RoboRioSim, SendableChooserSim, - ServoSim, SharpIRSim, SimDeviceSim, SingleJointedArmSim, @@ -95,7 +94,6 @@ __all__ = [ "REVPHSim", "RoboRioSim", "SendableChooserSim", - "ServoSim", "SharpIRSim", "SimDeviceSim", "SingleJointedArmSim", diff --git a/wpimath/src/main/python/native-pyproject.toml b/wpimath/src/main/python/native-pyproject.toml index efd5da56e9..eb5b45b66f 100644 --- a/wpimath/src/main/python/native-pyproject.toml +++ b/wpimath/src/main/python/native-pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", ] [project] name = "robotpy-native-wpimath" -version = "2027.0.0a2" +version = "0.0.0" description = "WPILib Math Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -24,7 +24,7 @@ packages = ["src/native"] artifact_id = "wpimath-cpp" group_id = "edu.wpi.first.wpimath" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" extract_to = "src/native/wpimath" libs = ["wpimath"] diff --git a/wpimath/src/main/python/pyproject.toml b/wpimath/src/main/python/pyproject.toml index 0ac94934b4..99ad893847 100644 --- a/wpimath/src/main/python/pyproject.toml +++ b/wpimath/src/main/python/pyproject.toml @@ -1,26 +1,26 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.7", - "hatch-meson~=0.1.0b2", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-wpimath==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2", + "robotpy-native-wpimath==0.0.0", + "robotpy-wpiutil==0.0.0", # "numpy", # broken in raspbian CI ] [project] name = "robotpy-wpimath" -version = "2027.0.0a2" +version = "0.0.0" description = "Binary wrapper for FRC WPIMath library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpimath==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2", + "robotpy-native-wpimath==0.0.0", + "robotpy-wpiutil==0.0.0", ] [project.urls] @@ -45,6 +45,8 @@ update_init = [ "wpimath.estimator wpimath._controls._controls.estimator", "wpimath.filter", "wpimath.geometry", + "wpimath.kinematics", + "wpimath.interpolation", "wpimath.optimization wpimath._controls._controls.optimization", "wpimath.path wpimath._controls._controls.path", "wpimath.spline", @@ -73,6 +75,8 @@ scan_headers_ignore = [ "frc/estimator/UnscentedKalmanFilter.h", "frc/estimator/UnscentedTransform.h", + "frc/geometry/detail/RotationVectorToMatrix.h", + "frc/system/Discretization.h", "frc/system/NumericalIntegration.h", "frc/system/NumericalJacobian.h", @@ -1574,7 +1578,6 @@ DifferentialDriveAccelerationLimiter = "frc/controller/DifferentialDriveAccelera DifferentialDriveFeedforward = "frc/controller/DifferentialDriveFeedforward.h" DifferentialDriveWheelVoltages = "frc/controller/DifferentialDriveWheelVoltages.h" ElevatorFeedforward = "frc/controller/ElevatorFeedforward.h" -HolonomicDriveController = "frc/controller/HolonomicDriveController.h" ImplicitModelFollower = "frc/controller/ImplicitModelFollower.h" LTVDifferentialDriveController = "frc/controller/LTVDifferentialDriveController.h" LTVUnicycleController = "frc/controller/LTVUnicycleController.h" diff --git a/wpimath/src/main/python/semiwrap/MathUtil.yml b/wpimath/src/main/python/semiwrap/MathUtil.yml index 303b701840..8408fa5af9 100644 --- a/wpimath/src/main/python/semiwrap/MathUtil.yml +++ b/wpimath/src/main/python/semiwrap/MathUtil.yml @@ -4,33 +4,23 @@ functions: - [double] AngleModulus: FloorDiv: - template_impls: - - [int64_t, int64_t] - # work around GCC 10 issue on raspbian - cpp_code: | - [](int64_t x, int64_t y) -> int64_t { - return frc::FloorDiv(x, y); - } + # Use // operator instead, it's more efficient + # - https://github.com/robotpy/mostrobotpy/pull/200 + ignore: true FloorMod: - template_impls: - - [int64_t, int64_t] - # work around GCC 10 issue on raspbian - cpp_code: | - [](int64_t x, int64_t y) -> int64_t { - return frc::FloorMod(x, y); - } + # Use % operator instead, it's more efficient + # - https://github.com/robotpy/mostrobotpy/pull/200 + ignore: true ApplyDeadband: param_override: maxMagnitude: default: '1.0' - template_impls: - - [double] - CopySignPow: - param_override: - maxMagnitude: - default: '1.0' - template_impls: - - [double] + overloads: + T, T, T: + template_impls: + - [double] + const Eigen::Vector&, T, T: + ignore: true IsNear: overloads: T, T, T: @@ -45,3 +35,9 @@ functions: overloads: const Translation2d&, const Translation2d&, units::second_t, units::meters_per_second_t: const Translation3d&, const Translation3d&, units::second_t, units::meters_per_second_t: + CopyDirectionPow: + overloads: + T, double, T: + ignore: true + const Eigen::Vector&, double, T: + ignore: true diff --git a/wpimath/src/main/python/semiwrap/controls/DifferentialDriveFeedforward.yml b/wpimath/src/main/python/semiwrap/controls/DifferentialDriveFeedforward.yml index 3f26a50ecd..ac8a9d1c8a 100644 --- a/wpimath/src/main/python/semiwrap/controls/DifferentialDriveFeedforward.yml +++ b/wpimath/src/main/python/semiwrap/controls/DifferentialDriveFeedforward.yml @@ -1,3 +1,6 @@ +defaults: + subpackage: controller + classes: frc::DifferentialDriveFeedforward: force_type_casters: diff --git a/wpimath/src/main/python/semiwrap/controls/HolonomicDriveController.yml b/wpimath/src/main/python/semiwrap/controls/HolonomicDriveController.yml deleted file mode 100644 index ff1dc52dc2..0000000000 --- a/wpimath/src/main/python/semiwrap/controls/HolonomicDriveController.yml +++ /dev/null @@ -1,23 +0,0 @@ -defaults: - subpackage: controller - -classes: - frc::HolonomicDriveController: - methods: - HolonomicDriveController: - AtReference: - SetTolerance: - Calculate: - overloads: - const Pose2d&, const Pose2d&, units::meters_per_second_t, const Rotation2d&: - const Pose2d&, const Trajectory::State&, const Rotation2d&: - SetEnabled: - getThetaController: - ignore: true - getXController: - ignore: true - getYController: - ignore: true - GetXController: - GetYController: - GetThetaController: diff --git a/wpimath/src/main/python/semiwrap/geometry/Pose2d.yml b/wpimath/src/main/python/semiwrap/geometry/Pose2d.yml index 0c95c98613..6d294640e0 100644 --- a/wpimath/src/main/python/semiwrap/geometry/Pose2d.yml +++ b/wpimath/src/main/python/semiwrap/geometry/Pose2d.yml @@ -27,8 +27,6 @@ classes: RotateBy: TransformBy: RelativeTo: - Exp: - Log: ToMatrix: Nearest: overloads: diff --git a/wpimath/src/main/python/semiwrap/geometry/Pose3d.yml b/wpimath/src/main/python/semiwrap/geometry/Pose3d.yml index 7e9909dc5b..d55a93e8e4 100644 --- a/wpimath/src/main/python/semiwrap/geometry/Pose3d.yml +++ b/wpimath/src/main/python/semiwrap/geometry/Pose3d.yml @@ -7,11 +7,6 @@ functions: ignore: true from_json: ignore: true - RotationVectorToMatrix: - overloads: - const ct_vector3d&: - ignore: true - const Eigen::Vector3d&: classes: frc::Pose3d: methods: @@ -36,13 +31,11 @@ classes: operator*: operator/: RotateBy: - RotateAround: TransformBy: RelativeTo: - Exp: - Log: ToMatrix: ToPose2d: + RotateAround: Nearest: overloads: std::span [const]: diff --git a/wpimath/src/main/python/semiwrap/geometry/Transform2d.yml b/wpimath/src/main/python/semiwrap/geometry/Transform2d.yml index 3da1ea1e5f..e32caec75e 100644 --- a/wpimath/src/main/python/semiwrap/geometry/Transform2d.yml +++ b/wpimath/src/main/python/semiwrap/geometry/Transform2d.yml @@ -30,6 +30,7 @@ classes: operator/: operator==: operator+: + Log: inline_code: | cls_Transform2d diff --git a/wpimath/src/main/python/semiwrap/geometry/Transform3d.yml b/wpimath/src/main/python/semiwrap/geometry/Transform3d.yml index d48cbd5cc1..9a9bb27736 100644 --- a/wpimath/src/main/python/semiwrap/geometry/Transform3d.yml +++ b/wpimath/src/main/python/semiwrap/geometry/Transform3d.yml @@ -28,6 +28,7 @@ classes: operator/: operator+: operator==: + Log: inline_code: | diff --git a/wpimath/src/main/python/semiwrap/geometry/Translation2d.yml b/wpimath/src/main/python/semiwrap/geometry/Translation2d.yml index faa5be02c4..ed8d689dda 100644 --- a/wpimath/src/main/python/semiwrap/geometry/Translation2d.yml +++ b/wpimath/src/main/python/semiwrap/geometry/Translation2d.yml @@ -38,6 +38,10 @@ classes: operator*: operator/: operator==: + SquaredDistance: + SquaredNorm: + Dot: + Cross: inline_code: | cls_Translation2d diff --git a/wpimath/src/main/python/semiwrap/geometry/Translation3d.yml b/wpimath/src/main/python/semiwrap/geometry/Translation3d.yml index b728732ddf..e2cfdf53e2 100644 --- a/wpimath/src/main/python/semiwrap/geometry/Translation3d.yml +++ b/wpimath/src/main/python/semiwrap/geometry/Translation3d.yml @@ -41,6 +41,10 @@ classes: ignore: true RotateAround: + SquaredDistance: + SquaredNorm: + Dot: + Cross: inline_code: | cls_Translation3d .def_static("fromFeet", [](units::foot_t x, units::foot_t y, units::foot_t z){ diff --git a/wpimath/src/main/python/semiwrap/geometry/Twist2d.yml b/wpimath/src/main/python/semiwrap/geometry/Twist2d.yml index f634c2c77d..2963a01145 100644 --- a/wpimath/src/main/python/semiwrap/geometry/Twist2d.yml +++ b/wpimath/src/main/python/semiwrap/geometry/Twist2d.yml @@ -11,6 +11,7 @@ classes: methods: operator==: operator*: + Exp: inline_code: | cls_Twist2d diff --git a/wpimath/src/main/python/semiwrap/geometry/Twist3d.yml b/wpimath/src/main/python/semiwrap/geometry/Twist3d.yml index 1d4b270dba..8d8cd6af90 100644 --- a/wpimath/src/main/python/semiwrap/geometry/Twist3d.yml +++ b/wpimath/src/main/python/semiwrap/geometry/Twist3d.yml @@ -14,6 +14,7 @@ classes: methods: operator==: operator*: + Exp: inline_code: |- cls_Twist3d diff --git a/wpimath/src/main/python/wpimath/__init__.py b/wpimath/src/main/python/wpimath/__init__.py index f85ba7db0b..84d08d3524 100644 --- a/wpimath/src/main/python/wpimath/__init__.py +++ b/wpimath/src/main/python/wpimath/__init__.py @@ -7,8 +7,6 @@ from . import geometry from ._wpimath import ( angleModulus, applyDeadband, - floorDiv, - floorMod, inputModulus, objectToRobotPose, slewRateLimit, @@ -17,8 +15,6 @@ from ._wpimath import ( __all__ = [ "angleModulus", "applyDeadband", - "floorDiv", - "floorMod", "inputModulus", "objectToRobotPose", "slewRateLimit", diff --git a/wpimath/src/main/python/wpimath/controller/__init__.py b/wpimath/src/main/python/wpimath/controller/__init__.py index 53070f020f..842eab4506 100644 --- a/wpimath/src/main/python/wpimath/controller/__init__.py +++ b/wpimath/src/main/python/wpimath/controller/__init__.py @@ -6,9 +6,9 @@ from .._controls._controls.controller import ( ControlAffinePlantInversionFeedforward_2_1, ControlAffinePlantInversionFeedforward_2_2, DifferentialDriveAccelerationLimiter, + DifferentialDriveFeedforward, DifferentialDriveWheelVoltages, ElevatorFeedforward, - HolonomicDriveController, ImplicitModelFollower_1_1, ImplicitModelFollower_2_1, ImplicitModelFollower_2_2, @@ -36,9 +36,9 @@ __all__ = [ "ControlAffinePlantInversionFeedforward_2_1", "ControlAffinePlantInversionFeedforward_2_2", "DifferentialDriveAccelerationLimiter", + "DifferentialDriveFeedforward", "DifferentialDriveWheelVoltages", "ElevatorFeedforward", - "HolonomicDriveController", "ImplicitModelFollower_1_1", "ImplicitModelFollower_2_1", "ImplicitModelFollower_2_2", diff --git a/wpimath/src/main/python/wpimath/geometry/__init__.py b/wpimath/src/main/python/wpimath/geometry/__init__.py index 894909d4b6..a6f3e5970d 100644 --- a/wpimath/src/main/python/wpimath/geometry/__init__.py +++ b/wpimath/src/main/python/wpimath/geometry/__init__.py @@ -17,7 +17,6 @@ from ._geometry import ( Translation3d, Twist2d, Twist3d, - rotationVectorToMatrix, ) __all__ = [ @@ -36,5 +35,4 @@ __all__ = [ "Translation3d", "Twist2d", "Twist3d", - "rotationVectorToMatrix", ] diff --git a/wpimath/src/main/python/wpimath/interpolation/__init__.py b/wpimath/src/main/python/wpimath/interpolation/__init__.py index c71091b338..8cdd3d6c42 100644 --- a/wpimath/src/main/python/wpimath/interpolation/__init__.py +++ b/wpimath/src/main/python/wpimath/interpolation/__init__.py @@ -1,6 +1,6 @@ from . import _init__interpolation # noqa: F401 -# autogenerated by 'robotpy-build create-imports wpimath.interpolation wpimath.interpolation._interpolation' +# autogenerated by 'semiwrap create-imports wpimath.interpolation wpimath.interpolation._interpolation' from ._interpolation import ( TimeInterpolatableFloatBuffer, TimeInterpolatablePose2dBuffer, diff --git a/wpimath/src/main/python/wpimath/kinematics/__init__.py b/wpimath/src/main/python/wpimath/kinematics/__init__.py index 4327debb3d..f2c7f29aab 100644 --- a/wpimath/src/main/python/wpimath/kinematics/__init__.py +++ b/wpimath/src/main/python/wpimath/kinematics/__init__.py @@ -1,35 +1,47 @@ from . import _init__kinematics -# autogenerated by 'robotpy-build create-imports wpimath.kinematics' +# autogenerated by 'semiwrap create-imports wpimath.kinematics wpimath.kinematics._kinematics' from ._kinematics import ( ChassisSpeeds, DifferentialDriveKinematics, DifferentialDriveKinematicsBase, DifferentialDriveOdometry, + DifferentialDriveOdometry3d, + DifferentialDriveOdometry3dBase, DifferentialDriveOdometryBase, DifferentialDriveWheelPositions, DifferentialDriveWheelSpeeds, MecanumDriveKinematics, MecanumDriveKinematicsBase, MecanumDriveOdometry, + MecanumDriveOdometry3d, + MecanumDriveOdometry3dBase, MecanumDriveOdometryBase, MecanumDriveWheelPositions, MecanumDriveWheelSpeeds, SwerveDrive2Kinematics, SwerveDrive2KinematicsBase, SwerveDrive2Odometry, + SwerveDrive2Odometry3d, + SwerveDrive2Odometry3dBase, SwerveDrive2OdometryBase, SwerveDrive3Kinematics, SwerveDrive3KinematicsBase, SwerveDrive3Odometry, + SwerveDrive3Odometry3d, + SwerveDrive3Odometry3dBase, SwerveDrive3OdometryBase, SwerveDrive4Kinematics, SwerveDrive4KinematicsBase, SwerveDrive4Odometry, + SwerveDrive4Odometry3d, + SwerveDrive4Odometry3dBase, SwerveDrive4OdometryBase, SwerveDrive6Kinematics, SwerveDrive6KinematicsBase, SwerveDrive6Odometry, + SwerveDrive6Odometry3d, + SwerveDrive6Odometry3dBase, SwerveDrive6OdometryBase, SwerveModulePosition, SwerveModuleState, @@ -40,30 +52,42 @@ __all__ = [ "DifferentialDriveKinematics", "DifferentialDriveKinematicsBase", "DifferentialDriveOdometry", + "DifferentialDriveOdometry3d", + "DifferentialDriveOdometry3dBase", "DifferentialDriveOdometryBase", "DifferentialDriveWheelPositions", "DifferentialDriveWheelSpeeds", "MecanumDriveKinematics", "MecanumDriveKinematicsBase", "MecanumDriveOdometry", + "MecanumDriveOdometry3d", + "MecanumDriveOdometry3dBase", "MecanumDriveOdometryBase", "MecanumDriveWheelPositions", "MecanumDriveWheelSpeeds", "SwerveDrive2Kinematics", "SwerveDrive2KinematicsBase", "SwerveDrive2Odometry", + "SwerveDrive2Odometry3d", + "SwerveDrive2Odometry3dBase", "SwerveDrive2OdometryBase", "SwerveDrive3Kinematics", "SwerveDrive3KinematicsBase", "SwerveDrive3Odometry", + "SwerveDrive3Odometry3d", + "SwerveDrive3Odometry3dBase", "SwerveDrive3OdometryBase", "SwerveDrive4Kinematics", "SwerveDrive4KinematicsBase", "SwerveDrive4Odometry", + "SwerveDrive4Odometry3d", + "SwerveDrive4Odometry3dBase", "SwerveDrive4OdometryBase", "SwerveDrive6Kinematics", "SwerveDrive6KinematicsBase", "SwerveDrive6Odometry", + "SwerveDrive6Odometry3d", + "SwerveDrive6Odometry3dBase", "SwerveDrive6OdometryBase", "SwerveModulePosition", "SwerveModuleState", diff --git a/wpimath/src/test/python/cpp/pyproject.toml b/wpimath/src/test/python/cpp/pyproject.toml index 679f4bdf0f..4320ebbe48 100644 --- a/wpimath/src/test/python/cpp/pyproject.toml +++ b/wpimath/src/test/python/cpp/pyproject.toml @@ -17,6 +17,9 @@ license = "BSD-3-Clause" [tool.hatch.build.hooks.meson] [tool.semiwrap] +update_init = [ + "wpimath_test wpimath_test._wpimath_test", +] [tool.semiwrap.extension_modules."wpimath_test._wpimath_test"] name = "wpimath_test" diff --git a/wpimath/src/test/python/cpp/semiwrap/module.yml b/wpimath/src/test/python/cpp/semiwrap/module.yml index b9157d3737..bcec6a22f6 100644 --- a/wpimath/src/test/python/cpp/semiwrap/module.yml +++ b/wpimath/src/test/python/cpp/semiwrap/module.yml @@ -1,12 +1,13 @@ ---- classes: SomeClass: attributes: - kDefaultPeriod: five_ft: + s_constant: + ms_constant1: + ms_constant2: + ms_constant3: methods: - checkDefaultByName: checkDefaultByNum1: param_override: period: @@ -17,3 +18,6 @@ classes: default: 0.050_s ms2s: ft2m: + checkDefaultByName1: + checkDefaultByName2: + s2ms: diff --git a/wpinet/src/main/python/native-pyproject.toml b/wpinet/src/main/python/native-pyproject.toml index 91880f387b..0c771c4fd7 100644 --- a/wpinet/src/main/python/native-pyproject.toml +++ b/wpinet/src/main/python/native-pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpiutil==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", ] [project] name = "robotpy-native-wpinet" -version = "2027.0.0a2" +version = "0.0.0" description = "WPILib Networking Library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -24,7 +24,7 @@ packages = ["src/native"] artifact_id = "wpinet-cpp" group_id = "edu.wpi.first.wpinet" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" extract_to = "src/native/wpinet" libs = ["wpinet"] diff --git a/wpinet/src/main/python/pyproject.toml b/wpinet/src/main/python/pyproject.toml index d7df88c5b1..837ff08a4e 100644 --- a/wpinet/src/main/python/pyproject.toml +++ b/wpinet/src/main/python/pyproject.toml @@ -1,24 +1,26 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.7", - "hatch-meson~=0.1.0b2", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", "hatchling", - "robotpy-native-wpinet==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2" + "robotpy-native-wpinet==0.0.0", + "robotpy-wpiutil==0.0.0" ] [project] name = "robotpy-wpinet" -version = "2027.0.0a2" +version = "0.0.0" description = "Binary wrapper for FRC wpinet library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpinet==2027.0.0a2", - "robotpy-wpiutil==2027.0.0a2" + "robotpy-native-wpinet==0.0.0", + "robotpy-wpiutil==0.0.0" ] [project.urls] diff --git a/wpiutil/src/main/python/examples/printlog.py b/wpiutil/src/main/python/examples/printlog.py index 4db4c33d56..da03ef8ceb 100755 --- a/wpiutil/src/main/python/examples/printlog.py +++ b/wpiutil/src/main/python/examples/printlog.py @@ -60,7 +60,7 @@ if __name__ == "__main__": # handle systemTime specially if entry.name == "systemTime" and entry.type == "int64": dt = datetime.fromtimestamp(record.getInteger() / 1000000) - print(" {:%Y-%m-%d %H:%M:%S.%f}".format(dt)) + print(f" {dt:%Y-%m-%d %H:%M:%S.%f}") continue if entry.type == "double": diff --git a/wpiutil/src/main/python/native-pyproject.toml b/wpiutil/src/main/python/native-pyproject.toml index 2f46fbff39..9459ef83a7 100644 --- a/wpiutil/src/main/python/native-pyproject.toml +++ b/wpiutil/src/main/python/native-pyproject.toml @@ -8,7 +8,7 @@ requires = [ [project] name = "robotpy-native-wpiutil" -version = "2027.0.0a2" +version = "0.0.0" description = "WPILib Utility Library" license = "BSD-3-Clause" @@ -23,7 +23,7 @@ packages = ["src/native"] artifact_id = "wpiutil-cpp" group_id = "edu.wpi.first.wpiutil" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" extract_to = "src/native/wpiutil" libs = ["wpiutil"] diff --git a/wpiutil/src/main/python/pyproject.toml b/wpiutil/src/main/python/pyproject.toml index f59780a69e..de6db1210e 100644 --- a/wpiutil/src/main/python/pyproject.toml +++ b/wpiutil/src/main/python/pyproject.toml @@ -1,23 +1,23 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.7", - "hatch-meson~=0.1.0b2", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-wpiutil==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", ] [project] name = "robotpy-wpiutil" -version = "2027.0.0a2" +version = "0.0.0" description = "Binary wrapper for FRC WPIUtil library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpiutil==2027.0.0a2", + "robotpy-native-wpiutil==0.0.0", ] [project.urls] @@ -53,6 +53,8 @@ scan_headers_ignore = [ "pb_common.h", "pb_decode.h", "pb_encode.h", + "upb/*", + "utf8_range.h", ] [tool.semiwrap.extension_modules."wpiutil._wpiutil"] diff --git a/xrpVendordep/src/main/python/native-pyproject.toml b/xrpVendordep/src/main/python/native-pyproject.toml index eff30dae59..c073a9e8a6 100644 --- a/xrpVendordep/src/main/python/native-pyproject.toml +++ b/xrpVendordep/src/main/python/native-pyproject.toml @@ -4,17 +4,17 @@ requires = [ "hatchling", "hatch-nativelib~=0.2.0", "hatch-robotpy~=0.2.1", - "robotpy-native-wpilib==2027.0.0a2", + "robotpy-native-wpilib==0.0.0", ] [project] name = "robotpy-native-xrp" -version = "2027.0.0a2" +version = "0.0.0" description = "WPILib XRP vendor library" license = "BSD-3-Clause" dependencies = [ - "robotpy-native-wpilib==2027.0.0a2", + "robotpy-native-wpilib==0.0.0", ] [tool.hatch.build.targets.wheel] @@ -24,7 +24,7 @@ packages = ["src/native"] artifact_id = "xrpVendordep-cpp" group_id = "edu.wpi.first.xrpVendordep" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" extract_to = "src/native/xrp" libs = ["xrpVendordep"] diff --git a/xrpVendordep/src/main/python/pyproject.toml b/xrpVendordep/src/main/python/pyproject.toml index cbc3e18a29..33a6c9b0e1 100644 --- a/xrpVendordep/src/main/python/pyproject.toml +++ b/xrpVendordep/src/main/python/pyproject.toml @@ -1,29 +1,29 @@ [build-system] build-backend = "hatchling.build" requires = [ - "semiwrap~=0.1.7", - "hatch-meson~=0.1.0b2", + "semiwrap~=0.2.1", + "hatch-meson~=0.1.0", "hatch-robotpy~=0.2.1", "hatchling", - "robotpy-native-xrp==2027.0.0a2", - "wpilib==2027.0.0a2", + "robotpy-native-xrp==0.0.0", + "wpilib==0.0.0", ] [project] name = "robotpy-xrp" -version = "2027.0.0a2" +version = "0.0.0" description = "Binary wrapper for WPILib XRP Vendor library" authors = [ {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"}, ] license = "BSD-3-Clause" dependencies = [ - "robotpy-native-xrp==2027.0.0a2", - "wpilib==2027.0.0a2" + "robotpy-native-xrp==0.0.0", + "wpilib==0.0.0" ] -[project.entry-points.robotpysimext] +[project.entry-points."robotpy_sim.2027"] xrp = "xrp.extension" @@ -34,7 +34,7 @@ version_file = "xrp/version.py" artifact_id = "halsim_xrp" group_id = "edu.wpi.first.halsim" repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027" -version = "2027.0.0-alpha-2" +version = "0.0.0" use_headers = false extract_to = "xrp/extension"