Merge branch 'dev' into Alex's-BRANCH

.gitignore

@@ -159,3 +159,6 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
+
+# sim
+simgui*

pyproject.toml

@@ -6,28 +6,25 @@
 [tool.robotpy]
 
 # Version of robotpy this project depends on
-robotpy_version = "2024.1.1.1"
+robotpy_version = "2024.3.2.2"
 
 # Which extra RobotPy components should be installed
 # -> equivalent to `pip install robotpy[extra1, ...]
 robotpy_extras = [
-    "all",
-    # "apriltag"
-    # "commands2",
-    # "cscore"
-    # "navx"
-    # "pathplannerlib"
+    # "all",
+    "apriltag",
+    "commands2",
+    # "cscore",
+    # "navx",
+    "pathplannerlib",
     # "phoenix5",
-    # "phoenix6",
-    # "playingwithfusion"
+    "phoenix6",
+    # "playingwithfusion",
     "rev",
-    # "romi"
-    "sim"
+    # "romi",
+    "sim",
     # "xrp"
 ]
 
 # Other pip packages to install
-requires = [
-    "robotpy-commands-v2==2024.0.0b4",
-    "robotpy-ctre==2024.0.0b4",
-]
+requires = []

robot.py

@@ -1,6 +1,6 @@
 import commands2
 from toolkit.subsystem import Subsystem
-import phoenix5 as ctre
+import phoenix6 as ctre
 import ntcore
 import wpilib
 import command

tests/__init__.py

@@ -1 +1 @@
-from tests.mechanism_setup import mechanism
+# from tests.mechanism_setup import mechanism

tests/conftest.py

@@ -1,7 +1,7 @@
 import pytest
 import wpilib
 from unittest import mock
-import phoenix5 as ctre
+import phoenix6 as ctre
 import commands2
 import rev
 from robot_systems import Robot, Sensors, Pneumatics