Skip to content

Commit d010c1b

Browse files
authored
Merge pull request #62 from FIRST-Tech-Challenge/20201209-113742-release-candidate
FtcRobotController v6.1
2 parents 09359bb + 0c811a0 commit d010c1b

File tree

10 files changed

+65
-47
lines changed

10 files changed

+65
-47
lines changed

FtcRobotController/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
buildConfigField "String", "BUILD_TIME", '"' + (new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.ROOT).format(new Date())) + '"'
1414
}
1515

16-
compileSdkVersion 28
16+
compileSdkVersion 29
1717

1818
compileOptions {
1919
sourceCompatibility JavaVersion.VERSION_1_7
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dependencies {
2-
implementation 'org.firstinspires.ftc:Inspection:6.0.1'
3-
implementation 'org.firstinspires.ftc:Blocks:6.0.1'
4-
implementation 'org.firstinspires.ftc:RobotCore:6.0.1'
5-
implementation 'org.firstinspires.ftc:RobotServer:6.0.1'
6-
implementation 'org.firstinspires.ftc:OnBotJava:6.0.1'
7-
implementation 'org.firstinspires.ftc:Hardware:6.0.1'
8-
implementation 'org.firstinspires.ftc:FtcCommon:6.0.1'
2+
implementation 'org.firstinspires.ftc:Inspection:6.1.1'
3+
implementation 'org.firstinspires.ftc:Blocks:6.1.1'
4+
implementation 'org.firstinspires.ftc:RobotCore:6.1.1'
5+
implementation 'org.firstinspires.ftc:RobotServer:6.1.1'
6+
implementation 'org.firstinspires.ftc:OnBotJava:6.1.1'
7+
implementation 'org.firstinspires.ftc:Hardware:6.1.1'
8+
implementation 'org.firstinspires.ftc:FtcCommon:6.1.1'
99
implementation 'androidx.appcompat:appcompat:1.2.0'
1010
}

FtcRobotController/src/main/AndroidManifest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.qualcomm.ftcrobotcontroller"
5-
android:versionCode="38"
6-
android:versionName="6.0">
5+
android:versionCode="39"
6+
android:versionName="6.1">
77

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

@@ -13,7 +13,8 @@
1313
android:extractNativeLibs="true"
1414
android:icon="@drawable/ic_launcher"
1515
android:label="@string/app_name"
16-
android:theme="@style/AppThemeRedRC" >
16+
android:theme="@style/AppThemeRedRC"
17+
android:usesCleartextTraffic="true">
1718

1819
<!-- Indicates to the ControlHubUpdater what the latest version of the Control Hub is that this app supports -->
1920
<meta-data

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,8 @@ public void runOpMode() {
102102
// If your target is at distance greater than 50 cm (20") you can adjust the magnification value
103103
// to artificially zoom in to the center of image. For best results, the "aspectRatio" argument
104104
// should be set to the value of the images used to create the TensorFlow Object Detection model
105-
// (typically 1.78 or 16/9).
106-
107-
// Uncomment the following line if you want to adjust the magnification and/or the aspect ratio of the input images.
108-
//tfod.setZoom(2.5, 1.78);
105+
// (typically 16/9).
106+
tfod.setZoom(2.5, 16.0/9.0);
109107
}
110108

111109
/** Wait for the game to begin */

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,8 @@ public void runOpMode() {
111111
// If your target is at distance greater than 50 cm (20") you can adjust the magnification value
112112
// to artificially zoom in to the center of image. For best results, the "aspectRatio" argument
113113
// should be set to the value of the images used to create the TensorFlow Object Detection model
114-
// (typically 1.78 or 16/9).
115-
116-
// Uncomment the following line if you want to adjust the magnification and/or the aspect ratio of the input images.
117-
//tfod.setZoom(2.5, 1.78);
114+
// (typically 16/9).
115+
tfod.setZoom(2.5, 16.0/9.0);
118116
}
119117

120118
/** Wait for the game to begin */

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,8 @@ public void runOpMode() {
102102
// If your target is at distance greater than 50 cm (20") you can adjust the magnification value
103103
// to artificially zoom in to the center of image. For best results, the "aspectRatio" argument
104104
// should be set to the value of the images used to create the TensorFlow Object Detection model
105-
// (typically 1.78 or 16/9).
106-
107-
// Uncomment the following line if you want to adjust the magnification and/or the aspect ratio of the input images.
108-
//tfod.setZoom(2.5, 1.78);
105+
// (typically 16/9).
106+
tfod.setZoom(2.5, 16.0/9.0);
109107
}
110108

111109
/** Wait for the game to begin */

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/internal/FtcRobotControllerActivity.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
112112
import org.firstinspires.ftc.robotcore.internal.network.WifiMuteEvent;
113113
import org.firstinspires.ftc.robotcore.internal.network.WifiMuteStateMachine;
114114
import org.firstinspires.ftc.robotcore.internal.opmode.ClassManager;
115+
import org.firstinspires.ftc.robotcore.internal.system.AppAliveNotifier;
115116
import org.firstinspires.ftc.robotcore.internal.system.AppUtil;
116117
import org.firstinspires.ftc.robotcore.internal.system.Assert;
117118
import org.firstinspires.ftc.robotcore.internal.system.PreferencesHelper;
@@ -603,6 +604,9 @@ else if (id == R.id.action_exit_app) {
603604
}
604605
}
605606

