Merge remote-tracking branch 'upstream/master' into sloth-load

This commit is contained in:
2026-02-12 19:45:11 -06:00
9 changed files with 82 additions and 57 deletions

View File

@@ -1,8 +1,8 @@
<?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">
android:versionCode="61"
android:versionName="11.1">
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

View File

@@ -92,24 +92,22 @@ public class ConceptAprilTag extends LinearOpMode {
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.

View File

@@ -88,24 +88,22 @@ public class ConceptAprilTagEasy extends LinearOpMode {
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.

View File

@@ -81,27 +81,25 @@ public class ConceptAprilTagSwitchableCameras extends LinearOpMode {
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();
}
doCameraSwitching();
// 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();
}
doCameraSwitching();
// Share the CPU.
sleep(20);
}
// Save more CPU resources when camera is no longer needed.

View File

@@ -83,6 +83,22 @@ public class ConceptGamepadEdgeDetection extends LinearOpMode {
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.leftTriggerWasPressed());
telemetry.addData("Gamepad 1 Left Trigger Released", gamepad1.leftTriggerWasReleased());
telemetry.addData("Gamepad 1 Left Trigger Status", gamepad1.left_trigger_pressed);
// 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.rightTriggerWasPressed());
telemetry.addData("Gamepad 1 Right Trigger Released", gamepad1.rightTriggerWasReleased());
telemetry.addData("Gamepad 1 Right Trigger Status", gamepad1.right_trigger_pressed);
// Add a note that the telemetry is only updated every 2 seconds
telemetry.addLine("\nTelemetry is updated every 2 seconds.");

View File

@@ -27,7 +27,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.firstinspires.ftc.robotcontroller.external.samples;
package org.firstinspires.ftc.robotcontroller.external.samples.externalhardware;
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;

View File

@@ -27,7 +27,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.firstinspires.ftc.robotcontroller.external.samples;
package org.firstinspires.ftc.robotcontroller.external.samples.externalhardware;
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
import com.qualcomm.robotcore.hardware.DcMotor;

View File

@@ -59,6 +59,21 @@ The readme.md file located in the [/TeamCode/src/main/java/org/firstinspires/ftc
# Release Information
## Version 11.1 (20251231-104637)
### Enhancements
* Gamepad triggers can now be accessed as booleans and have edge detection supported.
* GoBildaPinpointDriver now supports Pinpoint v2 functionality
* Adds webcam calibrations for goBILDA's USB camera.
### Bug Fixes
* Fixes issue [1654](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/1654) in GoBildaPinpointDriver that caused error if resolution was set in other than MM
* Fixes issue [1628](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/1628) Blocks editor displays incorrect Java code for gamepad edge detection blocks.
* Fixes possible race condition issue [1884](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/1884) on Driver Station startup when Driver Station name doesn't match the Robot Controller name.
* Fixes issue [1863](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/1863) - Incorrect package paths in samples.
* Fixes an issue where an OnBotJava filename that begins with a lowercase character would fail to properly rename the file if the user tried to rename it so that it begins with an uppercase character.
## Version 11.0 (20250827-105138)
### Enhancements

View File

@@ -10,14 +10,14 @@ repositories {
}
dependencies {
implementation 'org.firstinspires.ftc:Inspection:11.0.0'
implementation 'org.firstinspires.ftc:Blocks:11.0.0'
implementation 'org.firstinspires.ftc:RobotCore:11.0.0'
implementation 'org.firstinspires.ftc:RobotServer:11.0.0'
implementation 'org.firstinspires.ftc:OnBotJava:11.0.0'
implementation 'org.firstinspires.ftc:Hardware:11.0.0'
implementation 'org.firstinspires.ftc:FtcCommon:11.0.0'
implementation 'org.firstinspires.ftc:Vision:11.0.0'
implementation 'org.firstinspires.ftc:Inspection:11.1.0'
implementation 'org.firstinspires.ftc:Blocks:11.1.0'
implementation 'org.firstinspires.ftc:RobotCore:11.1.0'
implementation 'org.firstinspires.ftc:RobotServer:11.1.0'
implementation 'org.firstinspires.ftc:OnBotJava:11.1.0'
implementation 'org.firstinspires.ftc:Hardware:11.1.0'
implementation 'org.firstinspires.ftc:FtcCommon:11.1.0'
implementation 'org.firstinspires.ftc:Vision:11.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'