Merge branch 'main' of github.com:StuyPulse/BigWang into se/kraken-time

StuyPulse · Mar 23, 2024 · d5afd77 · d5afd77
2 parents 1bbc687 + b301ed9
commit d5afd77
Show file tree

Hide file tree

Showing 70 changed files with 366 additions and 290 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.3.1"
+    id "edu.wpi.first.GradleRIO" version "2024.3.2"
     id "com.diffplug.spotless" version "6.22.0"
 }
 

diff --git a/dslogs/2024_03_16 13_43_58 Sat.dsevents b/dslogs/2024_03_16 13_43_58 Sat.dsevents
diff --git a/dslogs/2024_03_16 13_43_58 Sat.dslog b/dslogs/2024_03_16 13_43_58 Sat.dslog
diff --git a/dslogs/2024_03_16 13_44_45 Sat.dsevents b/dslogs/2024_03_16 13_44_45 Sat.dsevents
diff --git a/dslogs/2024_03_16 13_44_45 Sat.dslog b/dslogs/2024_03_16 13_44_45 Sat.dslog
diff --git a/dslogs/2024_03_16 13_58_15 Sat.dsevents b/dslogs/2024_03_16 13_58_15 Sat.dsevents
diff --git a/dslogs/2024_03_16 13_58_15 Sat.dslog b/dslogs/2024_03_16 13_58_15 Sat.dslog
diff --git a/src/main/deploy/pathplanner/autos/2 DE.auto b/src/main/deploy/pathplanner/autos/2 DE.auto
@@ -8,7 +8,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "A To D"
+            "pathName": "Preload Shot to D"
           }
         },
         {
@@ -26,7 +26,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "E To Shoot"
+            "pathName": "E to Shoot"
           }
         }
       ]

diff --git a/src/main/deploy/pathplanner/autos/3 ADE.auto b/src/main/deploy/pathplanner/autos/3 ADE.auto
@@ -8,13 +8,13 @@
         {
           "type": "path",
           "data": {
-            "pathName": "First Piece To A"
+            "pathName": "Preload Shot to A"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "A To D"
+            "pathName": "A to D"
           }
         },
         {
@@ -32,7 +32,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "E To Shoot"
+            "pathName": "E to Shoot"
           }
         }
       ]

diff --git a/src/main/deploy/pathplanner/autos/4 CBA.auto b/src/main/deploy/pathplanner/autos/4 CBA.auto
diff --git a/src/main/deploy/pathplanner/autos/4 HGF.auto b/src/main/deploy/pathplanner/autos/4 HGF.auto
@@ -8,37 +8,37 @@
         {
           "type": "path",
           "data": {
-            "pathName": "Start To H (HGF)"
+            "pathName": "Start to H (HGF)"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "H To HShoot (HGF)"
+            "pathName": "H to HShoot (HGF)"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "HShoot To G (HGF)"
+            "pathName": "HShoot to G (HGF)"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "G To Shoot (HGF)"
+            "pathName": "G to Shoot (HGF)"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "GShoot To F (HGF)"
+            "pathName": "GShoot to F (HGF)"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "F To Shoot (HGF)"
+            "pathName": "F to Shoot (HGF)"
           }
         }
       ]

diff --git a/src/main/deploy/pathplanner/autos/5 CBAE Podium Forward.auto b/src/main/deploy/pathplanner/autos/5 CBAE Podium Forward.auto
@@ -8,31 +8,31 @@
         {
           "type": "path",
           "data": {
-            "pathName": "Forward First Piece to C"
+            "pathName": "Close Preload to C"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "C to B 2"
+            "pathName": "C to B Close"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "B To A"
+            "pathName": "B to A"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "A To E"
+            "pathName": "A to E"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "E To Shoot"
+            "pathName": "E to Shoot"
           }
         }
       ]