607+
// Allow the user to use the Control Hub operating system's UI, instead of relaunching the app
608+
AppAliveNotifier.getInstance().disableAppWatchdogUntilNextAppStart();
609+
606610
//Finally, nuke the VM from orbit
607611
AppUtil.getInstance().exitApplication();
608612

README.md

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This repository contains the public FTC SDK for the Ultimate Goal (2020-2021) competition season.
44

5-
Formerly this software project was hosted [here](https://github.com/FIRST-Tech-Challenge/Skystone). Teams who are competing in the Ultimate Goal Challenge should use this new [FtcRobotController repository](https://github.com/FIRST-Tech-Challenge/FtcRobotController) instead of last season's (no longer updated) Skystone repository.
5+
Formerly this software project was hosted [here](https://github.com/FIRST-Tech-Challenge/Skystone). Teams who are competing in the Ultimate Goal Challenge should use this [new FtcRobotController repository](https://github.com/FIRST-Tech-Challenge/FtcRobotController) instead of last season's (no longer updated) Skystone repository.
66

77
## Welcome!
88
This GitHub repository contains the source code that is used to build an Android app to control a *FIRST* Tech Challenge competition robot. To use this SDK, download/clone the entire project to your local computer.
@@ -25,24 +25,25 @@ If you are an Android Studio programmer, there are several ways to download this
2525

2626
* You can also download the project folder (as a .zip or .tar.gz archive file) from the Downloads subsection of the [Releases](https://github.com/FIRST-Tech-Challenge/FtcRobotController/releases) page for this repository.
2727

28-
Once you have downloaded and uncompressed (if needed) your folder, you can use Android Studio to import the project ("Import project (Eclipse ADT, Gradle, etc.)").
28+
Once you have downloaded and uncompressed (if needed) your folder, you can use Android Studio to import the folder ("Import project (Eclipse ADT, Gradle, etc.)").
2929

3030
## Getting Help
3131
### User Documentation and Tutorials
32-
*FIRST* maintains documentation with information and tutorials on how to use the *FIRST* Tech Challenge software and robot control system. You can access this documentation using the following link:
32+
*FIRST* maintains online documentation with information and tutorials on how to use the *FIRST* Tech Challenge software and robot control system. You can access this documentation using the following link:
3333

34-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[FtcRobotController Documentation](https://github.com/FIRST-Tech-Challenge/FtcRobotController/wiki)
34+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[FtcRobotController Online Documentation](https://github.com/FIRST-Tech-Challenge/FtcRobotController/wiki)
3535

36-
Note that the documentation is an "evergreen" document that is constantly being updated and edited. It contains the most current information about the *FIRST* Tech Challenge software and control system.
36+
Note that the online documentation is an "evergreen" document that is constantly being updated and edited. It contains the most current information about the *FIRST* Tech Challenge software and control system.
3737

3838
### Javadoc Reference Material
39-
The Javadoc reference documentation for the FTC SDK is now available online at https://first-tech-challenge.github.io/FtcRobotController.
39+
The Javadoc reference documentation for the FTC SDK is now available online. Click on the following link to view the FTC SDK Javadoc documentation as a live website:
4040

41-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[FTC Javadoc Documentation](https://first-tech-challenge.github.io/FtcRobotController)
41+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[FTC Javadoc Documentation](https://first-tech-challenge.github.io/FtcRobotController/doc/javadoc/index.html)
4242

43-
Documentation is no longer distributed with the repository itself. See the wiki referenced above for tutorials or the javadoc reference for API documentation.
43+
Documentation for the FTC SDK is also included with this repository. There is a subfolder called "doc" which contains several subfolders:
4444

45-
Prebuilt APK's are available on the releases page.
45+
* The folder "apk" contains the .apk files for the FTC Driver Station and FTC Robot Controller apps.
46+
* The folder "javadoc" contains the JavaDoc user documentation for the FTC SDK.
4647

4748
### Online User Forum
4849
For technical questions regarding the Control System or the FTC SDK, please visit the FTC Technology forum:
@@ -51,25 +52,43 @@ For technical questions regarding the Control System or the FTC SDK, please visi
5152

5253
# Release Information
5354

55+
## Version 6.1 (20201209-113742)
56+
* Makes the scan button on the configuration screen update the list of Expansion Hubs connected via RS-485
57+
* Fixes [SkyStone issue #143](https://github.com/FIRST-Tech-Challenge/SkyStone/issues/143)
58+
* Improves web interface compatibility with older browser and Android System WebView versions.
59+
* Fixes issue in UVC driver where some cameras (e.g. certain MS Lifecams) which reported frame intervals as rounded rather than truncated values (e.g. `666667*100ns` instead of `666666*100ns` for 15FPS) would fail to start streaming.
60+
* Adds support in UVC driver for virtual PTZ control
61+
* Adds support in UVC driver for gain (ISO) control
62+
* Adds support in UVC driver for enabling/disable AE priority. This setting provides a means to tell the camera firmware either
63+
* A) It can undershoot the requested frame rate in order to provide a theoretically better image (i.e. with a longer exposure than the inter-frame period of the selected frame rate allows)
64+
* B) It *must* meet the inter-frame deadline for the selected frame rate, even if the image may be underexposed as a result
65+
* Adds support for the Control Hub OS 1.1.2 Robot Controller watchdog
66+
* The Robot Controller app will be restarted if it stops responding for more than 10 seconds
67+
* Adds support for using the Driver Station app on Android 10+
68+
* Introduces an automatic TeleOp preselection feature
69+
* For details and usage guide, please see [this wiki entry](https://github.com/FIRST-Tech-Challenge/FtcRobotController/wiki/Automatically-Loading-a-Driver-Controlled-Op-Mode)
70+
* Shows icon next to OpMode name in the OpMode list dropdown on the Driver Station to indicate the source of the OpMode (i.e. the programming tool used to create it)
71+
* Fixes issue where the Driver Station app would exit after displaying the Configuring WiFi Direct screen
72+
* Fixes Blocks and OnBotJava prompts when accessed via the REV Hardware Client
73+
5474
## Version 6.0 (20200921-085816)
5575

5676
### Important Notes
57-
* Version 6.0 is the minimum legal version for the Ultimate Goal season.
58-
* Prebuilt APKs are now only available from the repository's Releases page.
59-
* Android Studio 4.0 required.
60-
* Android Studio users need to be connected to the internet the first time they build the app (in order to download needed packages for the build). Clearing gradle caches will also require an internet connection for the next build.
77+
* Version 6.0 is the version for the Ultimate Goal season.
78+
* Requires Android Studio 4.0.
79+
* Android Studio users need to be connected to the Internet the first time they build the app (in order to download needed packages for the build).
6180
* Version 5.5 was a moderately large off-season, August 2020, drop. It's worth reviewing those release notes below also.
6281
* Version 5.5 and greater will not work on older Android 4.x and 5.x phones. Users must upgrade to an approved Android 6.x device or newer.
6382
* The default PIDF values for REV motors have been reverted to the default PID values that were used in the 2018-2019 season
6483
* This change was made because the 2018-2019 values turned out to work better for many mechanisms
6584
* This brings the behavior of the REV motors in line with the behavior of all other motors
66-
* If you prefer the 2019-2020 season's behavior for REV motors, here are the PIDF values that were in place, so that you can manually set them in your OpModes:
85+
* If you prefer the 2019-2020 season's behavior for REV motors, here are the PIDF values that were in place, so that you can manually set them in your OpModes:
6786
<br>
68-
**HD Hex motors (all gearboxes):**
69-
Velocity PIDF values: `P = 1.17`, `I = 0.117`, `F = 11.7`
70-
Position PIDF values: `P = 5.0`
71-
**Core Hex motor:**
72-
Velocity PIDF values: `P = 4.96`, `I = 0.496`, `F = 49.6`
87+
**HD Hex motors (all gearboxes):**
88+
Velocity PIDF values: `P = 1.17`, `I = 0.117`, `F = 11.7`
89+
Position PIDF values: `P = 5.0`
90+
**Core Hex motor:**
91+
Velocity PIDF values: `P = 4.96`, `I = 0.496`, `F = 49.6`
7392
Position PIDF values: `P = 5.0`
7493

7594
### New features
@@ -94,7 +113,7 @@ For technical questions regarding the Control System or the FTC SDK, please visi
94113
* Removes IR readings and calculations not meant for the Broadcom sensor chip
95114

96115
### Bug fixes
97-
* Improved reliability of BNO055IMU IMU initialization to prevent random initialization failures (which manifested as `Problem with 'imu'`).
116+
* Improves reliability of BNO055IMU IMU initialization to prevent random initialization failures (which manifested as `Problem with 'imu'`).
98117

99118
## Version 5.5 (20200824-090813)
100119

TeamCode/build.release.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
dependencies {
22
implementation project(':FtcRobotController')
3-
implementation 'org.firstinspires.ftc:RobotCore:6.0.1'
4-
implementation 'org.firstinspires.ftc:Hardware:6.0.1'
5-
implementation 'org.firstinspires.ftc:FtcCommon:6.0.1'
3+
implementation 'org.firstinspires.ftc:RobotCore:6.1.1'
4+
implementation 'org.firstinspires.ftc:Hardware:6.1.1'
5+
implementation 'org.firstinspires.ftc:FtcCommon:6.1.1'
66
implementation (name: 'tfod-release', ext:'aar')
77
implementation (name: 'tensorflow-lite-0.0.0-nightly', ext:'aar')
88
}

build.common.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apply plugin: 'com.android.application'
2121

2222
android {
2323

24-
compileSdkVersion 28
24+
compileSdkVersion 29
2525

2626
signingConfigs {
2727
debug {

0 commit comments

Comments
 (0)