Skip to content

Commit 573b00b

Browse files
authored
Merge pull request #70 from robotpy/2025-dev
Update to beta 4
2 parents c10c792 + 1168cbe commit 573b00b

19 files changed

+78
-7
lines changed

.github/workflows/dist.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2025
1515
with:
1616
artifactory_repo_type: vendor
17+
enable_raspbian: false
1718
secrets:
1819
META_REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
1920
RTD_TOKEN: ${{ secrets.RTD_TOKEN }}

gen/AbsoluteEncoderConfig.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
AbsoluteEncoderConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
methods:
68
AbsoluteEncoderConfig:
79
Apply:
@@ -13,3 +15,4 @@ classes:
1315
AverageDepth:
1416
StartPulseUs:
1517
EndPulseUs:
18+
ZeroCentered:

gen/AbsoluteEncoderConfigAccessor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ classes:
99
GetAverageDepth:
1010
GetStartPulseUs:
1111
GetEndPulseUs:
12+
GetZeroOffset:

gen/AlternateEncoderConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
AlternateEncoderConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
enums:
68
Type:
79
methods:

gen/AnalogSensorConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
AnalogSensorConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
methods:
68
AnalogSensorConfig:
79
Apply:

gen/ClosedLoopConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
ClosedLoopConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
attributes:
68
maxMotion:
79
smartMotion:

gen/EncoderConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
EncoderConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
methods:
68
EncoderConfig:
79
Apply:

gen/ExternalEncoderConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
ExternalEncoderConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
enums:
68
Type:
79
methods:

gen/LimitSwitchConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
LimitSwitchConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
enums:
68
Type:
79
methods:

gen/MAXMotionConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
MAXMotionConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
enums:
68
MAXMotionPositionMode:
79
methods:

gen/SignalsConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
SignalsConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
methods:
68
SignalsConfig:
79
Apply:

gen/SmartMotionConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
SmartMotionConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
methods:
68
SmartMotionConfig:
79
Apply:

gen/SoftLimitConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
SoftLimitConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
methods:
68
SoftLimitConfig:
79
Apply:

gen/SparkBase.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,47 @@
11
---
22

3+
extra_includes_first:
4+
- rev/REVLibError.h
5+
36
extra_includes:
47
- rev/SparkLowLevel.h
58
- rev/config/SparkBaseConfig.h
69

10+
# typealias:
11+
# - rev::REVLibError
12+
713
classes:
814
SparkBase:
915
typealias:
1016
- rev::spark::SparkLowLevel::MotorType
1117
- rev::spark::SparkLowLevel::SparkModel
1218
attributes:
19+
m_RelativeEncoder:
20+
ignore: true
21+
m_relativeEncoderCreated:
22+
ignore: true
23+
m_AnalogSensor:
24+
ignore: true
25+
m_analogSensorCreated:
26+
ignore: true
27+
m_AbsoluteEncoder:
28+
ignore: true
29+
m_absoluteEncoderCreated:
30+
ignore: true
31+
m_ClosedLoopController:
32+
ignore: true
33+
m_closedLoopControllerCreated:
34+
ignore: true
35+
m_ForwardLimitSwitch:
36+
ignore: true
37+
m_forwardLimitSwitchCreated:
38+
ignore: true
39+
m_ReverseLimitSwitch:
40+
ignore: true
41+
m_reverseLimitSwitchCreated:
42+
ignore: true
1343
m_setpoint:
44+
ignore: true
1445
enums:
1546
IdleMode:
1647
SoftLimitDirection:
@@ -72,6 +103,7 @@ classes:
72103
gateDriver:
73104
escEeprom:
74105
firmware:
106+
rawBits:
75107
methods:
76108
Faults:
77109
overloads:
@@ -87,6 +119,7 @@ classes:
87119
stall:
88120
hasReset:
89121
other:
122+
rawBits:
90123
methods:
91124
Warnings:
92125
overloads:

gen/SparkBaseConfig.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
classes:
44
SparkBaseConfig:
5+
base_qualnames:
6+
BaseConfig: rev::BaseConfig
57
attributes:
68
absoluteEncoder:
79
analogSensor:

gen/SparkFlex.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
---
22

3+
extra_includes_first:
4+
- rev/REVLibError.h
5+
36
extra_includes:
47
- rev/SparkLowLevel.h
58

gen/SparkLowLevel.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ extra_includes_first:
55

66
classes:
77
SparkLowLevel:
8-
typealias:
9-
- rev::REVLibError
108
attributes:
119
kAPIMajorVersion:
1210
kAPIMinorVersion:

gen/SparkMax.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
---
22

33
extra_includes_first:
4+
- rev/REVLibError.h
45
- rev/SparkLowLevel.h
56

67
classes:
78
SparkMax:
89
typealias:
910
- rev::spark::SparkLowLevel::MotorType
11+
- rev::spark::SparkBase::PersistMode
12+
- rev::spark::SparkBase::ResetMode
1013
attributes:
1114
configAccessor:
1215
methods:
1316
SparkMax:
17+
Configure:
1418
GetAlternateEncoder:
1519
return_value_policy: reference_internal
20+
GetAbsoluteEncoder:
21+
return_value_policy: reference_internal
22+
GetForwardLimitSwitch:
23+
return_value_policy: reference_internal
24+
GetReverseLimitSwitch:
25+
return_value_policy: reference_internal
1626
PreGetAbsoluteEncoder:
1727
PreGetForwardLimitSwitch:
1828
PreGetReverseLimitSwitch:

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ author_email = "[email protected]"
66
url = "https://github.com/robotpy/robotpy-rev"
77
license = "BSD-3-Clause"
88
install_requires = [
9-
"wpilib~=2025.0.0b2",
9+
"wpilib~=2025.0.0b3",
1010
]
1111

1212
[build-system]
1313
requires = [
14-
"robotpy-build<2025.0.0b1,~=2025.0.0a4",
15-
"wpilib~=2025.0.0b2",
14+
"robotpy-build<2025.0.0b1,~=2025.0.0a6",
15+
"wpilib~=2025.0.0b3",
1616
]
1717

1818
[tool.robotpy-build]
@@ -22,14 +22,14 @@ base_package = "rev"
2222
artifact_id = "REVLib-driver"
2323
group_id = "com.revrobotics.frc"
2424
repo_url = "https://maven.revrobotics.com"
25-
version = "2025.0.0-beta-1"
25+
version = "2025.0.0-beta-4"
2626
libs = ["REVLibDriver"]
2727

2828
[tool.robotpy-build.static_libs."revlib".maven_lib_download]
2929
artifact_id = "REVLib-cpp"
3030
group_id = "com.revrobotics.frc"
3131
repo_url = "https://maven.revrobotics.com"
32-
version = "2025.0.0-beta-1"
32+
version = "2025.0.0-beta-4"
3333
libs = ["REVLib"]
3434

3535
[tool.robotpy-build.wrappers."rev"]

0 commit comments

Comments
 (0)