fix the robot comicsain

Author: edsoneli

FtcRobotController/FtcRobotController

@@ -0,0 +1 @@
+Subproject commit 203c2d373765f0c66d121e3ec1cc3a18835f6534

FtcRobotController/build.gradle

@@ -17,8 +17,8 @@ android {
     buildFeatures {
         buildConfig = true
     }
-    compileSdk 34
-    //noinspection GradleDependency
+
+    compileSdkVersion 30
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

FtcRobotController/src/main/AndroidManifest.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="60"
-          android:versionName="11.0">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:versionCode="61"
+    android:versionName="11.1">
 
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
   <application
-    android:allowBackup="true"
-    android:largeHeap="true"
-    android:icon="@drawable/ic_launcher"
-    android:label="@string/app_name"
-    android:theme="@style/AppThemeRedRC"
-    android:usesCleartextTraffic="true">
+      android:allowBackup="true"
+      android:largeHeap="true"
+      android:icon="@drawable/ic_launcher"
+      android:label="@string/app_name"
+      android:theme="@style/AppThemeRedRC"
+      android:usesCleartextTraffic="true">
 
     <!-- Indicates to the ControlHubUpdater what the latest version of the Control Hub is that this app supports -->
     <meta-data
@@ -21,10 +21,10 @@
 
     <!-- The main robot controller activity -->
     <activity android:name="org.firstinspires.ftc.robotcontroller.internal.PermissionValidatorWrapper"
-              android:screenOrientation="fullUser"
-              android:configChanges="orientation|screenSize"
-              android:label="@string/app_name"
-              android:launchMode="singleTask" >
+        android:screenOrientation="fullUser"
+        android:configChanges="orientation|screenSize"
+        android:label="@string/app_name"
+        android:launchMode="singleTask" >
 
       <intent-filter>
         <category android:name="android.intent.category.LAUNCHER" />
@@ -34,19 +34,19 @@
     </activity>
 
     <activity
-      android:name="org.firstinspires.ftc.robotcontroller.internal.FtcRobotControllerActivity"
-      android:screenOrientation="fullUser"
-      android:configChanges="orientation|screenSize"
-      android:label="@string/app_name"
-      android:launchMode="singleTask" >
+        android:name="org.firstinspires.ftc.robotcontroller.internal.FtcRobotControllerActivity"
+        android:screenOrientation="fullUser"
+        android:configChanges="orientation|screenSize"
+        android:label="@string/app_name"
+        android:launchMode="singleTask" >
 
       <intent-filter>
         <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
       </intent-filter>
 
       <meta-data
-        android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
-        android:resource="@xml/device_filter" />
+          android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+          android:resource="@xml/device_filter" />
 
       <!--org.firstinspires.main.entry indicates that this app is compatible with the Dragonboard Control Hub-->
       <meta-data
@@ -56,16 +56,16 @@
 
     <!-- The robot controller service in which most of the robot functionality is managed -->
     <service
-      android:name="com.qualcomm.ftccommon.FtcRobotControllerService"
-      android:enabled="true" />
+        android:name="com.qualcomm.ftccommon.FtcRobotControllerService"
+        android:enabled="true" />
 
 
     <!-- Assistant that autostarts the robot controller on android boot (if it's supposed to) -->
     <receiver
-      android:enabled="true"
-      android:exported="true"
-      android:name="org.firstinspires.ftc.ftccommon.internal.RunOnBoot"
-      android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
+        android:enabled="true"
+        android:exported="true"
+        android:name="org.firstinspires.ftc.ftccommon.internal.RunOnBoot"
+        android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
 
       <intent-filter>
         <category android:name="android.intent.category.DEFAULT" />

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/BasicOpMode_Iterative.java

@@ -138,3 +138,4 @@ public void stop() {
     }
 
 }
+

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptAprilTag.java

@@ -1,33 +1,33 @@
-/* Copyright (c) 2023 FIRST. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted (subject to the limitations in the disclaimer below) provided that
- * the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list
- * of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice, this
- * list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * Neither the name of FIRST nor the names of its contributors may be used to endorse or
- * promote products derived from this software without specific prior written permission.
- *
- * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS
- * LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.firstinspires.ftc.robotcontroller.external.samples;
+//* Copyright (c) 2023 FIRST. All rights reserved.
+/*
+        * Redistribution and use in source and binary forms, with or without modification,
+        * are permitted (subject to the limitations in the disclaimer below) provided that
+        * the following conditions are met:
+        *
+        * Redistributions of source code must retain the above copyright notice, this list
+        * of conditions and the following disclaimer.
+        *
+        * Redistributions in binary form must reproduce the above copyright notice, this
+        * list of conditions and the following disclaimer in the documentation and/or
+        * other materials provided with the distribution.
+        *
+        * Neither the name of FIRST nor the names of its contributors may be used to endorse or
+        * promote products derived from this software without specific prior written permission.
+        *
+        * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS
+        * LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+        * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+        * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+        * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+        * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+        * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+        * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+        * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+        * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+        * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+        */
+
+        package org.firstinspires.ftc.robotcontroller.external.samples;
 
 import android.util.Size;
 import com.qualcomm.robotcore.eventloop.opmode.Disabled;
@@ -92,24 +92,22 @@ public void runOpMode() {
         telemetry.update();
         waitForStart();
 
-        if (opModeIsActive()) {
-            while (opModeIsActive()) {
+        while (opModeIsActive()) {
 
-                telemetryAprilTag();
+            telemetryAprilTag();
 
-                // Push telemetry to the Driver Station.
-                telemetry.update();
+            // Push telemetry to the Driver Station.
+            telemetry.update();
 
-                // Save CPU resources; can resume streaming when needed.
-                if (gamepad1.dpad_down) {
-                    visionPortal.stopStreaming();
-                } else if (gamepad1.dpad_up) {
-                    visionPortal.resumeStreaming();
-                }
-
-                // Share the CPU.
-                sleep(20);
+            // Save CPU resources; can resume streaming when needed.
+            if (gamepad1.dpad_down) {
+                visionPortal.stopStreaming();
+            } else if (gamepad1.dpad_up) {
+                visionPortal.resumeStreaming();
             }
+
+            // Share the CPU.
+            sleep(20);
         }
 
         // Save more CPU resources when camera is no longer needed.
@@ -125,21 +123,21 @@ private void initAprilTag() {
         // Create the AprilTag processor.
         aprilTag = new AprilTagProcessor.Builder()
 
-            // The following default settings are available to un-comment and edit as needed.
-            //.setDrawAxes(false)
-            //.setDrawCubeProjection(false)
-            //.setDrawTagOutline(true)
-            //.setTagFamily(AprilTagProcessor.TagFamily.TAG_36h11)
-            //.setTagLibrary(AprilTagGameDatabase.getCenterStageTagLibrary())
-            //.setOutputUnits(DistanceUnit.INCH, AngleUnit.DEGREES)
-
-            // == CAMERA CALIBRATION ==
-            // If you do not manually specify calibration parameters, the SDK will attempt
-            // to load a predefined calibration for your camera.
-            //.setLensIntrinsics(578.272, 578.272, 402.145, 221.506)
-            // ... these parameters are fx, fy, cx, cy.
-
-            .build();
+                // The following default settings are available to un-comment and edit as needed.
+                //.setDrawAxes(false)
+                //.setDrawCubeProjection(false)
+                //.setDrawTagOutline(true)
+                //.setTagFamily(AprilTagProcessor.TagFamily.TAG_36h11)
+                //.setTagLibrary(AprilTagGameDatabase.getCenterStageTagLibrary())
+                //.setOutputUnits(DistanceUnit.INCH, AngleUnit.DEGREES)
+
+                // == CAMERA CALIBRATION ==
+                // If you do not manually specify calibration parameters, the SDK will attempt
+                // to load a predefined calibration for your camera.
+                //.setLensIntrinsics(578.272, 578.272, 402.145, 221.506)
+                // ... these parameters are fx, fy, cx, cy.
+
+                .build();
 
         // Adjust Image Decimation to trade-off detection-range for detection-rate.
         // eg: Some typical detection data using a Logitech C920 WebCam

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptAprilTagEasy.java

@@ -88,24 +88,22 @@ public void runOpMode() {
         telemetry.update();
         waitForStart();
 
-        if (opModeIsActive()) {
-            while (opModeIsActive()) {
+        while (opModeIsActive()) {
 
-                telemetryAprilTag();
+            telemetryAprilTag();
 
-                // Push telemetry to the Driver Station.
-                telemetry.update();
+            // Push telemetry to the Driver Station.
+            telemetry.update();
 
-                // Save CPU resources; can resume streaming when needed.
-                if (gamepad1.dpad_down) {
-                    visionPortal.stopStreaming();
-                } else if (gamepad1.dpad_up) {
-                    visionPortal.resumeStreaming();
-                }
-
-                // Share the CPU.
-                sleep(20);
+            // Save CPU resources; can resume streaming when needed.
+            if (gamepad1.dpad_down) {
+                visionPortal.stopStreaming();
+            } else if (gamepad1.dpad_up) {
+                visionPortal.resumeStreaming();
             }
+
+            // Share the CPU.
+            sleep(20);
         }
 
         // Save more CPU resources when camera is no longer needed.
@@ -124,10 +122,10 @@ private void initAprilTag() {
         // Create the vision portal the easy way.
         if (USE_WEBCAM) {
             visionPortal = VisionPortal.easyCreateWithDefaults(
-                hardwareMap.get(WebcamName.class, "Webcam 1"), aprilTag);
+                    hardwareMap.get(WebcamName.class, "Webcam 1"), aprilTag);
         } else {
             visionPortal = VisionPortal.easyCreateWithDefaults(
-                BuiltinCameraDirection.BACK, aprilTag);
+                    BuiltinCameraDirection.BACK, aprilTag);
         }
 
     }   // end method initAprilTag()

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptAprilTagSwitchableCameras.java

@@ -81,27 +81,25 @@ public void runOpMode() {
         telemetry.update();
         waitForStart();
 
-        if (opModeIsActive()) {
-            while (opModeIsActive()) {
+        while (opModeIsActive()) {
 
-                telemetryCameraSwitching();
-                telemetryAprilTag();
+            telemetryCameraSwitching();
+            telemetryAprilTag();
 
-                // Push telemetry to the Driver Station.
-                telemetry.update();
+            // Push telemetry to the Driver Station.
+            telemetry.update();
 
-                // Save CPU resources; can resume streaming when needed.
-                if (gamepad1.dpad_down) {
-                    visionPortal.stopStreaming();
-                } else if (gamepad1.dpad_up) {
-                    visionPortal.resumeStreaming();
-                }
+            // Save CPU resources; can resume streaming when needed.
+            if (gamepad1.dpad_down) {
+                visionPortal.stopStreaming();
+            } else if (gamepad1.dpad_up) {
+                visionPortal.resumeStreaming();
+            }
 
-                doCameraSwitching();
+            doCameraSwitching();
 
-                // Share the CPU.
-                sleep(20);
-            }
+            // Share the CPU.
+            sleep(20);
         }
 
         // Save more CPU resources when camera is no longer needed.
@@ -120,13 +118,13 @@ private void initAprilTag() {
         webcam1 = hardwareMap.get(WebcamName.class, "Webcam 1");
         webcam2 = hardwareMap.get(WebcamName.class, "Webcam 2");
         CameraName switchableCamera = ClassFactory.getInstance()
-            .getCameraManager().nameForSwitchableCamera(webcam1, webcam2);
+                .getCameraManager().nameForSwitchableCamera(webcam1, webcam2);
 
         // Create the vision portal by using a builder.
         visionPortal = new VisionPortal.Builder()
-            .setCamera(switchableCamera)
-            .addProcessor(aprilTag)
-            .build();
+                .setCamera(switchableCamera)
+                .addProcessor(aprilTag)
+                .build();
 
     }   // end method initAprilTag()
 

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptGamepadEdgeDetection.java

@@ -83,6 +83,22 @@ public void telemetryButtonData() {
         telemetry.addData("Gamepad 1 Right Bumper Released", gamepad1.rightBumperWasReleased());
         telemetry.addData("Gamepad 1 Right Bumper Status", gamepad1.right_bumper);
 
+        // Add an empty line to separate the buttons in telemetry
+        telemetry.addLine();
+
+        // Add the status of the Gamepad 1 Left trigger
+        telemetry.addData("Gamepad 1 Left Trigger Pressed", gamepad1.leftBumperWasPressed());
+        telemetry.addData("Gamepad 1 Left Trigger Released", gamepad1.leftBumperWasReleased());
+        telemetry.addData("Gamepad 1 Left Trigger Status", gamepad1.left_trigger);
+
+        // Add an empty line to separate the buttons in telemetry
+        telemetry.addLine();
+
+        // Add the status of the Gamepad 1 Right trigger
+        telemetry.addData("Gamepad 1 Right Trigger Pressed", gamepad1.rightBumperWasPressed());
+        telemetry.addData("Gamepad 1 Right Trigger Released", gamepad1.rightBumperWasReleased());
+        telemetry.addData("Gamepad 1 Right Trigger Status", gamepad1.right_trigger);
+
         // Add a note that the telemetry is only updated every 2 seconds
         telemetry.addLine("\nTelemetry is updated every 2 seconds.");
 

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptLEDStick.java

@@ -87,7 +87,7 @@ public void loop() {
         telemetry.addLine("Hold the B button to turn red");
         telemetry.addLine("Hold the left bumper to turn off");
         telemetry.addLine("Use DPAD Up/Down to change brightness");
-        
+
         if (getRuntime() > END_GAME_TIME) {
             int[] ledColors = {Color.RED, Color.YELLOW, Color.RED, Color.YELLOW, Color.RED,
                     Color.YELLOW, Color.RED, Color.YELLOW, Color.RED, Color.YELLOW};