Skip to content

Commit

Permalink
Merge pull request #112 from robotpy/2025-dev
Browse files Browse the repository at this point in the history
Beta 2
  • Loading branch information
virtuald authored Nov 21, 2024
2 parents 84348aa + d1461b0 commit ba473ac
Show file tree
Hide file tree
Showing 57 changed files with 428 additions and 133 deletions.
4 changes: 2 additions & 2 deletions rdev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
[params]

# wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release"
wpilib_bin_version = "2025.1.1-beta-1"
wpilib_bin_version = "2025.1.1-beta-2"
wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development"

# Don't update these artifacts
exclude_artifacts = [
"opencv-cpp"
]

robotpy_build_req = "<2025.0.0b1,~=2025.0.0a1"
robotpy_build_req = "<2025.0.0b1,~=2025.0.0a4"

#
# Subproject configuration
Expand Down
4 changes: 4 additions & 0 deletions subprojects/pyntcore/gen/NetworkTableValue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ extra_includes:
- networktables/NetworkTableType.h
- src/py2value.h

functions:
Now:
ignore: true

classes:
Value:
methods:
Expand Down
4 changes: 2 additions & 2 deletions subprojects/pyntcore/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install_requires = [

[build-system]
requires = [
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
"robotpy-build<2025.0.0b1,~=2025.0.0a4",
"robotpy-wpiutil~=2025.0.0b1",
"robotpy-wpinet~=2025.0.0b1",
]
Expand All @@ -37,7 +37,7 @@ scan_headers_ignore = [
artifact_id = "ntcore-cpp"
group_id = "edu.wpi.first.ntcore"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"

libs = ["ntcore"]

Expand Down
4 changes: 2 additions & 2 deletions subprojects/robotpy-apriltag/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install_requires = [

[build-system]
requires = [
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
"robotpy-build<2025.0.0b1,~=2025.0.0a4",
"robotpy-wpiutil~=2025.0.0b1",
"robotpy-wpimath~=2025.0.0b1",
]
Expand Down Expand Up @@ -40,7 +40,7 @@ scan_headers_ignore = [
artifact_id = "apriltag-cpp"
group_id = "edu.wpi.first.apriltag"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"

libs = ["apriltag"]

Expand Down
6 changes: 3 additions & 3 deletions subprojects/robotpy-cscore/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ install_requires = [

[build-system]
requires = [
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
"robotpy-build<2025.0.0b1,~=2025.0.0a4",
"robotpy-wpiutil~=2025.0.0b1",
"robotpy-wpinet~=2025.0.0b1",
"pyntcore~=2025.0.0b1",
Expand All @@ -30,15 +30,15 @@ update_init = [
artifact_id = "cscore-cpp"
group_id = "edu.wpi.first.cscore"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"

libs = ["cscore"]

[tool.robotpy-build.static_libs."cameraserver_cpp".maven_lib_download]
artifact_id = "cameraserver-cpp"
group_id = "edu.wpi.first.cameraserver"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"

libs = ["cameraserver"]

Expand Down
4 changes: 2 additions & 2 deletions subprojects/robotpy-hal/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ install_requires = [

[build-system]
requires = [
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
"robotpy-build<2025.0.0b1,~=2025.0.0a4",
"robotpy-wpiutil~=2025.0.0b1",
]

Expand Down Expand Up @@ -53,7 +53,7 @@ artifact_id = "hal-cpp"
group_id = "edu.wpi.first.hal"
# repo_url = "https://frcmaven.wpi.edu/artifactory/release"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"

libs = ["wpiHal"]

Expand Down
4 changes: 2 additions & 2 deletions subprojects/robotpy-halsim-ds-socket/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ robotpysimext = ["ds-socket = halsim_ds_socket"]

[build-system]
requires = [
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
"robotpy-build<2025.0.0b1,~=2025.0.0a4",
"robotpy-hal~=2025.0.0b1",
"robotpy-wpinet~=2025.0.0b1",
]
Expand All @@ -28,7 +28,7 @@ artifact_id = "halsim_ds_socket"
group_id = "edu.wpi.first.halsim"
# repo_url = "https://frcmaven.wpi.edu/artifactory/release"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"

dlopenlibs = ["halsim_ds_socket"]

Expand Down
4 changes: 2 additions & 2 deletions subprojects/robotpy-halsim-gui/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ install_requires = [

[build-system]
requires = [
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
"robotpy-build<2025.0.0b1,~=2025.0.0a4",
"robotpy-wpiutil~=2025.0.0b1",
"robotpy-wpimath~=2025.0.0b1",
"robotpy-hal~=2025.0.0b1",
Expand All @@ -30,7 +30,7 @@ artifact_id = "halsim_gui"
group_id = "edu.wpi.first.halsim"
# repo_url = "https://frcmaven.wpi.edu/artifactory/release"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"

dlopenlibs = ["halsim_gui"]

Expand Down
6 changes: 3 additions & 3 deletions subprojects/robotpy-halsim-ws/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ robotpysimext = [

[build-system]
requires = [
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
"robotpy-build<2025.0.0b1,~=2025.0.0a4",
"robotpy-hal~=2025.0.0b1",
"robotpy-wpinet~=2025.0.0b1",
]
Expand All @@ -32,7 +32,7 @@ artifact_id = "halsim_ws_server"
group_id = "edu.wpi.first.halsim"
# repo_url = "https://frcmaven.wpi.edu/artifactory/release"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"

dlopenlibs = ["halsim_ws_server"]

Expand All @@ -45,7 +45,7 @@ artifact_id = "halsim_ws_client"
group_id = "edu.wpi.first.halsim"
# repo_url = "https://frcmaven.wpi.edu/artifactory/release"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"

dlopenlibs = ["halsim_ws_client"]

Expand Down
4 changes: 2 additions & 2 deletions subprojects/robotpy-romi/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ install_requires = [

[build-system]
requires = [
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
"robotpy-build<2025.0.0b1,~=2025.0.0a4",
"wpilib~=2025.0.0b1"
]

Expand Down Expand Up @@ -39,5 +39,5 @@ artifact_id = "romiVendordep-cpp"
group_id = "edu.wpi.first.romiVendordep"
# repo_url = "https://frcmaven.wpi.edu/artifactory/release"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"
libs = ["romiVendordep"]
7 changes: 7 additions & 0 deletions subprojects/robotpy-wpilib/gen/Alert.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
---

functions:
format_as:
ignore: true

classes:
Alert:
enums:
Expand All @@ -10,4 +14,7 @@ classes:
std::string_view, AlertType:
std::string_view, std::string_view, AlertType:
Set:
Get:
SetText:
GetText:
GetType:
8 changes: 4 additions & 4 deletions subprojects/robotpy-wpilib/gen/Color.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,17 @@ classes:
methods:
Color:
overloads:
'[constexpr]':
double, double, double [constexpr]:
'':
double, double, double:
param_override:
r:
name: red
g:
name: green
b:
name: blue
int, int, int [constexpr]:
std::string_view [constexpr]:
int, int, int:
std::string_view:
FromHSV:
HexString:
operator==:
Expand Down
8 changes: 4 additions & 4 deletions subprojects/robotpy-wpilib/gen/Color8Bit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ classes:
methods:
Color8Bit:
overloads:
'[constexpr]':
int, int, int [constexpr]:
'':
int, int, int:
param_override:
r:
name: red
g:
name: green
b:
name: blue
const Color& [constexpr]:
std::string_view [constexpr]:
const Color&:
std::string_view:
FromHexString:
HexString:
operator==:
Expand Down
3 changes: 3 additions & 0 deletions subprojects/robotpy-wpilib/gen/RobotBase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ classes:
access: readonly
m_threadId:
ignore: true
connListenerHandle:
ignore: true
m_dashboardDetected:
methods:
IsEnabled:
IsDisabled:
Expand Down
2 changes: 2 additions & 0 deletions subprojects/robotpy-wpilib/gen/RobotController.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ classes:
GetSerialNumber:
GetComments:
GetTeamNumber:
SetTimeSource:
GetTime:
GetFPGATime:
GetUserButton:
IsSysActive:
Expand Down
2 changes: 1 addition & 1 deletion subprojects/robotpy-wpilib/gen/TimedRobot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ classes:
methods:
StartCompetition:
EndCompetition:
GetPeriod:
GetLoopStartTime:
AddPeriodic:
param_override:
offset:
Expand Down
2 changes: 2 additions & 0 deletions subprojects/robotpy-wpilib/gen/Timer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ classes:
GetMatchTime:
HasElapsed:
AdvanceIfElapsed:
IsRunning:
GetTimestamp:
6 changes: 6 additions & 0 deletions subprojects/robotpy-wpilib/gen/simulation/DCMotorSim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,9 @@ classes:
GetAngularVelocity:
GetCurrentDraw:
SetInputVoltage:
GetAngularAcceleration:
GetTorque:
GetInputVoltage:
Gearbox:
Gearing:
J:
4 changes: 2 additions & 2 deletions subprojects/robotpy-wpilib/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ robotpy = ["run = wpilib._impl.start:Main"]

[build-system]
requires = [
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
"robotpy-build<2025.0.0b1,~=2025.0.0a4",
"robotpy-wpiutil~=2025.0.0b1",
"robotpy-wpimath~=2025.0.0b1",
"robotpy-hal~=2025.0.0b1",
Expand Down Expand Up @@ -69,7 +69,7 @@ scan_headers_ignore = [
artifact_id = "wpilibc-cpp"
group_id = "edu.wpi.first.wpilibc"
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
version = "2025.1.1-beta-1"
version = "2025.1.1-beta-2"

libs = ["wpilibc"]

Expand Down
2 changes: 2 additions & 0 deletions subprojects/robotpy-wpilib/wpilib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
ADXL362,
ADXRS450_Gyro,
AddressableLED,
Alert,
AnalogAccelerometer,
AnalogEncoder,
AnalogGyro,
Expand Down Expand Up @@ -121,6 +122,7 @@
"ADXL362",
"ADXRS450_Gyro",
"AddressableLED",
"Alert",
"AnalogAccelerometer",
"AnalogEncoder",
"AnalogGyro",
Expand Down
4 changes: 2 additions & 2 deletions subprojects/robotpy-wpimath/gen/MathUtil.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ functions:
- [double]
IsNear:
overloads:
T, T, T [constexpr]:
T, T, T:
ignore: true
template_impls:
- [double]
T, T, T, T, T [constexpr]:
T, T, T, T, T:
ignore: true
template_impls:
- [double]
8 changes: 6 additions & 2 deletions subprojects/robotpy-wpimath/gen/controls/ArmFeedforward.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ classes:
methods:
ArmFeedforward:
overloads:
'[constexpr]':
units::volt_t, units::volt_t, units::unit_t<kv_unit>, units::unit_t<ka_unit> [constexpr]:
'':
units::volt_t, units::volt_t, units::unit_t<kv_unit>, units::unit_t<ka_unit>:
Calculate:
overloads:
units::unit_t<Angle>, units::unit_t<Velocity>, units::unit_t<Acceleration> [const]:
ignore: true
units::unit_t<Angle>, units::unit_t<Velocity>, units::unit_t<Velocity>, units::second_t [const]:
ignore: true
units::unit_t<Angle>, units::unit_t<Velocity> [const]:
units::unit_t<Angle>, units::unit_t<Velocity>, units::unit_t<Velocity> [const]:
MaxAchievableVelocity:
MinAchievableVelocity:
MaxAchievableAcceleration:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---

classes:
DifferentialDrivePoseEstimator3d:
subpackage: estimator
force_no_trampoline: true
methods:
DifferentialDrivePoseEstimator3d:
overloads:
DifferentialDriveKinematics&, const Rotation3d&, units::meter_t, units::meter_t, const Pose3d&:
? DifferentialDriveKinematics&, const Rotation3d&, units::meter_t, units::meter_t,
const Pose3d&, const wpi::array<double, 4>&, const wpi::array<double,
4>&
:
ResetPosition:
Update:
UpdateWithTime:
Loading

0 comments on commit ba473ac

Please sign in to comment.