Skip to content

Commit b838a37

Browse files
committed
Commiting
1 parent 50462bf commit b838a37

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

.idea/compiler.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/mechanisms/CappingArm.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,31 @@ public CappingArm(HardwareMap hardwareMap, Telemetry telemetry) {
1717
}
1818

1919
public void turnOutwards() {
20+
armServo.setPosition(armServo.getPosition()+.1);
2021

2122
}
2223
public void turnInwards() {
24+
//precise/increments
25+
armServo.setPosition(armServo.getPosition()+.1);
2326

2427
}
2528

2629
public void spinOut() {
30+
//woo woo like very agrressive
31+
armServo.setPosition(1);
2732

2833
}
2934

3035
public void spinIn() {
31-
36+
armServo.setPosition(0);
3237
}
3338

3439
public void defaultPosition() {
40+
armServo.setPosition(0.5);
3541

3642
}
3743

3844
public double getServoPos() {
3945
return armServo.getPosition();
4046
}
41-
4247
}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/mechanisms/Carousel.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ public void spin() { // spin at speed designated by "power"
1818
}
1919

2020
public void spinPower(double power){
21-
21+
carouselMotor.setPower(power);
2222
}
2323

2424
public void spinAngle(int angle) { // in radians
25-
25+
//i actually hate radians and will not be doing this function
2626
}
2727

2828
public void reverseSpin() {

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/mechanisms/LinearSlide.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public void levelCap() { // extend linear slide to level appropriate for capping
8585
}
8686

8787

88-
8988
public void holdSlidePosition() {
9089
slideMotor.setTargetPosition(slideMotor.getCurrentPosition());
9190
slideMotor.setMode(DcMotor.RunMode.RUN_TO_POSITION);
@@ -97,7 +96,7 @@ public void holdSlidePosition() {
9796
* Bring the slide to the lowest possible position, set the encoders to 0, and hold at that position.
9897
* WARNING: THIS METHOD BRINGS THE SLIDE ALL THE WAY DOWN. This SHOULD be limited by the bar
9998
* below the bucket, but if this isn't there, this will DESTROY THE SLIDE.
100-
*
99+
* <p>
101100
* Also, this method likely takes a few seconds to run.
102101
*/
103102
public void calibrateSlide() {

0 commit comments

Comments
 (0)