Skip to content
This repository has been archived by the owner on Oct 27, 2020. It is now read-only.

Commit

Permalink
Commit to upload missing files from v3.2 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
ftctechnh committed Aug 3, 2017
1 parent 5eda879 commit 9f2f6ff
Show file tree
Hide file tree
Showing 30 changed files with 486 additions and 196 deletions.
5 changes: 2 additions & 3 deletions FtcRobotController/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import java.util.regex.Pattern

//
// build.gradle in FtcRobotController
//
Expand All @@ -13,7 +11,8 @@ android {
}

compileSdkVersion 23
buildToolsVersion '23.0.3'
buildToolsVersion '25.0.3'

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
Expand Down
26 changes: 3 additions & 23 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="21"
android:versionName="3.1">
android:versionCode="24"
android:versionName="3.4">

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

Expand All @@ -12,7 +12,7 @@
android:largeHeap="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
android:theme="@style/AppThemeRedRC" >

<!-- The main robot controller activity -->
<activity
Expand All @@ -35,31 +35,11 @@
android:resource="@xml/device_filter" />
</activity>

<!-- Assistant that autostarts the robot controller on android boot -->
<receiver
android:enabled="true"
android:exported="true"
android:name="org.firstinspires.ftc.robotcontroller.internal.RunOnStartup"
android:permission="android.permission.RECEIVE_BOOT_COMPLETED">

<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
</intent-filter>

</receiver>

<!-- The robot controller service in which most of the robot functionality is managed -->
<service
android:name="com.qualcomm.ftccommon.FtcRobotControllerService"
android:enabled="true" />

