Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apriltag/src/main/python/native-pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ packages = ["src/native"]
[[tool.hatch.build.hooks.robotpy.maven_lib_download]]
artifact_id = "apriltag-cpp"
group_id = "org.wpilib.apriltag"
repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027"
repo_url = ""
version = "0.0.0"

extract_to = "src/native/apriltag"
Expand Down
2 changes: 1 addition & 1 deletion apriltag/src/test/python/test_detection.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import cv2
import robotpy_apriltag
from wpimath.geometry import Transform3d
from wpimath import Transform3d

import math
import pathlib
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# validated: 2024-01-20 DS 92149efa11fa button/CommandGenericHID.java
from typing import Optional

from wpilib.event import EventLoop
from wpilib.interfaces import GenericHID
from wpilib import EventLoop, GenericHID

from ..commandscheduler import CommandScheduler
from .trigger import Trigger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# validated: 2024-01-20 DS 92aecab2ef05 button/CommandJoystick.java
from typing import Optional

from wpilib import Joystick
from wpilib.event import EventLoop
from wpilib import EventLoop, Joystick

from ..commandscheduler import CommandScheduler
from .commandgenerichid import CommandGenericHID
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# validated: 2024-01-20 DS d426873ed15b button/CommandPS4Controller.java
from typing import Optional

from wpilib import PS4Controller
from wpilib.event import EventLoop
from wpilib import EventLoop, PS4Controller

from ..commandscheduler import CommandScheduler
from .commandgenerichid import CommandGenericHID
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# validated: 2024-01-20 DS 3ba501f9478a button/CommandXboxController.java
from typing import Optional

from wpilib import XboxController
from wpilib.event import EventLoop
from wpilib import EventLoop, XboxController

from ..commandscheduler import CommandScheduler
from .commandgenerichid import CommandGenericHID
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# validated: 2024-01-20 DS 7a099cb02a33 button/JoystickButton.java
from wpilib.interfaces import GenericHID
from wpilib import GenericHID

from .trigger import Trigger

Expand Down
2 changes: 1 addition & 1 deletion commandsv2/src/main/python/commands2/button/povbutton.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# validated: 2024-01-20 DS 7a099cb02a33 button/POVButton.java
from wpilib.interfaces import GenericHID
from wpilib import GenericHID

from .trigger import Trigger

Expand Down
4 changes: 2 additions & 2 deletions commandsv2/src/main/python/commands2/button/trigger.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from typing import Callable, overload

from typing_extensions import Self
from wpilib.event import EventLoop
from wpimath.filter import Debouncer
from wpilib import EventLoop
from wpimath import Debouncer

from ..command import Command
from ..commandscheduler import CommandScheduler
Expand Down
2 changes: 1 addition & 1 deletion commandsv2/src/main/python/commands2/commandscheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
from wpilib import (
RobotBase,
DriverStation,
EventLoop,
TimedRobot,
Watchdog,
reportWarning,
)
from wpilib.event import EventLoop
from wpiutil import Sendable, SendableBuilder, SendableRegistry

from .command import Command, InterruptionBehavior
Expand Down
2 changes: 1 addition & 1 deletion commandsv2/src/main/python/commands2/pidcommand.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from .command import Command
from .subsystem import Subsystem

from wpimath.controller import PIDController
from wpimath import PIDController


class PIDCommand(Command):
Expand Down
2 changes: 1 addition & 1 deletion commandsv2/src/main/python/commands2/pidsubsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# the WPILib BSD license file in the root directory of this project.
from __future__ import annotations

from wpimath.controller import PIDController
from wpimath import PIDController

from .subsystem import Subsystem

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

from typing import Any, Generic

from wpimath.controller import ProfiledPIDController, ProfiledPIDControllerRadians
from wpimath.trajectory import TrapezoidProfile, TrapezoidProfileRadians
from wpimath import ProfiledPIDController, ProfiledPIDControllerRadians, TrapezoidProfile, TrapezoidProfileRadians

from .command import Command
from .subsystem import Subsystem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from typing import Generic

from wpimath.trajectory import TrapezoidProfile
from wpimath import TrapezoidProfile

