Skip to content

Commit

Permalink
Merge pull request #29 from robotpy/2024-beta
Browse files Browse the repository at this point in the history
Update to 2024-beta
  • Loading branch information
virtuald authored Nov 1, 2023
2 parents bdbc4eb + c36e84f commit e1b8885
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 11 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ on:

jobs:
ci:
uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2023
uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2024
with:
artifactory_repo_type: vendor
secrets:
SSH_USER: ${{ secrets.SSH_USER }}
SSH_KEY: ${{ secrets.SSH_KEY }}
SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }}
META_REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
RTD_TOKEN: ${{ secrets.RTD_TOKEN }}
RTD_WEBHOOK: ${{ secrets.RTD_WEBHOOK }}
WPI_ARTIFACTORY_USERNAME: ${{ secrets.WPI_ARTIFACTORY_USERNAME }}
WPI_ARTIFACTORY_TOKEN: ${{ secrets.WPI_ARTIFACTORY_TOKEN }}
PYPI_API_TOKEN: ${{ secrets.PYPI_PASSWORD }}
1 change: 0 additions & 1 deletion examples/basic/robot.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ def run():

class MyRobot(wpilib.TimedRobot):
def robotInit(self):

self.sd = NetworkTables.getTable("SmartDashboard")

self.timer = wpilib.Timer()
Expand Down
15 changes: 15 additions & 0 deletions gen/AHRS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,21 @@ classes:
invoking the zeroYaw() method.
:returns: The current yaw value in degrees (-180 to 180).
GetRotation2d:
doc: |
Return the heading of the robot as a Rotation2d.
The angle is continuous, that is it will continue from 360 to 361 degrees.
This allows algorithms that wouldn't want to see a discontinuity in the
gyro output as it sweeps past from 360 to 0 on the second time around.
The angle is expected to increase as the gyro turns counterclockwise when
looked at from the top. It needs to follow the NWU axis convention.
:returns: the current heading of the robot as a Rotation2d. This heading is
based on integration of the returned rate from the gyro.
GetRotation3d:
doc: Constructs a Rotation3d from the NavX quaternion.
GetCompassHeading:
doc: |
Returns the current tilt-compensated compass heading
Expand Down
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
requires = [
"robotpy-build<2024.0.0,>=2023.0.1",
"wpilib<2024.0.0,>=2023.2.1.0",
"robotpy-build<2025.0.0,~=2024.0.0b2",
"wpilib<2025.0.0,>=2024.0.0b2",
]

[tool.robotpy-build]
Expand All @@ -15,14 +15,14 @@ author_email = "[email protected]"
url = "https://github.com/robotpy/robotpy-navx"
license = "BSD-3-Clause"
install_requires = [
"wpilib<2024.0.0,>=2023.2.1.0",
"wpilib<2025.0.0,>=2024.0.0b2",
]

[tool.robotpy-build.wrappers."navx".maven_lib_download]
artifact_id = "navx-frc-cpp"
group_id = "com.kauailabs.navx.frc"
repo_url = "https://dev.studica.com/maven/release/2023"
version = "2023.0.3"
repo_url = "https://dev.studica.com/maven/release/2024"
version = "2024.0.1-beta-3"
use_sources = true
sources = [
"AHRS.cpp",
Expand Down
1 change: 0 additions & 1 deletion tests/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import subprocess

if __name__ == "__main__":

root = abspath(dirname(__file__))
os.chdir(root)

Expand Down

0 comments on commit e1b8885

Please sign in to comment.