Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions FtcRobotController/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ android {

defaultConfig {
minSdkVersion 19
targetSdkVersion 19
targetSdkVersion 26
}

compileSdkVersion 23
buildToolsVersion '25.0.3'
compileSdkVersion 28

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
Expand Down
16 changes: 9 additions & 7 deletions FtcRobotController/build.release.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
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:'Analytics-release', ext:'aar')
compile (name:'WirelessP2p-release', ext:'aar')
implementation (name:'Inspection-release', ext: 'aar')
implementation (name:'Blocks-release', ext: 'aar')
implementation (name:'RobotCore-release', ext: 'aar')
implementation (name:'RobotServer-release', ext: 'aar')
implementation (name:'OnBotJava-release', ext: 'aar')
implementation (name:'Hardware-release', ext: 'aar')
implementation (name:'FtcCommon-release', ext: 'aar')
implementation (name:'WirelessP2p-release', ext:'aar')
implementation 'com.android.support:support-compat:28.0.0'
}
33 changes: 26 additions & 7 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="26"
android:versionName="3.6">
android:versionCode="32"
android:versionName="5.0">

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

Expand All @@ -14,25 +14,44 @@
android:label="@string/app_name"
android:theme="@style/AppThemeRedRC" >

<!-- Indicates to the ControlHubUpdater what the latest version of the Control Hub is that this app supports -->
<meta-data
android:name="org.firstinspires.latestSupportedControlHubVersion"
android:value="1" />

<!-- The main robot controller activity -->
<activity
android:name="org.firstinspires.ftc.robotcontroller.internal.FtcRobotControllerActivity"
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask" >
<activity android:name="org.firstinspires.ftc.robotcontroller.internal.PermissionValidatorWrapper"
android:screenOrientation="fullUser"
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask" >

<intent-filter>
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.MAIN" />
</intent-filter>

</activity>

<activity
android:name="org.firstinspires.ftc.robotcontroller.internal.FtcRobotControllerActivity"
android:screenOrientation="fullUser"
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask" >

<intent-filter>
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
</intent-filter>

<meta-data
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
android:resource="@xml/device_filter" />

<!--org.firstinspires.main.entry indicates that this app is compatible with the Dragonboard Control Hub-->
<meta-data
android:name="org.firstinspires.main.entry"
android:value="true" />
</activity>

<!-- The robot controller service in which most of the robot functionality is managed -->
Expand Down
Binary file not shown.
Binary file not shown.
9 changes: 9 additions & 0 deletions FtcRobotController/src/main/assets/RoverRuckus.xml
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="BluePerimeter" size="254.000000 183.280029" />
<ImageTarget name="RedPerimeter" size="254.000000 181.783096" />
<ImageTarget name="FrontPerimeter" size="254.000000 158.794403" />
<ImageTarget name="BackPerimeter" size="254.000000 199.508209" />
</Tracking>
</QCARConfig>
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

package org.firstinspires.ftc.robotcontroller.external.samples;

import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
import com.qualcomm.robotcore.hardware.CompassSensor;
import com.qualcomm.robotcore.util.ElapsedTime;

Expand All @@ -52,7 +52,7 @@
* Remove or comment out the @Disabled line to add this opmode to the Driver Station OpMode list
*/

@Autonomous(name="Concept: Compass Calibration", group="Concept")
@TeleOp(name="Concept: Compass Calibration", group="Concept")
@Disabled
public class ConceptCompassCalibration extends LinearOpMode {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

package org.firstinspires.ftc.robotcontroller.external.samples;

import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
import com.qualcomm.robotcore.hardware.DeviceInterfaceModule;
import com.qualcomm.robotcore.util.ElapsedTime;

Expand All @@ -51,7 +51,7 @@
* Use Android Studios to Copy this Class, and Paste it into your team's code folder with a new name.
* Remove or comment out the @Disabled line to add this opmode to the Driver Station OpMode list
*/
@Autonomous(name = "Concept: DIM As Indicator", group = "Concept")
@TeleOp(name = "Concept: DIM As Indicator", group = "Concept")
@Disabled
public class ConceptDIMAsIndicator extends LinearOpMode {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

package org.firstinspires.ftc.robotcontroller.external.samples;

import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
import com.qualcomm.robotcore.eventloop.opmode.OpMode;
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
import com.qualcomm.robotcore.util.ElapsedTime;

import java.text.SimpleDateFormat;
Expand All @@ -40,7 +40,7 @@
/**
* Demonstrates empty OpMode
*/
@Autonomous(name = "Concept: NullOp", group = "Concept")
@TeleOp(name = "Concept: NullOp", group = "Concept")
@Disabled
public class ConceptNullOp extends OpMode {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

package org.firstinspires.ftc.robotcontroller.external.samples;

import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
import com.qualcomm.robotcore.hardware.DcMotor;

/**
Expand All @@ -46,7 +46,7 @@
* Use Android Studio to Copy this Class, and Paste it into your team's code folder with a new name.
* Remove or comment out the @Disabled line to add this opmode to the Driver Station OpMode list
*/
@Autonomous(name = "Concept: Ramp Motor Speed", group = "Concept")
@TeleOp(name = "Concept: Ramp Motor Speed", group = "Concept")
@Disabled
public class ConceptRampMotorSpeed extends LinearOpMode {

Expand Down

This file was deleted.

Loading