Merge remote-tracking branch 'origin/abstractingndparenting' into abs…

…tractingndparenting
svhsrobotics · Jan 13, 2024 · fde7f2f · fde7f2f
2 parents 9434ec6 + 5b1e156
commit fde7f2f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/MeepMeepTesting/src/main/java/com/example/meepmeeptesting/GoToBoard.java b/MeepMeepTesting/src/main/java/com/example/meepmeeptesting/GoToBoard.java
@@ -22,46 +22,46 @@ public void drive() {
         if (getRobot().getDrive().currentQuadrant() == TrajectoryDrive.Quadrant.RED_AUDIENCE) {
             trajB = trajB.lineTo(new Vector2d(startPose.getX(), -36))
                     .lineTo(new Vector2d(50, -36))
-            //TODO: fix this turning it hurts :(
-            .turn(Math.toRadians(-90-startPose.getHeading()));
+
+            .turn(Math.toRadians(-90-startPose.getHeading()))
             //TODO:fix error with temporal marker because ryan is a dum dum
-//            .addTemporalMarker(() -> {
-//                android.util.Log.i("PLACE PIXEL", "Placed pixel at Red Board");
-//            });
+           .addTemporalMarker(() -> {
+    //            android.util.Log.i("PLACE PIXEL", "Placed pixel at Red Board");
+            });
 
         } else if (getRobot().getDrive().currentQuadrant() == TrajectoryDrive.Quadrant.RED_BOARD) {
             trajB = trajB.lineTo(new Vector2d(startPose.getX(), -36))
                     .lineTo(new Vector2d(50, -36))
-                  //TODO: fix this turning it hurts :(
-                   .turn(Math.toRadians(-90-startPose.getHeading()));
+
+                   .turn(Math.toRadians(-90-startPose.getHeading()))
 
             //TODO:fix error with temporal marker because ryan is a dum dum
-//            .addTemporalMarker(() -> {
-//                android.util.Log.i("PLACE PIXEL", "Placed pixel at Red Board");
-//            });
+            .addTemporalMarker(() -> {
+    //            android.util.Log.i("PLACE PIXEL", "Placed pixel at Red Board");
+            });
 
         } else if (getRobot().getDrive().currentQuadrant() == TrajectoryDrive.Quadrant.BLUE_BOARD) {
             trajB = trajB.lineTo(new Vector2d(startPose.getX(), 36))
                     .lineTo(new Vector2d(50, 36))
-            //TODO: fix this turning it hurts :(
-            .turn(Math.toRadians(90-startPose.getHeading()));
+
+            .turn(Math.toRadians(90-startPose.getHeading()))
 
             //TODO:fix error with temporal marker because ryan is a dum dum
-//            .addTemporalMarker(() -> {
-//                android.util.Log.i("PLACE PIXEL", "Placed pixel at Blue Board");
-//            });
+            .addTemporalMarker(() -> {
+     //           android.util.Log.i("PLACE PIXEL", "Placed pixel at Blue Board");
+            });
 
         }else {
             trajB = trajB.lineTo(new Vector2d(startPose.getX(), 36))
                     .lineTo(new Vector2d(50, 36))
-            //TODO: fix this turning it hurts :(
-            .turn(Math.toRadians(90-startPose.getHeading()));
+
+            .turn(Math.toRadians(90-startPose.getHeading()))
 
 
             //TODO:fix error with temporal marker because ryan is a dum dum
-//            .addTemporalMarker(() -> {
-//                android.util.Log.i("PLACE PIXEL", "Placed pixel at Blue Board");
-//            });
+            .addTemporalMarker(() -> {
+     //           android.util.Log.i("PLACE PIXEL", "Placed pixel at Blue Board");
+            });
 
         }
 

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/components/GoToBoard.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/components/GoToBoard.java
@@ -26,41 +26,41 @@ public void drive() {
             trajB = trajB.lineTo(new Vector2d(startPose.getX(), -36))
                     .lineTo(new Vector2d(50, -36))
 
-            .turn(Math.toRadians(-90-startPose.getHeading()));
+            .turn(Math.toRadians(-90-startPose.getHeading()))
             //TODO:fix error with temporal marker because ryan is a dum dum
-//            .addTemporalMarker(() -> {
-//                android.util.Log.i("PLACE PIXEL", "Placed pixel at Red Board");
-//            });
+            .addTemporalMarker(() -> {
+               android.util.Log.i("PLACE PIXEL", "Placed pixel at Red Board");
+            });
 
         } else if (getRobot().getDrive().currentQuadrant() == TrajectoryDrive.Quadrant.RED_BOARD) {
             trajB = trajB.lineTo(new Vector2d(startPose.getX(), -36))
                     .lineTo(new Vector2d(50, -36))
 
-            .turn(Math.toRadians(-90-startPose.getHeading()));
+            .turn(Math.toRadians(-90-startPose.getHeading()))
             //TODO:fix error with temporal marker because ryan is a dum dum
-//            .addTemporalMarker(() -> {
-//                android.util.Log.i("PLACE PIXEL", "Placed pixel at Red Board");
-//            });
+            .addTemporalMarker(() -> {
+                android.util.Log.i("PLACE PIXEL", "Placed pixel at Red Board");
+            });
 
         } else if (getRobot().getDrive().currentQuadrant() == TrajectoryDrive.Quadrant.BLUE_BOARD) {
             trajB = trajB.lineTo(new Vector2d(startPose.getX(), 36))
                     .lineTo(new Vector2d(50, 36))
 
-            .turn(Math.toRadians(90-startPose.getHeading()));
+            .turn(Math.toRadians(90-startPose.getHeading()))
             //TODO:fix error with temporal marker because ryan is a dum dum
-//            .addTemporalMarker(() -> {
-//                android.util.Log.i("PLACE PIXEL", "Placed pixel at Blue Board");
-//            });
+            .addTemporalMarker(() -> {
+                android.util.Log.i("PLACE PIXEL", "Placed pixel at Blue Board");
+            });
 
         }else {
             trajB = trajB.lineTo(new Vector2d(startPose.getX(), 36))
                     .lineTo(new Vector2d(50, 36))
 
-            .turn(Math.toRadians(90-startPose.getHeading()));
+            .turn(Math.toRadians(90-startPose.getHeading()))
             //TODO:fix error with temporal marker because ryan is a dum dum
-//            .addTemporalMarker(() -> {
-//                android.util.Log.i("PLACE PIXEL", "Placed pixel at Blue Board");
-//            });
+            .addTemporalMarker(() -> {
+                android.util.Log.i("PLACE PIXEL", "Placed pixel at Blue Board");
+            });
 
         }