Skip to content

Commit fe808d9

Browse files
committed
Update to 2025 beta
1 parent e1e3eb4 commit fe808d9

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

examples/basic/robot.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22

33
import wpilib
4-
from networktables import NetworkTables
4+
from ntcore import NetworkTableInstance
55

66

77
import navx
@@ -13,7 +13,7 @@ def run():
1313

1414
class MyRobot(wpilib.TimedRobot):
1515
def robotInit(self):
16-
self.sd = NetworkTables.getTable("SmartDashboard")
16+
self.sd = NetworkTableInstance.getDefault().getTable("SmartDashboard")
1717

1818
self.timer = wpilib.Timer()
1919

@@ -36,7 +36,7 @@ def disabledInit(self):
3636
self.timer.start()
3737

3838
def disabledPeriodic(self):
39-
if self.timer.hasPeriodPassed(0.5):
39+
if self.timer.advanceIfElapsed(0.5):
4040
self.sd.putNumber("Displacement X", self.navx.getDisplacementX())
4141
self.sd.putNumber("Displacement Y", self.navx.getDisplacementY())
4242
self.sd.putBoolean("IsCalibrating", self.navx.isCalibrating())

navx/src/sources.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ diff -ur orig/SimIO.cpp patched/SimIO.cpp
5353
+ HAL_NotifierHandle handle = m_notifier.exchange(0);
5454
+ HAL_StopNotifier(handle, &status);
5555
+ FRC_ReportError(status, "{}", "~SimIO stop");
56-
+ HAL_CleanNotifier(handle, &status);
56+
+ HAL_CleanNotifier(handle);
5757
+ FRC_ReportError(status, "{}", "~SimIO clean");
5858
}
5959

pyproject.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[build-system]
22
requires = [
3-
"robotpy-build<2025.0.0,~=2024.0.0",
4-
"robotpy-wpimath<2025.0.0,>=2024.3.2",
5-
"robotpy-wpiutil<2025.0.0,>=2024.3.2",
6-
"wpilib<2025.0.0,>=2024.3.2",
3+
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
4+
"robotpy-wpiutil~=2025.0.0b1",
5+
"robotpy-wpimath~=2025.0.0b1",
6+
"wpilib~=2025.0.0b1",
77
]
88

99
[tool.robotpy-build]
@@ -17,16 +17,16 @@ author_email = "robotpy@googlegroups.com"
1717
url = "https://github.com/robotpy/robotpy-navx"
1818
license = "BSD-3-Clause"
1919
install_requires = [
20-
"robotpy-wpimath<2025.0.0,>=2024.3.2",
21-
"robotpy-wpiutil<2025.0.0,>=2024.3.2",
22-
"wpilib<2025.0.0,>=2024.3.2",
20+
"robotpy-wpiutil~=2025.0.0b1",
21+
"robotpy-wpimath~=2025.0.0b1",
22+
"wpilib~=2025.0.0b1",
2323
]
2424

2525
[tool.robotpy-build.wrappers."navx".maven_lib_download]
26-
artifact_id = "navx-frc-cpp"
26+
artifact_id = "navx_frc-cpp"
2727
group_id = "com.kauailabs.navx.frc"
28-
repo_url = "https://dev.studica.com/maven/release/2024"
29-
version = "2024.1.0"
28+
repo_url = "https://dev.studica.com/maven/release/2025"
29+
version = "2025.1.1-beta-1"
3030
use_sources = true
3131
sources = [
3232
"AHRS.cpp",

0 commit comments

Comments
 (0)