forked from ftctechnh/ftc_app
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated FTC stuff to 2016-17 Season version. Also worked on changing …
…code to accomodate for new chassis design.
- Loading branch information
Scott Barnet
committed
Oct 15, 2016
1 parent
a0e8a3b
commit 1090dd4
Showing
362 changed files
with
68,155 additions
and
3,544 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,4 +26,3 @@ build/ | |
|
|
||
| *ASUS_PC_01* | ||
|
|
||
| FtcRobotController/FtcRobotController.iml | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,29 @@ | ||
| apply plugin: 'com.android.application' | ||
| import java.util.regex.Pattern | ||
|
|
||
| // | ||
| // build.gradle in FtcRobotController | ||
| // | ||
| apply plugin: 'com.android.library' | ||
|
|
||
| android { | ||
|
|
||
| defaultConfig { | ||
| minSdkVersion 16 | ||
| minSdkVersion 19 | ||
| targetSdkVersion 19 | ||
| } | ||
| compileSdkVersion 21 | ||
| //compileSdkVersion 19 | ||
| buildToolsVersion '21.1.2' | ||
| } | ||
|
|
||
| buildscript { | ||
| repositories { | ||
| jcenter() | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:1.2.3' | ||
|
|
||
| // NOTE: Do not place your application dependencies here; they belong | ||
| // in the individual module build.gradle files | ||
| compileSdkVersion 23 | ||
| buildToolsVersion '23.0.3' | ||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_7 | ||
| targetCompatibility JavaVersion.VERSION_1_7 | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| flatDir { | ||
| dirs 'libs' | ||
| dirs '../libs' | ||
| } | ||
| } | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| jcenter() | ||
| flatDir { | ||
| dirs 'out' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| compile files('libs/android-support-v4.jar') | ||
| compile(name: 'RobotCore-release', ext: 'aar') | ||
| compile(name: 'Hardware-release', ext: 'aar') | ||
| compile(name: 'FtcCommon-release', ext: 'aar') | ||
| compile(name: 'ModernRobotics-release', ext: 'aar') | ||
| compile(name: 'Analytics-release', ext: 'aar') | ||
| compile(name: 'WirelessP2p-release', ext: 'aar') | ||
| } | ||
| apply from: 'build.release.gradle' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| dependencies { | ||
| compile (name:'Inspection-release', ext: 'aar') | ||
| compile (name:'Blocks-release', ext: 'aar') | ||
| compile (name:'RobotCore-release', ext: 'aar') | ||
| compile (name:'Hardware-release', ext: 'aar') | ||
| compile (name:'FtcCommon-release', ext: 'aar') | ||
| compile (name:'ModernRobotics-release', ext:'aar') | ||
| compile (name:'Analytics-release', ext:'aar') | ||
| compile (name:'WirelessP2p-release', ext:'aar') | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <QCARConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="qcar_config.xsd"> | ||
| <Tracking> | ||
| <ImageTarget name="Wheels" size="254.000000 184.154922" /> | ||
| <ImageTarget name="Tools" size="254.000000 184.154922" /> | ||
| <ImageTarget name="Legos" size="254.000000 184.154922" /> | ||
| <ImageTarget name="Gears" size="254.000000 184.154922" /> | ||
| </Tracking> | ||
| </QCARConfig> |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0"?> | ||
| <QCARConfig xsi:noNamespaceSchemaLocation="qcar_config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <Tracking> | ||
| <ImageTarget name="stones" size="247 173"/> | ||
| <ImageTarget name="chips" size="247 173"/> | ||
| </Tracking> | ||
| </QCARConfig> |
Oops, something went wrong.