Merge pull request #70 from robotpy/2025-dev

Update to beta 4
robotpy · Dec 19, 2024 · 573b00b · 573b00b
2 parents c10c792 + 1168cbe
commit 573b00b
Show file tree

Hide file tree

Showing 19 changed files with 78 additions and 7 deletions.
diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
@@ -14,6 +14,7 @@ jobs:
     uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2025
     with:
       artifactory_repo_type: vendor
+      enable_raspbian: false
     secrets:
       META_REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
       RTD_TOKEN: ${{ secrets.RTD_TOKEN }}

diff --git a/gen/AbsoluteEncoderConfig.yml b/gen/AbsoluteEncoderConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   AbsoluteEncoderConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     methods:
       AbsoluteEncoderConfig:
       Apply:
@@ -13,3 +15,4 @@ classes:
       AverageDepth:
       StartPulseUs:
       EndPulseUs:
+      ZeroCentered:
diff --git a/gen/AbsoluteEncoderConfigAccessor.yml b/gen/AbsoluteEncoderConfigAccessor.yml
@@ -9,3 +9,4 @@ classes:
       GetAverageDepth:
       GetStartPulseUs:
       GetEndPulseUs:
+      GetZeroOffset:
diff --git a/gen/AlternateEncoderConfig.yml b/gen/AlternateEncoderConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   AlternateEncoderConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     enums:
       Type:
     methods:

diff --git a/gen/AnalogSensorConfig.yml b/gen/AnalogSensorConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   AnalogSensorConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     methods:
       AnalogSensorConfig:
       Apply:

diff --git a/gen/ClosedLoopConfig.yml b/gen/ClosedLoopConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   ClosedLoopConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     attributes:
       maxMotion:
       smartMotion:

diff --git a/gen/EncoderConfig.yml b/gen/EncoderConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   EncoderConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     methods:
       EncoderConfig:
       Apply:

diff --git a/gen/ExternalEncoderConfig.yml b/gen/ExternalEncoderConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   ExternalEncoderConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     enums:
       Type:
     methods:

diff --git a/gen/LimitSwitchConfig.yml b/gen/LimitSwitchConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   LimitSwitchConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     enums:
       Type:
     methods:

diff --git a/gen/MAXMotionConfig.yml b/gen/MAXMotionConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   MAXMotionConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     enums:
       MAXMotionPositionMode:
     methods:

diff --git a/gen/SignalsConfig.yml b/gen/SignalsConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   SignalsConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     methods:
       SignalsConfig:
       Apply:

diff --git a/gen/SmartMotionConfig.yml b/gen/SmartMotionConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   SmartMotionConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     methods:
       SmartMotionConfig:
       Apply:

diff --git a/gen/SoftLimitConfig.yml b/gen/SoftLimitConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   SoftLimitConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     methods:
       SoftLimitConfig:
       Apply:

diff --git a/gen/SparkBase.yml b/gen/SparkBase.yml
@@ -1,16 +1,47 @@
 ---
 
+extra_includes_first:
+- rev/REVLibError.h
+
 extra_includes:
 - rev/SparkLowLevel.h
 - rev/config/SparkBaseConfig.h
 
+# typealias:
+# - rev::REVLibError
+
 classes:
   SparkBase:
     typealias:
     - rev::spark::SparkLowLevel::MotorType
     - rev::spark::SparkLowLevel::SparkModel
     attributes:
+      m_RelativeEncoder:
+        ignore: true
+      m_relativeEncoderCreated:
+        ignore: true
+      m_AnalogSensor:
+        ignore: true
+      m_analogSensorCreated:
+        ignore: true
+      m_AbsoluteEncoder:
+        ignore: true
+      m_absoluteEncoderCreated:
+        ignore: true
+      m_ClosedLoopController:
+        ignore: true
+      m_closedLoopControllerCreated:
+        ignore: true
+      m_ForwardLimitSwitch:
+        ignore: true
+      m_forwardLimitSwitchCreated:
+        ignore: true
+      m_ReverseLimitSwitch:
+        ignore: true
+      m_reverseLimitSwitchCreated:
+        ignore: true
       m_setpoint:
+        ignore: true
     enums:
       IdleMode:
       SoftLimitDirection:
@@ -72,6 +103,7 @@ classes:
       gateDriver:
       escEeprom:
       firmware:
+      rawBits:
     methods:
       Faults:
         overloads:
@@ -87,6 +119,7 @@ classes:
       stall:
       hasReset:
       other:
+      rawBits:
     methods:
       Warnings:
         overloads:

diff --git a/gen/SparkBaseConfig.yml b/gen/SparkBaseConfig.yml
@@ -2,6 +2,8 @@
 
 classes:
   SparkBaseConfig:
+    base_qualnames:
+      BaseConfig: rev::BaseConfig
     attributes:
       absoluteEncoder:
       analogSensor:

diff --git a/gen/SparkFlex.yml b/gen/SparkFlex.yml
@@ -1,5 +1,8 @@
 ---
 
+extra_includes_first:
+- rev/REVLibError.h
+
 extra_includes:
 - rev/SparkLowLevel.h
 

diff --git a/gen/SparkLowLevel.yml b/gen/SparkLowLevel.yml
@@ -5,8 +5,6 @@ extra_includes_first:
 
 classes:
   SparkLowLevel:
-    typealias:
-    - rev::REVLibError
     attributes:
       kAPIMajorVersion:
       kAPIMinorVersion:

diff --git a/gen/SparkMax.yml b/gen/SparkMax.yml
@@ -1,18 +1,28 @@
 ---
 
 extra_includes_first:
+- rev/REVLibError.h
 - rev/SparkLowLevel.h
 
 classes:
   SparkMax:
     typealias:
     - rev::spark::SparkLowLevel::MotorType
+    - rev::spark::SparkBase::PersistMode
+    - rev::spark::SparkBase::ResetMode
     attributes:
       configAccessor:
     methods:
       SparkMax:
+      Configure:
       GetAlternateEncoder:
         return_value_policy: reference_internal
+      GetAbsoluteEncoder:
+        return_value_policy: reference_internal
+      GetForwardLimitSwitch:
+        return_value_policy: reference_internal
+      GetReverseLimitSwitch:
+        return_value_policy: reference_internal
       PreGetAbsoluteEncoder:
       PreGetForwardLimitSwitch:
       PreGetReverseLimitSwitch:
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,13 +6,13 @@ author_email = "[email protected]"
 url = "https://github.com/robotpy/robotpy-rev"
 license = "BSD-3-Clause"
 install_requires = [
-    "wpilib~=2025.0.0b2",
+    "wpilib~=2025.0.0b3",
 ]
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
-    "wpilib~=2025.0.0b2",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
+    "wpilib~=2025.0.0b3",
 ]
 
 [tool.robotpy-build]
@@ -22,14 +22,14 @@ base_package = "rev"
 artifact_id = "REVLib-driver"
 group_id = "com.revrobotics.frc"
 repo_url = "https://maven.revrobotics.com"
-version = "2025.0.0-beta-1"
+version = "2025.0.0-beta-4"
 libs = ["REVLibDriver"]
 
 [tool.robotpy-build.static_libs."revlib".maven_lib_download]
 artifact_id = "REVLib-cpp"
 group_id = "com.revrobotics.frc"
 repo_url = "https://maven.revrobotics.com"
-version = "2025.0.0-beta-1"
+version = "2025.0.0-beta-4"
 libs = ["REVLib"]
 
 [tool.robotpy-build.wrappers."rev"]