Skip to content
This repository has been archived by the owner on Aug 26, 2021. It is now read-only.

Commit

Permalink
Merge pull request #8 from BotsBurgh/odometry-auto
Browse files Browse the repository at this point in the history
Autonomous
  • Loading branch information
9p4 authored Feb 14, 2021
2 parents cd2cbbf + 2fc9147 commit 60ca6ec
Show file tree
Hide file tree
Showing 54 changed files with 2,079 additions and 470 deletions.
68 changes: 68 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Contributing to the FTC SDK

The following is a set of guidelines for contributing the FIRST FTC SDK. The FTC Technology Team welcomes suggestions for improvements to core software, ideas for new features, requests for built-in support of new sensors, and well written bug reports.

## How can I contribute?

### Pull requests

__STOP!__ If you are new to git, do not understand the mechanics of forks, branches, and pulls, if what you just read is confusing, __do not__ push this button. Most likely it won't do what you think it will.

![Pull Button](../doc/media/PullRequest.PNG)

If you are looking at this button then you've pushed some changes to your team's fork of ftctechnh/ftc_app. Congratulations! You are almost certainly finished.

The vast majority of pull requests seen on the ftctechnh/ftc_app repository are not intended to be merged into the official SDK. Team software is just that, your team's. It's specific to the tasks you are trying to accomplish, the testing you are doing, and goals your team has. You don't want that pushed into the official SDK.