diff --git a/src/main/deploy/pathplanner/autos/5 CBAE Podium.auto b/src/main/deploy/pathplanner/autos/5 CBAE Podium.auto
@@ -8,7 +8,7 @@
         {
           "type": "path",
           "data": {
-            "pathName": "Blay First Piece To C"
+            "pathName": "Preload to C"
           }
         },
         {
@@ -20,19 +20,19 @@
         {
           "type": "path",
           "data": {
-            "pathName": "B To A"
+            "pathName": "B to A"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "A To E"
+            "pathName": "A to E"
           }
         },
         {
           "type": "path",
           "data": {
-            "pathName": "E To Shoot"
+            "pathName": "E to Shoot"
           }
         }
       ]

diff --git a/src/main/deploy/pathplanner/autos/5 CBAE.auto b/src/main/deploy/pathplanner/autos/5 CBAE.auto
diff --git a/...main/deploy/pathplanner/paths/A To D.path → ...main/deploy/pathplanner/paths/A to D.path b/...main/deploy/pathplanner/paths/A To D.path → ...main/deploy/pathplanner/paths/A to D.path
diff --git a/...main/deploy/pathplanner/paths/A To E.path → ...main/deploy/pathplanner/paths/A to E.path b/...main/deploy/pathplanner/paths/A To E.path → ...main/deploy/pathplanner/paths/A to E.path
diff --git a/...athplanner/paths/A To Intermediate D.path → ...athplanner/paths/A to Intermediate D.path b/...athplanner/paths/A To Intermediate D.path → ...athplanner/paths/A to Intermediate D.path
diff --git a/...main/deploy/pathplanner/paths/B To A.path → ...main/deploy/pathplanner/paths/B to A.path b/...main/deploy/pathplanner/paths/B To A.path → ...main/deploy/pathplanner/paths/B to A.path
diff --git a/...in/deploy/pathplanner/paths/C to B 2.path → ...eploy/pathplanner/paths/C to B Close.path b/...in/deploy/pathplanner/paths/C to B 2.path → ...eploy/pathplanner/paths/C to B Close.path
diff --git a/.../deploy/pathplanner/paths/C To Shoot.path → .../deploy/pathplanner/paths/C to Shoot.path b/.../deploy/pathplanner/paths/C To Shoot.path → .../deploy/pathplanner/paths/C to Shoot.path
diff --git a/...anner/paths/Forward First Piece to C.path → ...pathplanner/paths/Close Preload to C.path b/...anner/paths/Forward First Piece to C.path → ...pathplanner/paths/Close Preload to C.path
diff --git a/.../deploy/pathplanner/paths/D To Shoot.path → .../deploy/pathplanner/paths/D to Shoot.path b/.../deploy/pathplanner/paths/D To Shoot.path → .../deploy/pathplanner/paths/D to Shoot.path
diff --git a/.../deploy/pathplanner/paths/E To Shoot.path → .../deploy/pathplanner/paths/E to Shoot.path b/.../deploy/pathplanner/paths/E To Shoot.path → .../deploy/pathplanner/paths/E to Shoot.path
diff --git a/...y/pathplanner/paths/F To Shoot (HGF).path → ...y/pathplanner/paths/F to Shoot (HGF).path b/...y/pathplanner/paths/F To Shoot (HGF).path → ...y/pathplanner/paths/F to Shoot (HGF).path
diff --git a/.../pathplanner/paths/G To GShoot (GHF).path → .../pathplanner/paths/G to GShoot (GHF).path b/.../pathplanner/paths/G To GShoot (GHF).path → .../pathplanner/paths/G to GShoot (GHF).path
diff --git a/...y/pathplanner/paths/G To Shoot (HGF).path → ...y/pathplanner/paths/G to Shoot (HGF).path b/...y/pathplanner/paths/G To Shoot (HGF).path → ...y/pathplanner/paths/G to Shoot (HGF).path
diff --git a/.../pathplanner/paths/GShoot To F (HGF).path → .../pathplanner/paths/GShoot to F (HGF).path b/.../pathplanner/paths/GShoot To F (HGF).path → .../pathplanner/paths/GShoot to F (HGF).path
diff --git a/.../pathplanner/paths/GShoot To H (GHF).path → .../pathplanner/paths/GShoot to H (GHF).path b/.../pathplanner/paths/GShoot To H (GHF).path → .../pathplanner/paths/GShoot to H (GHF).path
diff --git a/.../pathplanner/paths/H To HShoot (HGF).path → .../pathplanner/paths/H to HShoot (HGF).path b/.../pathplanner/paths/H To HShoot (HGF).path → .../pathplanner/paths/H to HShoot (HGF).path
diff --git a/.../pathplanner/paths/HShoot To F (GHF).path → .../pathplanner/paths/HShoot to F (GHF).path b/.../pathplanner/paths/HShoot To F (GHF).path → .../pathplanner/paths/HShoot to F (GHF).path
diff --git a/.../pathplanner/paths/HShoot To G (HGF).path → .../pathplanner/paths/HShoot to G (HGF).path b/.../pathplanner/paths/HShoot To G (HGF).path → .../pathplanner/paths/HShoot to G (HGF).path
diff --git a/...y/pathplanner/paths/First Piece To A.path → .../pathplanner/paths/Preload Shot to A.path b/...y/pathplanner/paths/First Piece To A.path → .../pathplanner/paths/Preload Shot to A.path
diff --git a/...y/pathplanner/paths/First Piece to D.path → .../pathplanner/paths/Preload Shot to D.path b/...y/pathplanner/paths/First Piece to D.path → .../pathplanner/paths/Preload Shot to D.path
diff --git a/...hplanner/paths/Blay First Piece To C.path → ...eploy/pathplanner/paths/Preload to C.path b/...hplanner/paths/Blay First Piece To C.path → ...eploy/pathplanner/paths/Preload to C.path
diff --git a/.../deploy/pathplanner/paths/Shoot To E.path → .../deploy/pathplanner/paths/Shoot to E.path b/.../deploy/pathplanner/paths/Shoot To E.path → .../deploy/pathplanner/paths/Shoot to E.path
diff --git a/src/main/deploy/pathplanner/paths/Start To C.path b/src/main/deploy/pathplanner/paths/Start To C.path
diff --git a/...y/pathplanner/paths/Start To G (GHF).path → ...y/pathplanner/paths/Start to G (GHF).path b/...y/pathplanner/paths/Start To G (GHF).path → ...y/pathplanner/paths/Start to G (GHF).path
diff --git a/...y/pathplanner/paths/Start To H (HGF).path → ...y/pathplanner/paths/Start to H (HGF).path b/...y/pathplanner/paths/Start To H (HGF).path → ...y/pathplanner/paths/Start to H (HGF).path
diff --git a/...ner/paths/TopShoot To Intermediate E.path → ...ner/paths/TopShoot to Intermediate E.path b/...ner/paths/TopShoot To Intermediate E.path → ...ner/paths/TopShoot to Intermediate E.path
diff --git a/...ner/paths/TopShoot To Intermediate F.path → ...ner/paths/TopShoot to Intermediate F.path b/...ner/paths/TopShoot To Intermediate F.path → ...ner/paths/TopShoot to Intermediate F.path
diff --git a/src/main/java/com/stuypulse/robot/Robot.java b/src/main/java/com/stuypulse/robot/Robot.java
@@ -22,7 +22,6 @@
 import edu.wpi.first.wpilibj.DataLogManager;
 import edu.wpi.first.wpilibj.DriverStation;
 import edu.wpi.first.wpilibj.TimedRobot;
-import edu.wpi.first.wpilibj.Timer;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import edu.wpi.first.wpilibj2.command.Command;
 import edu.wpi.first.wpilibj2.command.CommandScheduler;
@@ -70,6 +69,11 @@ public void robotInit() {
     @Override
     public void robotPeriodic() {
         scheduler.run();
+
+        SmartDashboard.putNumber("Total Power (W)", robot.pdp.getTotalPower());
+        SmartDashboard.putNumber("Total Current (A)", robot.pdp.getTotalCurrent());
+        SmartDashboard.putNumber("Battery Voltage (V)", robot.pdp.getVoltage());
+        SmartDashboard.putNumber("Calculated Resistance (R)", robot.pdp.getVoltage() / robot.pdp.getTotalCurrent());
     }
 
     public static boolean isBlue() {