<!-- A service that will auto-restart the robot controller if it crashes (if it's supposed to :-) -->
<service
android:name="org.firstinspires.ftc.robotcontroller.internal.FtcRobotControllerWatchdogService"
android:enabled="true" />

</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@ are permitted (subject to the limitations in the disclaimer below) provided that
*/
package org.firstinspires.ftc.robotcontroller.external.samples;

import com.qualcomm.ftccommon.DbgLog;
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.hardware.CompassSensor;
import com.qualcomm.robotcore.hardware.LightSensor;
import com.qualcomm.robotcore.util.ElapsedTime;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
import android.graphics.Color;
import android.view.View;

import com.qualcomm.ftccommon.DbgLog;
import com.qualcomm.ftcrobotcontroller.R;
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ are permitted (subject to the limitations in the disclaimer below) provided that
import org.firstinspires.ftc.robotcore.external.navigation.AxesOrder;
import org.firstinspires.ftc.robotcore.external.navigation.AxesReference;
import org.firstinspires.ftc.robotcore.external.navigation.Orientation;
import org.firstinspires.ftc.robotcore.internal.AppUtil;
import org.firstinspires.ftc.robotcore.internal.system.AppUtil;

import java.io.File;
import java.util.Locale;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
import com.qualcomm.robotcore.hardware.NormalizedRGBA;
import com.qualcomm.robotcore.hardware.SwitchableLight;

import org.firstinspires.ftc.robotcore.internal.AppUtil;
import org.firstinspires.ftc.robotcore.internal.system.AppUtil;

/*
* This is an example LinearOpMode that shows how to use a color sensor in a generic
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
/* Copyright (c) 2017 FIRST.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted (subject to the limitations in the disclaimer below) provided that
the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
Neither the name of Qualcomm Technologies Inc nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS
LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

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.DigitalChannel;

/*
* This is an example LinearOpMode that shows how to use
* a REV Robotics Touch Sensor.
*
* It assumes that the touch sensor is configured with a name of "digitalTouch".
*
* 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 = "Sensor: Digital touch", group = "Sensor")
@Disabled
public class SensorDigitalTouch extends LinearOpMode {
/**
* The REV Robotics Touch Sensor
* is treated as a digital channel. It is HIGH if the button is unpressed.
* It pulls LOW if the button is pressed.
*
* Also, when you connect a REV Robotics Touch Sensor to the digital I/O port on the
* Expansion Hub using a 4-wire JST cable, the second pin gets connected to the Touch Sensor.
* The lower (first) pin stays unconnected.*
*/

DigitalChannel digitalTouch; // Hardware Device Object

@Override
public void runOpMode() {

// get a reference to our digitalTouch object.
digitalTouch = hardwareMap.get(DigitalChannel.class, "digitalTouch");

// set the digital channel to input.
digitalTouch.setMode(DigitalChannel.Mode.INPUT);

// wait for the start button to be pressed.
waitForStart();

// while the op mode is active, loop and read the light levels.
// Note we use opModeIsActive() as our loop condition because it is an interruptible method.
while (opModeIsActive()) {

// send the info back to driver station using telemetry function.
// if the digital channel returns true it's HIGH and the button is unpressed.
if (digitalTouch.getState() == true) {
telemetry.addData("Digital Touch", "Is Not Pressed");
} else {
telemetry.addData("Digital Touch", "Is Pressed");
}

telemetry.update();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
/* Copyright (c) 2017 FIRST.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted (subject to the limitations in the disclaimer below) provided that
the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
Neither the name of Qualcomm Technologies Inc nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS
LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

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

import android.app.Activity;
import android.graphics.Color;
import android.view.View;

import com.qualcomm.ftcrobotcontroller.R;
import com.qualcomm.hardware.lynx.LynxI2cColorRangeSensor;
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.hardware.ColorSensor;
import com.qualcomm.robotcore.hardware.DeviceInterfaceModule;
import com.qualcomm.robotcore.hardware.DigitalChannelController;
import com.qualcomm.robotcore.hardware.DistanceSensor;

import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;

import java.util.Locale;

/*
* This is an example LinearOpMode that shows how to use
* the REV Robotics Color-Distance Sensor.
*
* It assumes the sensor is configured with the name "sensorColorDistance".
*
* 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 = "Sensor: REVColorDistance", group = "Sensor")
@Disabled // Comment this out to add to the opmode list
public class SensorREVColorDistance extends LinearOpMode {

/**
* Note that the REV Robotics Color-Distance incorporates two sensors into one device.
* It has a light/distance (range) sensor. It also has an RGB color sensor.
* The light/distance sensor saturates at around 2" (5cm). This means that targets that are 2"
* or closer will display the same value for distance/light detected.
*
* Although you configure a single REV Robotics Color-Distance sensor in your configuration file,
* you can treat the sensor as two separate sensors that share the same name in your op mode.
*
* In this example, we represent the detected color by a hue, saturation, and value color
* model (see https://en.wikipedia.org/wiki/HSL_and_HSV). We change the background
* color of the screen to match the detected color.
*
* In this example, we also use the distance sensor to display the distance
* to the target object. Note that the distance sensor saturates at around 2" (5 cm).
*
*/
ColorSensor sensorColor;
DistanceSensor sensorDistance;

@Override
public void runOpMode() {

// get a reference to the color sensor.
sensorColor = hardwareMap.get(ColorSensor.class, "sensorColorDistance");

// get a reference to the distance sensor that shares the same name.
sensorDistance = hardwareMap.get(DistanceSensor.class, "sensorColorDistance");

// hsvValues is an array that will hold the hue, saturation, and value information.
float hsvValues[] = {0F, 0F, 0F};

// values is a reference to the hsvValues array.
final float values[] = hsvValues;

// sometimes it helps to multiply the raw RGB values with a scale factor
// to amplify/attentuate the measured values.
final double SCALE_FACTOR = 255;

// get a reference to the RelativeLayout so we can change the background
// color of the Robot Controller app to match the hue detected by the RGB sensor.
final View relativeLayout = ((Activity) hardwareMap.appContext).findViewById(R.id.RelativeLayout);

// wait for the start button to be pressed.
waitForStart();

// loop and read the RGB and distance data.
// Note we use opModeIsActive() as our loop condition because it is an interruptible method.
while (opModeIsActive()) {
// convert the RGB values to HSV values.
// multiply by the SCALE_FACTOR.
// then cast it back to int (SCALE_FACTOR is a double)
Color.RGBToHSV((int) (sensorColor.red() * SCALE_FACTOR),
(int) (sensorColor.green() * SCALE_FACTOR),
(int) (sensorColor.blue() * SCALE_FACTOR),
hsvValues);

// send the info back to driver station using telemetry function.
telemetry.addData("Distance (cm)",
String.format(Locale.US, "%.02f", sensorDistance.getDistance(DistanceUnit.CM)));
telemetry.addData("Alpha", sensorColor.alpha());
telemetry.addData("Red ", sensorColor.red());
telemetry.addData("Green", sensorColor.green());
telemetry.addData("Blue ", sensorColor.blue());
telemetry.addData("Hue", hsvValues[0]);

// change the background color to match the color detected by the RGB sensor.
// pass a reference to the hue, saturation, and value array as an argument
// to the HSVToColor method.
relativeLayout.post(new Runnable() {
public void run() {
relativeLayout.setBackgroundColor(Color.HSVToColor(0xff, values));
}
});

telemetry.update();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

package org.firstinspires.ftc.robotcontroller.internal;

import com.google.blocks.ftcrobotcontroller.runtime.BlocksOpMode;
import com.qualcomm.robotcore.eventloop.opmode.OpModeManager;
import com.qualcomm.robotcore.eventloop.opmode.OpModeRegister;
import com.qualcomm.robotcore.eventloop.opmode.AnnotatedOpModeRegistrar;

import org.firstinspires.ftc.robotcontroller.external.samples.ConceptNullOp;

/**
Expand Down Expand Up @@ -64,16 +63,6 @@ public class FtcOpModeRegister implements OpModeRegister {
*/
public void register(OpModeManager manager) {

/**
* Register OpModes implemented in the Blocks visual programming language.
*/
BlocksOpMode.registerAll(manager);

/**
* Register OpModes that use the annotation-based registration mechanism.
*/
AnnotatedOpModeRegistrar.register(manager);

/**
* Any manual OpMode class registrations should go here.
*/
Expand Down
Loading

0 comments on commit 9f2f6ff

Please sign in to comment.