Event/unh (#32)

* jack needs to commit this * changing climb angle * Bump PID values Co-Authored By: @KenwoodFox * tune pickup constants * Remove spam * PID tuning * lkjgiufy * wowee --------- Co-authored-by: NotSimon5673 <[email protected]>
FRC-1721 · Jun 6, 2024 · 3420101 · 3420101
1 parent fa3259e
commit 3420101
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 23 deletions.
diff --git a/dashboard b/dashboard
diff --git a/rio/constants.py b/rio/constants.py
@@ -166,7 +166,8 @@ class SuperStrucConstants:
     # angles for shooter
     ShootPos = 321
     LoadPos = 204
-    ClimbPos = 277
+    ClimbPos = 285
+    HarmonyPos = 316
 
     # CANSpark IDS
     rotateID = 11
@@ -200,8 +201,8 @@ class IntakeConstants:
 
     # conversion factor
     kLiftConversion = 1  # Configured feb 12 by joe
-    SuckPos = 0.541
-    BlowPos = 0.005
+    SuckPos = 0.645
+    BlowPos = 0.1
     # lift pid
     kLiftP = 3.3
     kLiftI = 0.0000001

diff --git a/rio/robotcontainer.py b/rio/robotcontainer.py
@@ -180,11 +180,6 @@ def configureButtonBindings(self) -> None:
             )
         )
 
-        # set Shooter to climb position
-        self.driverController.y().onTrue(
-            ShooterROT(SuperStrucConstants.ClimbPos, self.shooter)
-        )
-
         # Deliver to amp (button a), part a
         self.driverController.a().onTrue(
             commands2.SequentialCommandGroup(
@@ -220,18 +215,10 @@ def configureButtonBindings(self) -> None:
 
         # Climbing
         self.driverController.pov(0).whileTrue(
-            Climb(
-                1,
-                self.climber,
-                self.shooter,
-            )
+            ShooterROT(SuperStrucConstants.HarmonyPos, self.shooter)
         )
         self.driverController.pov(180).whileTrue(
-            Climb(
-                -1,
-                self.climber,
-                self.shooter,
-            )
+            ShooterROT(SuperStrucConstants.ClimbPos, self.shooter)
         )
 
         self.driverController.leftBumper().whileTrue(
@@ -279,8 +266,8 @@ def configureButtonBindings(self) -> None:
 
         # shooter keybinds
         # shooter movement
-        self.opController.button(3).whileTrue(manualROT(0.5, self.shooter))
-        self.opController.button(4).whileTrue(manualROT(-0.5, self.shooter))
+        self.opController.button(3).whileTrue(manualROT(0.2, self.shooter))
+        self.opController.button(4).whileTrue(manualROT(-0.2, self.shooter))
 
         # climber
         self.opController.button(5).whileTrue(Climb(0.4, self.climber, self.shooter))

diff --git a/rio/simgui-window.json b/rio/simgui-window.json
@@ -26,7 +26,7 @@
     "###FMS": {
       "Collapsed": "0",
       "Pos": "5,540",
-      "Size": "169,184"
+      "Size": "283,140"
     },
     "###Joysticks": {
       "Collapsed": "0",

diff --git a/rio/subsystems/intake.py b/rio/subsystems/intake.py
@@ -87,7 +87,7 @@ def periodic(self) -> None:
         self.sd.putNumber(
             "Thermals/Intake/Rotate", self.liftMotor.getMotorTemperature()
         )
-        # print(self.liftEncoder.getPosition())
+        logging.debug(f" Lift encoder is {self.liftEncoder.getPosition()}")
 
     def intake(self, speed):
         self.intakeMotor.set(speed)
+ −		src/asset/Smelliot.png
+ −		src/asset/cotton.mp3
+4 −8		src/index.html
+4 −40		src/main.js
+20 −68		src/style.scss