If what you've read so far makes little sense, there are some very good git learning resources online.
[Git Book](https://git-scm.com/book/en/v2)
[Interactive Git Tutorial](https://try.github.io)

##### Guidlines for experienced GIT users.

If you are absolutely certain that you want to push the big green button above, read on. Otherwise back _slowly away from keyboard_.

The real intent for advanced users is often to issue a pull request from the [branch](https://www.atlassian.com/git/tutorials/using-branches/git-branch) on a local fork back to master on either the same local fork or a child of the team fork and not on the parent ftctechnh/ftc_app. See [Creating a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).

If that is indeed the intent, then you can merge your [topic branch](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#Topic-Branches) into master locally by hand before pushing it up to github, or if you want a pull request for pulls between branches on the same repository because, say, you want team members to look at your software before merging into master, you can select the base fork from the dropdown on the "Open a pull request" page and select your team repo instead of ftctechnh's.

Alternatively, if you have a team repository forked from ftctechnh/ftc_app, and then team members individually fork from your team repository, then pull requests from the individual team member's forks will have the main team repository automatically selected as the base fork for the pull. And you won't inadvertently request to pull your team software into ftctechnh's repository.

The latter would be the "best" way to manage software among a large team. But as with all things git there are many options.

Pull requests that do not fall into the category above are evaluated by the FTC Technology Team on a case-by-case basis. Please note however that the deployment model of the SDK does not support direct pulls into ftctechnh/ftc_app.

### Report bugs

This section guides you through filing a bug report. The better the report the more likely it is to be root caused and fixed. Please refrain from feature requests or software enhancements when opening new issues. See Suggesting Enhancements below.

#### Before submitting a bug report

- Check the [forums](http://ftcforum.usfirst.org/forum.php) to see if someone else has run into the problem and whether there is an official solution that doesn't require a new SDK.

- Perform a search of current [issues](https://github.com/ftctechnh/ftc_app/issues) to see if the problem has already been reported. If so, add a comment to the existing issue instead of creating a new one.

#### How Do I Submit A (Good) Bug Report?

Bugs are tracked as GitHub issues. Create an issue on ftctechnh/ftc_app and provide the following information.
Explain the problem and include additional details to help maintainers reproduce the problem:

- Use a clear and descriptive title for the issue to identify the problem.

- Describe the exact steps which reproduce the problem in as many details as possible.

- Provide specific examples to demonstrate the steps.

- Describe the behavior you observed after following the steps and point out what exactly is the problem with that behavior. Explain which behavior you expected to see instead and why. If applicable, include screenshots which show you following the described steps and clearly demonstrate the problem.

- If you're reporting that the RobotController crashed, include the logfile with a stack trace of the crash. [Example of good bug report with stack trace](https://github.com/ftctechnh/ftc_app/issues/224)

- If the problem wasn't triggered by a specific action, describe what you were doing before the problem happened and share more information using the guidelines below.

### Suggesting Enhancements

FIRST volunteers are awesome. You all have great ideas and we want to hear them.

Enhancements should be broadly applicable to a large majority of teams, should not force teams to change their workflow, and should provide real value to the mission of FIRST as it relates to engaging youth in engineering activities.

The best way to get momentum behind new features is to post a description of your idea in the forums. Build community support for it. The FTC Technology Team monitors the forums. We'll hear you and if there's a large enough call for the feature it's very likely to get put on the list for a future release.
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Before issuing a pull request, please see the contributing page.
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,4 @@ lint/outputs/
lint/tmp/
# lint/reports/

.DS_Store

.idea
*ASUS_PC_01*
debug.log
VuForiaKey.java
134 changes: 0 additions & 134 deletions .idea/codeStyles/Project.xml

This file was deleted.

9 changes: 9 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ android:
- tools
- platform-tools
- build-tools-29.0.3
- android-28
- android-29
- extra-google-m2repository
- extra-android-m2repository
- extra-google-google_play_services
- extra
notifications:
slack:
secure: e7B+wHljD95DCnYoSmFRwzQ2pM+5O+7mWBJipxGDtSIikokwZfp3b4PVMI2/UzcH4NmrOOrzyrWSB6804xMvVZjKa7BHVTw5aV9xFGXBscVHeKN7K4vZ2Nc5TOdigN1LxwRsjxsQBMr3FoBY8RXIHK2iJd22kiGXQRGMOJia16/inPWUSN6Y+N2g4Ywb15P7FtHVe+siGbr0/iTwTuMjD51ZxfFG9+585iqQ95lb80wJa9vEBDwnGnRow4bC/m+QnGfp/XYzgJowrJk333jGXcD33VubyNr3wCwmSIW4rxyIrPzknED+P+P+6i1MrtSyXC4WKjNQzcvfzoBaLr7a51+E6p0fFfxXc0ynWveWrF7pubq5tocYlBGkluVqO9wgRcvrH+pX5MISJKU4eIAdDm+nf6pT8CLImfbsLuVEqt2cdhOdNTMGRl/0hZxPntI7XfbW4cgXhEwOt7uqpJpAMozg9eFlGFYmXiJGhQEQ4EvVncNQ+qC3SzofQjojv8orPhFKH0TZ1fgFM/IYvCXTJV4zLON2ME9rnkyIyEN3OC6/ojSzIeBTdpvTWTU53chLaGbPwZGzyuD0h9ffDs8Y4/4wSLDI8sOjViihAwut/9EvxIx/F6QyeFXjhSW1NJr1MivVR02doTXvtx7oHUWw5JYE5Hsfl0X27vSZaod2VVY=
secure: e7B+wHljD95DCnYoSmFRwzQ2pM+5O+7mWBJipxGDtSIikokwZfp3b4PVMI2/UzcH4NmrOOrzyrWSB6804xMvVZjKa7BHVTw5aV9xFGXBscVHeKN7K4vZ2Nc5TOdigN1LxwRsjxsQBMr3FoBY8RXIHK2iJd22kiGXQRGMOJia16/inPWUSN6Y+N2g4Ywb15P7FtHVe+siGbr0/iTwTuMjD51ZxfFG9+585iqQ95lb80wJa9vEBDwnGnRow4bC/m+QnGfp/XYzgJowrJk333jGXcD33VubyNr3wCwmSIW4rxyIrPzknED+P+P+6i1MrtSyXC4WKjNQzcvfzoBaLr7a51+E6p0fFfxXc0ynWveWrF7pubq5tocYlBGkluVqO9wgRcvrH+pX5MISJKU4eIAdDm+nf6pT8CLImfbsLuVEqt2cdhOdNTMGRl/0hZxPntI7XfbW4cgXhEwOt7uqpJpAMozg9eFlGFYmXiJGhQEQ4EvVncNQ+qC3SzofQjojv8orPhFKH0TZ1fgFM/IYvCXTJV4zLON2ME9rnkyIyEN3OC6/ojSzIeBTdpvTWTU53chLaGbPwZGzyuD0h9ffDs8Y4/4wSLDI8sOjViihAwut/9EvxIx/F6QyeFXjhSW1NJr1MivVR02doTXvtx7oHUWw5JYE5Hsfl0X27vSZaod2VVY=
6 changes: 3 additions & 3 deletions FtcRobotController/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ apply plugin: 'com.android.library'
android {

defaultConfig {
minSdkVersion 25
targetSdkVersion 28
minSdkVersion 23
targetSdkVersion 29
buildConfigField "String", "BUILD_TIME", '"' + (new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.ROOT).format(new Date())) + '"'
}

compileSdkVersion 28
compileSdkVersion 29

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
16 changes: 8 additions & 8 deletions FtcRobotController/build.release.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies {
implementation 'org.firstinspires.ftc:Inspection:6.0.1'
implementation 'org.firstinspires.ftc:Blocks:6.0.1'
implementation 'org.firstinspires.ftc:RobotCore:6.0.1'
implementation 'org.firstinspires.ftc:RobotServer:6.0.1'
implementation 'org.firstinspires.ftc:OnBotJava:6.0.1'
implementation 'org.firstinspires.ftc:Hardware:6.0.1'
implementation 'org.firstinspires.ftc:FtcCommon:6.0.1'
implementation 'org.firstinspires.ftc:Inspection:6.1.1'
implementation 'org.firstinspires.ftc:Blocks:6.1.1'
implementation 'org.firstinspires.ftc:RobotCore:6.1.1'
implementation 'org.firstinspires.ftc:RobotServer:6.1.1'
implementation 'org.firstinspires.ftc:OnBotJava:6.1.1'
implementation 'org.firstinspires.ftc:Hardware:6.1.1'
implementation 'org.firstinspires.ftc:FtcCommon:6.1.1'
implementation 'androidx.appcompat:appcompat:1.2.0'

implementation 'com.acmerobotics.dashboard:dashboard:0.3.10'
implementation 'com.acmerobotics.dashboard:dashboard:0.4.0'
}
7 changes: 4 additions & 3 deletions FtcRobotController/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.qualcomm.ftcrobotcontroller"
android:versionCode="38"
android:versionName="6.0">
android:versionCode="39"
android:versionName="6.1">

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

Expand All @@ -13,7 +13,8 @@
android:extractNativeLibs="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppThemeRedRC" >
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
Expand Down
8 changes: 0 additions & 8 deletions FtcRobotController/src/main/assets/trajectory/_group.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,8 @@ public void runOpMode() {
// If your target is at distance greater than 50 cm (20") you can adjust the magnification value
// to artificially zoom in to the center of image. For best results, the "aspectRatio" argument
// should be set to the value of the images used to create the TensorFlow Object Detection model
// (typically 1.78 or 16/9).

// Uncomment the following line if you want to adjust the magnification and/or the aspect ratio of the input images.
//tfod.setZoom(2.5, 1.78);
// (typically 16/9).
tfod.setZoom(2.5, 16.0/9.0);
}

/** Wait for the game to begin */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,8 @@ public void runOpMode() {
// If your target is at distance greater than 50 cm (20") you can adjust the magnification value
// to artificially zoom in to the center of image. For best results, the "aspectRatio" argument
// should be set to the value of the images used to create the TensorFlow Object Detection model
// (typically 1.78 or 16/9).

// Uncomment the following line if you want to adjust the magnification and/or the aspect ratio of the input images.
//tfod.setZoom(2.5, 1.78);
// (typically 16/9).
tfod.setZoom(2.5, 16.0/9.0);
}

/** Wait for the game to begin */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,8 @@ public void runOpMode() {
// If your target is at distance greater than 50 cm (20") you can adjust the magnification value
// to artificially zoom in to the center of image. For best results, the "aspectRatio" argument
// should be set to the value of the images used to create the TensorFlow Object Detection model
// (typically 1.78 or 16/9).

// Uncomment the following line if you want to adjust the magnification and/or the aspect ratio of the input images.
//tfod.setZoom(2.5, 1.78);
// (typically 16/9).
tfod.setZoom(2.5, 16.0/9.0);
}

/** Wait for the game to begin */
Expand Down
Loading

0 comments on commit 60ca6ec

Please sign in to comment.