Skip to content

Commit cdf0f16

Browse files
committed
Updates for 2027
1 parent 2c535d4 commit cdf0f16

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

.github/workflows/dist.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ on:
66
push:
77
branches:
88
- main
9+
- '2027'
910
tags:
1011
- '*'
1112

1213
jobs:
1314
ci:
14-
uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2025
15+
uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2027
1516
secrets:
1617
META_REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
1718
PYPI_API_TOKEN: ${{ secrets.PYPI_PASSWORD }}

magicbot/magicrobot.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,7 @@ class MagicRobot(wpilib.RobotBase):
6767

6868
def __init__(self) -> None:
6969
super().__init__()
70-
hal.report(
71-
hal.tResourceType.kResourceType_Framework.value,
72-
hal.tInstances.kFramework_MagicBot.value,
73-
)
70+
hal.reportUsage("Framework", "Magicbot")
7471

7572
self._exclude_from_injection = ["logger"]
7673

@@ -85,7 +82,6 @@ def __init__(self) -> None:
8582
# cache these
8683
self.__is_ds_attached = wpilib.DriverStation.isDSAttached
8784
self.__sd_update = wpilib.SmartDashboard.updateValues
88-
self.__lv_update = wpilib.LiveWindow.updateValues
8985
# self.__sf_update = Shuffleboard.update
9086

9187
def _simulationInit(self) -> None:
@@ -116,7 +112,6 @@ def robotInit(self) -> None:
116112
# cache these
117113
self.__is_ds_attached = wpilib.DriverStation.isDSAttached
118114
self.__sd_update = wpilib.SmartDashboard.updateValues
119-
self.__lv_update = wpilib.LiveWindow.updateValues
120115
# self.__sf_update = Shuffleboard.update
121116

122117
self.__nt = NetworkTableInstance.getDefault().getTable("/robot")
@@ -259,14 +254,11 @@ def robotPeriodic(self) -> None:
259254
You may use it for any code you need to run
260255
during all modes of the robot (e.g NetworkTables updates)
261256
262-
The default implementation will update
263-
SmartDashboard, LiveWindow and Shuffleboard.
257+
The default implementation will update SmartDashboard
264258
"""
265259
watchdog = self.watchdog
266260
self.__sd_update()
267261
watchdog.addEpoch("SmartDashboard")
268-
self.__lv_update()
269-
watchdog.addEpoch("LiveWindow")
270262
# self.__sf_update()
271263
# watchdog.addEpoch("Shuffleboard")
272264

@@ -519,7 +511,6 @@ def _test(self) -> None:
519511
self.__nt_put_mode("test")
520512
self.__nt_put_is_ds_attached(self.__is_ds_attached())
521513

522-
wpilib.LiveWindow.setEnabled(True)
523514
# Shuffleboard.enableActuatorWidgets()
524515

525516
# initialize things
@@ -555,7 +546,6 @@ def _test(self) -> None:
555546
delay.wait()
556547
watchdog.reset()
557548

558-
wpilib.LiveWindow.setEnabled(False)
559549
# Shuffleboard.disableActuatorWidgets()
560550

561551
def _on_mode_enable_components(self) -> None:

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ zip_safe = False
2424
include_package_data = True
2525
packages = find:
2626
install_requires =
27-
wpilib>=2025.1.1,<2026
27+
wpilib>=2027.0.0a2,<2028
2828
setup_requires =
2929
setuptools_scm > 6
3030
python_requires = >=3.9

0 commit comments

Comments
 (0)