Skip to content

Commit

Permalink
Update to NavX official 2023 beta (#23)
Browse files Browse the repository at this point in the history
  • Loading branch information
auscompgeek committed Dec 4, 2022
1 parent fd8648c commit da5f52b
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
ci:
uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2022
uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2023
secrets:
SSH_USER: ${{ secrets.SSH_USER }}
SSH_KEY: ${{ secrets.SSH_KEY }}
Expand Down
22 changes: 11 additions & 11 deletions navx/src/ahrs.h.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- navx/include/AHRS.h.old 2022-02-23 22:50:12.467185181 -0500
+++ navx/include/AHRS.h 2022-02-23 22:50:33.246340207 -0500
@@ -157,6 +157,8 @@

AHRS(frc::SerialPort::Port serial_port_id, AHRS::SerialDataType data_type, uint8_t update_rate_hz);

+ ~AHRS();
+
float GetPitch();
float GetRoll();
float GetYaw();
--- navx/include/AHRS.h.old 2022-12-04 15:04:42.698404048 +1100
+++ navx/include/AHRS.h 2022-12-04 15:07:04.645489460 +1100
@@ -158,6 +158,8 @@

AHRS(frc::SerialPort::Port serial_port_id, AHRS::SerialDataType data_type, uint8_t update_rate_hz);

+ ~AHRS();
+
float GetPitch();
float GetRoll();
float GetYaw();
32 changes: 16 additions & 16 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
[build-system]
requires = [
"robotpy-build<2023.0.0,>=2022.2.1",
"wpilib<2023.0.0,>=2022.2.1.3",
"robotpy-build<2024.0.0,>=2023.0.0b14",
"wpilib<2024.0.0,>=2023.0.0b4",
]

[tool.robotpy-build]
base_package = "navx"

[tool.robotpy-build.metadata]
name = "robotpy-navx"
description = "Python wrapper for KauaiLabs NavX sensor"
author = "RobotPy Development Team"
author_email = "robotpy@googlegroups.com"
url = "https://github.com/robotpy/robotpy-navx"
license = "BSD-3-Clause"
install_requires = [
"wpilib<2024.0.0,>=2023.0.0b4",
]

[tool.robotpy-build.wrappers."navx".maven_lib_download]
artifact_id = "navx-cpp"
artifact_id = "navx-frc-cpp"
group_id = "com.kauailabs.navx.frc"
repo_url = "https://repo1.maven.org/maven2"
version = "4.0.442"
repo_url = "https://dev.studica.com/maven/release/2023"
version = "2023.0.0"
use_sources = true
sources = [
"AHRS.cpp",
Expand Down Expand Up @@ -55,14 +66,3 @@ generate = [
# { ITimestampedDataSubscriber = "ITimestampedDataSubscriber.h" },
]
generation_data = "gen"

[tool.robotpy-build.metadata]
name = "robotpy-navx"
description = "Python wrapper for KauaiLabs NavX sensor"
author = "RobotPy Development Team"
author_email = "robotpy@googlegroups.com"
url = "https://github.com/robotpy/robotpy-navx"
license = "BSD-3-Clause"
install_requires = [
"wpilib<2023.0.0,>=2022.2.1.3",
]
2 changes: 1 addition & 1 deletion tests/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
root = abspath(dirname(__file__))
os.chdir(root)

subprocess.check_call([sys.executable, "-m", "py.test"])
subprocess.check_call([sys.executable, "-m", "pytest"])

0 comments on commit da5f52b

Please sign in to comment.