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

…tractingndparenting
svhsrobotics · Jan 18, 2024 · 5a4505e · 5a4505e
2 parents a164e3a + 976e831
commit 5a4505e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/Configurator.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/Configurator.java
@@ -1,5 +1,7 @@
 package org.firstinspires.ftc.teamcode.opmode;
 
+import android.util.Log;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
@@ -11,6 +13,7 @@
 import org.firstinspires.ftc.teamcode.util.Toggle;
 
 import java.io.File;
+import java.util.Objects;
 
 @TeleOp
 
@@ -65,6 +68,7 @@ public void runOpMode() throws InterruptedException {
 
         Configuration config = Configurator.load();
 
+        purpleToggle.state = config.placePixel;
 
 //        Toggle innerParkToggle = new Toggle();
 //        Toggle outerParkToggle = new Toggle();

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/util/Debouncer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/util/Debouncer.java
@@ -7,11 +7,10 @@ public boolean update(boolean buttonState) {
         if (buttonState) {
             if (!lastState) {
                 lastState = true;
-                return true;
             }
         } else {
             lastState = false;
         }
-        return false;
+        return lastState;
     }
 }