Skip to content

Commit 203c2d3

Browse files
CalKestisCalKestis
authored
Merge pull request #1944 from FIRST-Tech-Challenge/20251231-104637-release-candidate
FtcRobotController v11.1
2 parents 40bc118 + dc995e3 commit 203c2d3

File tree

9 files changed

+81
-56
lines changed

9 files changed

+81
-56
lines changed

‎FtcRobotController/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
android:versionCode="60"
5-
android:versionName="11.0">
4+
android:versionCode="61"
5+
android:versionName="11.1">
66

77
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
88

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,24 +92,22 @@ public void runOpMode() {
9292
telemetry.update();
9393
waitForStart();
9494

95-
if (opModeIsActive()) {
96-
while (opModeIsActive()) {
95+
while (opModeIsActive()) {
9796

98-
telemetryAprilTag();
97+
telemetryAprilTag();
9998

100-
// Push telemetry to the Driver Station.
101-
telemetry.update();
99+
// Push telemetry to the Driver Station.
100+
telemetry.update();
102101

103-
// Save CPU resources; can resume streaming when needed.
104-
if (gamepad1.dpad_down) {
105-
visionPortal.stopStreaming();
106-
} else if (gamepad1.dpad_up) {
107-
visionPortal.resumeStreaming();
108-
}
109-
110-
// Share the CPU.
111-
sleep(20);
102+
// Save CPU resources; can resume streaming when needed.
103+
if (gamepad1.dpad_down) {
104+
visionPortal.stopStreaming();
105+
} else if (gamepad1.dpad_up) {
106+
visionPortal.resumeStreaming();
112107
}
108+
109+
// Share the CPU.
110+
sleep(20);
113111
}
114112

115113
// Save more CPU resources when camera is no longer needed.

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,24 +88,22 @@ public void runOpMode() {
8888
telemetry.update();
8989
waitForStart();
9090

91-
if (opModeIsActive()) {
92-
while (opModeIsActive()) {
91+
while (opModeIsActive()) {
9392

94-
telemetryAprilTag();
93+
telemetryAprilTag();
9594

96-
// Push telemetry to the Driver Station.
97-
telemetry.update();
95+
// Push telemetry to the Driver Station.
96+
telemetry.update();
9897

99-
// Save CPU resources; can resume streaming when needed.
100-
if (gamepad1.dpad_down) {
101-
visionPortal.stopStreaming();
102-
} else if (gamepad1.dpad_up) {
103-
visionPortal.resumeStreaming();
104-
}
105-
106-
// Share the CPU.
107-
sleep(20);
98+
// Save CPU resources; can resume streaming when needed.
99+
if (gamepad1.dpad_down) {
100+
visionPortal.stopStreaming();
101+
} else if (gamepad1.dpad_up) {
102+
visionPortal.resumeStreaming();
108103
}
104+
105+
// Share the CPU.
106+
sleep(20);
109107
}
110108

111109
// Save more CPU resources when camera is no longer needed.

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

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,27 +81,25 @@ public void runOpMode() {
8181
telemetry.update();
8282
waitForStart();
8383

84-
if (opModeIsActive()) {
85-
while (opModeIsActive()) {
84+
while (opModeIsActive()) {
8685

87-
telemetryCameraSwitching();
88-
telemetryAprilTag();
86+
telemetryCameraSwitching();
87+
telemetryAprilTag();
8988

90-
// Push telemetry to the Driver Station.
91-
telemetry.update();
89+
// Push telemetry to the Driver Station.
90+
telemetry.update();
9291

93-
// Save CPU resources; can resume streaming when needed.
94-
if (gamepad1.dpad_down) {
95-
visionPortal.stopStreaming();
96-
} else if (gamepad1.dpad_up) {
97-
visionPortal.resumeStreaming();
98-
}
92+
// Save CPU resources; can resume streaming when needed.
93+
if (gamepad1.dpad_down) {
94+
visionPortal.stopStreaming();
95+
} else if (gamepad1.dpad_up) {
96+
visionPortal.resumeStreaming();
97+
}
9998

100-
doCameraSwitching();
99+
doCameraSwitching();
101100

102-
// Share the CPU.
103-
sleep(20);
104-
}
101+
// Share the CPU.
102+
sleep(20);
105103
}
106104

107105
// Save more CPU resources when camera is no longer needed.

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,22 @@ public void telemetryButtonData() {
8383
telemetry.addData("Gamepad 1 Right Bumper Released", gamepad1.rightBumperWasReleased());
8484
telemetry.addData("Gamepad 1 Right Bumper Status", gamepad1.right_bumper);
8585

86+
// Add an empty line to separate the buttons in telemetry
87+
telemetry.addLine();
88+
89+
// Add the status of the Gamepad 1 Left trigger
90+
telemetry.addData("Gamepad 1 Left Trigger Pressed", gamepad1.leftTriggerWasPressed());
91+
telemetry.addData("Gamepad 1 Left Trigger Released", gamepad1.leftTriggerWasReleased());
92+
telemetry.addData("Gamepad 1 Left Trigger Status", gamepad1.left_trigger_pressed);
93+
94+
// Add an empty line to separate the buttons in telemetry
95+
telemetry.addLine();
96+
97+
// Add the status of the Gamepad 1 Right trigger
98+
telemetry.addData("Gamepad 1 Right Trigger Pressed", gamepad1.rightTriggerWasPressed());
99+
telemetry.addData("Gamepad 1 Right Trigger Released", gamepad1.rightTriggerWasReleased());
100+
telemetry.addData("Gamepad 1 Right Trigger Status", gamepad1.right_trigger_pressed);
101+
86102
// Add a note that the telemetry is only updated every 2 seconds
87103
telemetry.addLine("\nTelemetry is updated every 2 seconds.");
88104

‎FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/externalhardware/ConceptExternalHardwareClass.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
*/
2929

30-
package org.firstinspires.ftc.robotcontroller.external.samples;
30+
package org.firstinspires.ftc.robotcontroller.external.samples.externalhardware;
3131

3232
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
3333
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;

‎FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/externalhardware/RobotHardware.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
*/
2929

30-
package org.firstinspires.ftc.robotcontroller.external.samples;
30+
package org.firstinspires.ftc.robotcontroller.external.samples.externalhardware;
3131

3232
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
3333
import com.qualcomm.robotcore.hardware.DcMotor;

‎README.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,21 @@ The readme.md file located in the [/TeamCode/src/main/java/org/firstinspires/ftc
5959

6060
# Release Information
6161

62+
## Version 11.1 (20251231-104637)
63+
64+
### Enhancements
65+
66+
* Gamepad triggers can now be accessed as booleans and have edge detection supported.
67+
* GoBildaPinpointDriver now supports Pinpoint v2 functionality
68+
* Adds webcam calibrations for goBILDA's USB camera.
69+
70+
### Bug Fixes
71+
* 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
72+
* Fixes issue [1628](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/1628) Blocks editor displays incorrect Java code for gamepad edge detection blocks.
73+
* 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.
74+
* Fixes issue [1863](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/1863) - Incorrect package paths in samples.
75+
* 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.
76+
6277
## Version 11.0 (20250827-105138)
6378

6479
### Enhancements

‎build.dependencies.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ repositories {
44
}
55

66
dependencies {
7-
implementation 'org.firstinspires.ftc:Inspection:11.0.0'
8-
implementation 'org.firstinspires.ftc:Blocks:11.0.0'
9-
implementation 'org.firstinspires.ftc:RobotCore:11.0.0'
10-
implementation 'org.firstinspires.ftc:RobotServer:11.0.0'
11-
implementation 'org.firstinspires.ftc:OnBotJava:11.0.0'
12-
implementation 'org.firstinspires.ftc:Hardware:11.0.0'
13-
implementation 'org.firstinspires.ftc:FtcCommon:11.0.0'
14-
implementation 'org.firstinspires.ftc:Vision:11.0.0'
7+
implementation 'org.firstinspires.ftc:Inspection:11.1.0'
8+
implementation 'org.firstinspires.ftc:Blocks:11.1.0'
9+
implementation 'org.firstinspires.ftc:RobotCore:11.1.0'
10+
implementation 'org.firstinspires.ftc:RobotServer:11.1.0'
11+
implementation 'org.firstinspires.ftc:OnBotJava:11.1.0'
12+
implementation 'org.firstinspires.ftc:Hardware:11.1.0'
13+
implementation 'org.firstinspires.ftc:FtcCommon:11.1.0'
14+
implementation 'org.firstinspires.ftc:Vision:11.1.0'
1515
implementation 'androidx.appcompat:appcompat:1.2.0'
1616
}
1717

0 commit comments

Comments
 (0)