Skip to content

Commit

Permalink
Merge pull request ftctechnh#1 from GG7190/mergingLastYear
Browse files Browse the repository at this point in the history
merging in last years code
  • Loading branch information
GG7190 committed Apr 18, 2016
2 parents 83d998b + bb8a15d commit 6fd0666
Show file tree
Hide file tree
Showing 11 changed files with 860 additions and 20 deletions.
51 changes: 31 additions & 20 deletions FtcRobotController/FtcRobotController.iml
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="FtcRobotController" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":FtcRobotController" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ftc_app" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":" />
<option name="GRADLE_PROJECT_PATH" value=":FtcRobotController" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="release" />
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<afterSyncTasks>
<task>generateReleaseSources</task>
<task>generateDebugAndroidTestSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
Expand All @@ -24,23 +27,29 @@
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/release" />
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/release" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/release" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/release" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
Expand Down Expand Up @@ -81,6 +90,8 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.greengirls;

/**
* Created by G201956 on 9/23/2015.
*/
public class Motor {
private int power = 0;
public int stopMotor() {
power = 0;
System.out.println ("hi");
return 0;
}
public void setPower(int motorPower){
power = motorPower;
}
public int getPower(){
return power;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.greengirls.ResQ2016;

import com.greengirls.ResQ2016.RobotHardware2016;

/**
* Created by Dell User on 10/25/2015.
*/
public class ResQTeleop extends RobotHardware2016 {
/*
* Code to run when the op mode is initialized goes here
*
* @see com.qualcomm.robotcore.eventloop.opmode.OpMode#init()
*/


@Override
public void init() {

super.init();

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
package com.greengirls.ResQ2016;

import com.qualcomm.robotcore.eventloop.opmode.OpMode;
import com.qualcomm.robotcore.hardware.DcMotorController;
import com.qualcomm.robotcore.hardware.IrSeekerSensor;
import com.qualcomm.robotcore.hardware.Servo;
import com.qualcomm.robotcore.hardware.DcMotor;
import com.qualcomm.robotcore.hardware.ServoController;
/**
* Created by Dell User on 10/25/2015.
*/
public class RobotHardware2016 extends OpMode{

//define Motors and MotorControllers
private DcMotorController rightMotorController;
private DcMotor rightFrontMotor;
private DcMotorController leftMotorController;
private DcMotor leftFrontMotor;
private DcMotor rightBackMotor;
private DcMotor leftBackMotor;
private DcMotorController attachmentMotorController;
private DcMotor liftMotorRight;
private DcMotor liftMotorLeft;

@Override public void init() {


//Map hardware for Right motor controller
rightMotorController = hardwareMap.dcMotorController.get("right_drive_controller");
rightFrontMotor = hardwareMap.dcMotor.get("right_front_motor");
rightBackMotor = hardwareMap.dcMotor.get("right_back_motor");

//Map hardware for Left motor controller
leftMotorController = hardwareMap.dcMotorController.get("left_drive_controller");
leftFrontMotor = hardwareMap.dcMotor.get("left_front_motor");
leftBackMotor = hardwareMap.dcMotor.get("left_back_motor");

//Map hardware for attachment motor controller
attachmentMotorController = hardwareMap.dcMotorController.get("attachment_controller");
liftMotorRight = hardwareMap.dcMotor.get("lift_right_motor");
liftMotorLeft = hardwareMap.dcMotor.get("lift_left_motor");

}

//get the power for both right motors
public double getRightMotors(){
return rightFrontMotor.getPower();
}

//set get power for both left motors
public double getLeftMotors(){
return leftFrontMotor.getPower();
}

//set power to right motors
public void setRightMotors(double power){
rightFrontMotor.setPower(power);
rightBackMotor.setPower(power);
}

//set power to left motors
public void setLeftMotors(double power){
leftFrontMotor.setPower(power);
leftBackMotor.setPower(power);
}

//get the power to right lift motor
public double getLiftMotorRight(){
return liftMotorRight.getPower();
}

//set the power to right lift motor
public void setLiftMotorRight(double power) {
liftMotorRight.setPower(power);
}

//get the power to left lift motor
public double getLiftMotorLeft(){
return liftMotorLeft.getPower();
}

//set the power to collector motor
public void setLiftMotorLeft(double power) {
liftMotorLeft.setPower(power);
}

@Override public void loop() {

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.greengirls;

/**
* Represents the state of our Robot.
*
* @author The Green Girls
* @since 9/20/2015.
*/
public class Robot {
private boolean isDeflectorUp = false;
private int compassHeading = 0;
private drivingMotor front;
private drivingMotor rear;
public static void main(String args[]) {
Motor rightFront = new Motor();
rightFront.stopMotor();
}

/**
* Determines whether the deflector
* is currently up
*
* @return {@code true} if the deflector is
* up, {@code false} otherwise
*/
public boolean isDeflectorUp(){
return isDeflectorUp;
}

/**
* Sets the deflector state
*
* @param state {@code true} for up,
* {@code false} for down.
*/
public void setDeflectorUp(boolean state){
isDeflectorUp = state;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.greengirls;

import com.qualcomm.robotcore.eventloop.opmode.OpMode;
import com.qualcomm.robotcore.hardware.DcMotorController;
import com.qualcomm.robotcore.hardware.IrSeekerSensor;
import com.qualcomm.robotcore.hardware.Servo;
import com.qualcomm.robotcore.hardware.DcMotor;
import com.qualcomm.robotcore.hardware.ServoController;
/**
* Created by Dell User on 10/25/2015.
*/
public class RobotHardware2016 extends OpMode{

//define Motors and MotorControllers
private DcMotorController rightMotorController;
private DcMotor rightFrontMotor;
private DcMotorController leftMotorController;
private DcMotor leftFrontMotor;
private DcMotor rightBackMotor;
private DcMotor leftBackMotor;
private DcMotorController attachmentMotorController;
private DcMotor liftMotor;

@Override public void init() {


//Map hardware for Right motor controller
rightMotorController = hardwareMap.dcMotorController.get("right_drive_controller");
rightFrontMotor = hardwareMap.dcMotor.get("right_front_motor");
rightBackMotor = hardwareMap.dcMotor.get("right_back_motor");

//Map hardware for Left motor controller
leftMotorController = hardwareMap.dcMotorController.get("left_drive_controller");
leftFrontMotor = hardwareMap.dcMotor.get("left_front_motor");
leftBackMotor = hardwareMap.dcMotor.get("left_back_motor");

//Map hardware for attachment motor controller
attachmentMotorController = hardwareMap.dcMotorController.get("attachment_controller");
liftMotor = hardwareMap.dcMotor.get("lift_motor");

}

@Override public void loop() {

}
}
Loading

0 comments on commit 6fd0666

Please sign in to comment.