Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Skystone code to CHS Robo code base #4

Closed
wants to merge 2 commits into from
Closed

Merge Skystone code to CHS Robo code base #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f56831d
v5.0
ftctechnh Jun 28, 2019
e2fcfed
Merge pull request #721 from ftctechnh/beta
ftctechnh Jul 17, 2019
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
4 changes: 2 additions & 2 deletions FtcRobotController/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ android {

defaultConfig {
minSdkVersion 19
targetSdkVersion 19
targetSdkVersion 26
}

compileSdkVersion 23
compileSdkVersion 28

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
Expand Down
3 changes: 3 additions & 0 deletions FtcRobotController/build.release.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ dependencies {
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'
}
31 changes: 22 additions & 9 deletions FtcRobotController/src/main/AndroidManifest.xml
View file
Open in desktop
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="31"
android:versionName="4.3">
android:versionCode="32"
android:versionName="5.0">

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

Expand All @@ -14,19 +14,32 @@
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.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>
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.MAIN" />
</intent-filter>

<intent-filter>
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
</intent-filter>
Expand All @@ -35,10 +48,10 @@
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"
/>
android:value="true" />
</activity>

<!-- The robot controller service in which most of the robot functionality is managed -->
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptScanServo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* INCREMENT sets how much to increase/decrease the servo position each cycle
* CYCLE_MS sets the update period.
*
* This code assumes a Servo configured with the name "left claw" as is found on a pushbot.
* This code assumes a Servo configured with the name "left_hand" as is found on a pushbot.
*
* NOTE: When any servo position is set, ALL attached servos are activated, so ensure that any other
* connected servos are able to move freely before running this test.
Expand Down
8 changes: 4 additions & 4 deletions .../firstinspires/ftc/robotcontroller/external/samples/ConceptTensorFlowObjectDetection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class ConceptTensorFlowObjectDetection extends LinearOpMode {
private VuforiaLocalizer vuforia;

/**
* {@link #tfod} is the variable we will use to store our instance of the Tensor Flow Object
* {@link #tfod} is the variable we will use to store our instance of the TensorFlow Object
* Detection engine.
*/
private TFObjectDetector tfod;
Expand All @@ -100,7 +100,7 @@ public void runOpMode() {
waitForStart();

if (opModeIsActive()) {
/** Activate Tensor Flow Object Detection. */
/** Activate TensorFlow Object Detection. */
if (tfod != null) {
tfod.activate();
}
Expand Down Expand Up @@ -161,11 +161,11 @@ private void initVuforia() {
// Instantiate the Vuforia engine
vuforia = ClassFactory.getInstance().createVuforia(parameters);

// Loading trackables is not necessary for the Tensor Flow Object Detection engine.
// Loading trackables is not necessary for the TensorFlow Object Detection engine.
}

/**
* Initialize the Tensor Flow Object Detection engine.
* Initialize the TensorFlow Object Detection engine.
*/
private void initTfod() {
int tfodMonitorViewId = hardwareMap.appContext.getResources().getIdentifier(
Expand Down
8 changes: 4 additions & 4 deletions ...inspires/ftc/robotcontroller/external/samples/ConceptTensorFlowObjectDetectionWebcam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class ConceptTensorFlowObjectDetectionWebcam extends LinearOpMode {
private VuforiaLocalizer vuforia;

/**
* {@link #tfod} is the variable we will use to store our instance of the Tensor Flow Object
* {@link #tfod} is the variable we will use to store our instance of the TensorFlow Object
* Detection engine.
*/
private TFObjectDetector tfod;
Expand All @@ -100,7 +100,7 @@ public void runOpMode() {
waitForStart();

if (opModeIsActive()) {
/** Activate Tensor Flow Object Detection. */
/** Activate TensorFlow Object Detection. */
if (tfod != null) {
tfod.activate();
}
Expand Down Expand Up @@ -161,11 +161,11 @@ private void initVuforia() {
// Instantiate the Vuforia engine
vuforia = ClassFactory.getInstance().createVuforia(parameters);

// Loading trackables is not necessary for the Tensor Flow Object Detection engine.
// Loading trackables is not necessary for the TensorFlow Object Detection engine.
}

/**
* Initialize the Tensor Flow Object Detection engine.
* Initialize the TensorFlow Object Detection engine.
*/
private void initTfod() {
int tfodMonitorViewId = hardwareMap.appContext.getResources().getIdentifier(
Expand Down
2 changes: 1 addition & 1 deletion ...ler/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/SensorColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
/*
* This is an example LinearOpMode that shows how to use a color sensor in a generic
* way, insensitive which particular make or model of color sensor is used. The opmode
* assumes that the color sensor is configured with a name of "color sensor".
* assumes that the color sensor is configured with a name of "sensor_color".
*
* If the color sensor has a light which is controllable, you can use the X button on
* the gamepad to toggle the light on and off.
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/firstinspires/ftc/robotcontroller/external/samples/SensorDigitalTouch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* 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".
* It assumes that the touch sensor is configured with a name of "sensor_digital".
*
* 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.
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/firstinspires/ftc/robotcontroller/external/samples/SensorREV2mDistance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ are permitted (subject to the limitations in the disclaimer below) provided that
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 FITNESSFOR A PARTICULAR PURPOSE
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
Expand Down
Loading