from .subsystem import Subsystem
from .typing import TProfiledPIDController, TTrapezoidProfileState
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

from typing import Any, Union

from wpimath import units
from wpimath.trajectory import TrapezoidProfile, TrapezoidProfileRadians
from wpimath import TrapezoidProfile, TrapezoidProfileRadians, units


from .subsystem import Subsystem
Expand Down
3 changes: 1 addition & 2 deletions commandsv2/src/main/python/commands2/typing.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from typing import Callable, Protocol, TypeVar, Union

from typing_extensions import TypeAlias
from wpimath.controller import ProfiledPIDController, ProfiledPIDControllerRadians
from wpimath.trajectory import TrapezoidProfile, TrapezoidProfileRadians
from wpimath import ProfiledPIDController, ProfiledPIDControllerRadians, TrapezoidProfile, TrapezoidProfileRadians

# Generic Types
TProfiledPIDController = TypeVar(
Expand Down
9 changes: 5 additions & 4 deletions commandsv2/src/test/python/test_pidcommand.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from typing import TYPE_CHECKING

from util import * # type: ignore
import wpimath.controller as controller
import commands2

import wpimath

if TYPE_CHECKING:
from .util import *

Expand All @@ -15,7 +16,7 @@ def test_pidCommandSupplier(scheduler: commands2.CommandScheduler):
output_float = OOFloat(0.0)
measurement_source = OOFloat(5.0)
setpoint_source = OOFloat(2.0)
pid_controller = controller.PIDController(0.1, 0.01, 0.001)
pid_controller = wpimath.PIDController(0.1, 0.01, 0.001)
system = commands2.Subsystem()
pidCommand = commands2.PIDCommand(
pid_controller,
Expand Down Expand Up @@ -50,7 +51,7 @@ def test_pidCommandScalar(scheduler: commands2.CommandScheduler):
output_float = OOFloat(0.0)
measurement_source = OOFloat(5.0)
setpoint_source = 2.0
pid_controller = controller.PIDController(0.1, 0.01, 0.001)
pid_controller = wpimath.PIDController(0.1, 0.01, 0.001)
system = commands2.Subsystem()
pidCommand = commands2.PIDCommand(
pid_controller,
Expand Down Expand Up @@ -85,7 +86,7 @@ def test_withTimeout(scheduler: commands2.CommandScheduler):
output_float = OOFloat(0.0)
measurement_source = OOFloat(5.0)
setpoint_source = OOFloat(2.0)
pid_controller = controller.PIDController(0.1, 0.01, 0.001)
pid_controller = wpimath.PIDController(0.1, 0.01, 0.001)
system = commands2.Subsystem()
command1 = commands2.PIDCommand(
pid_controller,
Expand Down
3 changes: 1 addition & 2 deletions commandsv2/src/test/python/test_profiledpidsubsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
from typing import Any

import pytest
from wpimath.controller import ProfiledPIDController, ProfiledPIDControllerRadians
from wpimath.trajectory import TrapezoidProfile, TrapezoidProfileRadians
from wpimath import ProfiledPIDController, ProfiledPIDControllerRadians, TrapezoidProfile, TrapezoidProfileRadians

from commands2 import ProfiledPIDSubsystem

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
from typing import TYPE_CHECKING, List, Tuple
import math

import wpimath.controller as controller
import wpimath.trajectory as trajectory
import wpimath.geometry as geometry
import wpimath.kinematics as kinematics
from wpimath.trajectory import TrapezoidProfile as DimensionlessProfile
from wpimath.trajectory import TrapezoidProfileRadians as RadiansProfile
from wpimath import TrapezoidProfile as DimensionlessProfile, TrapezoidProfileRadians as RadiansProfile

from wpilib import Timer

Expand Down
2 changes: 1 addition & 1 deletion datalog/src/main/python/native-pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ packages = ["src/native"]
[[tool.hatch.build.hooks.robotpy.maven_lib_download]]
artifact_id = "datalog-cpp"
group_id = "org.wpilib.datalog"
repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027"
repo_url = ""
version = "0.0.0"

extract_to = "src/native/datalog"
Expand Down
Loading
Loading