From a81018a7ec42c82c89010830040815fa7681bdac Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sun, 15 Dec 2024 13:28:25 -0500 Subject: [PATCH 1/3] Update to beta3 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9e47300..125f974 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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-3" 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-3" libs = ["REVLib"] [tool.robotpy-build.wrappers."rev"] From 6e56d7a4e29b6bdc90df5a0151bd664dcdeca02d Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Wed, 18 Dec 2024 23:54:46 -0500 Subject: [PATCH 2/3] Upgrade to beta4 --- gen/AbsoluteEncoderConfig.yml | 3 +++ gen/AbsoluteEncoderConfigAccessor.yml | 1 + gen/AlternateEncoderConfig.yml | 2 ++ gen/AnalogSensorConfig.yml | 2 ++ gen/ClosedLoopConfig.yml | 2 ++ gen/EncoderConfig.yml | 2 ++ gen/ExternalEncoderConfig.yml | 2 ++ gen/LimitSwitchConfig.yml | 2 ++ gen/MAXMotionConfig.yml | 2 ++ gen/SignalsConfig.yml | 2 ++ gen/SmartMotionConfig.yml | 2 ++ gen/SoftLimitConfig.yml | 2 ++ gen/SparkBase.yml | 33 +++++++++++++++++++++++++++ gen/SparkBaseConfig.yml | 2 ++ gen/SparkFlex.yml | 3 +++ gen/SparkLowLevel.yml | 2 -- gen/SparkMax.yml | 10 ++++++++ pyproject.toml | 10 ++++---- 18 files changed, 77 insertions(+), 7 deletions(-) diff --git a/gen/AbsoluteEncoderConfig.yml b/gen/AbsoluteEncoderConfig.yml index a4bc109..92996ad 100644 --- 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 index df0bad5..90cc1ce 100644 --- 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 index 31da7b6..33c562f 100644 --- 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 index 9bad5a1..c4ef206 100644 --- 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 index 06f8359..be58adc 100644 --- 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 index 157fafc..2b5da15 100644 --- 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 index 619f39c..893a3df 100644 --- 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 index d0c2237..1a75df0 100644 --- 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 index fdb1fc4..e7fa7fb 100644 --- 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 index 4006e3e..81fa700 100644 --- 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 index b83494d..7514b22 100644 --- 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 index 895e900..889c99d 100644 --- 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 index cdf1b34..7717af8 100644 --- 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 index 8c6d25f..399a8d6 100644 --- 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 index 6580571..5aa16cd 100644 --- 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 index 463a860..a9b4062 100644 --- 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 index 488826e..633a1b5 100644 --- 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 index 125f974..ae584d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,13 +6,13 @@ author_email = "robotpy@googlegroups.com" 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-3" +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-3" +version = "2025.0.0-beta-4" libs = ["REVLib"] [tool.robotpy-build.wrappers."rev"] From 1168cbe345f4b7e43f44a32e094efd6d66178c18 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Thu, 19 Dec 2024 10:01:55 -0500 Subject: [PATCH 3/3] Disable raspbian artifacts --- .github/workflows/dist.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index beb210a..b845df1 100644 --- 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 }}