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.

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 Develop #8

Merged
merged 110 commits into from
Dec 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
ff203e5
Merge branch 'FIRST-Tech-Challenge:master' into master
LeChocolatChaud Sep 9, 2024
b38b73f
Merge branch 'FIRST-Tech-Challenge:master' into master
Sep 9, 2024
843b168
Merge branch 'FIRST-Tech-Challenge:master' into master
Sep 9, 2024
0e39465
Merge branch 'FIRST-Tech-Challenge:master' into master
LeoLBWK Sep 9, 2024
a3571a4
Merge branch 'FIRST-Tech-Challenge:master' into master
LeoLBWK Sep 9, 2024
b245e54
Merge branch 'FIRST-Tech-Challenge:master' into master
LeoLBWK Sep 9, 2024
97110fc
Merge branch 'FIRST-Tech-Challenge:master' into master
LeoLBWK Sep 9, 2024
3e70e46
Merge branch 'FIRST-Tech-Challenge:master' into master
LeoLBWK Sep 9, 2024
018781a
Merge branch 'FIRST-Tech-Challenge:master' into master
LeoLBWK Sep 9, 2024
3de097a
Merge branch 'FIRST-Tech-Challenge:master' into master
LeoLBWK Sep 10, 2024
234fd46
Add new ManualOpMode structure
LeoLBWK Sep 15, 2024
d4df22b
Add new ManualOpMode structure
LeoLBWK Sep 15, 2024
70758d1
Add new ManualOpMode structure
LeoLBWK Sep 16, 2024
e8a1516
Rename ManualOpMode.java
LeoLBWK Sep 17, 2024
0f997ee
Feat: unfinished ManualOpMode
Eternity0xd3 Nov 22, 2024
28b48cf
unfinished
Eternity0xd3 Nov 22, 2024
fab5a35
Feat:Some fix,small progress.
LeoLBWK Nov 22, 2024
382c9b9
unfinished
Eternity0xd3 Nov 22, 2024
2535541
unfinished
Eternity0xd3 Nov 22, 2024
0798c82
这是第一版视觉识别,可以识别摄像头中心的颜色。
Ehicy Nov 24, 2024
e937287
这是第一版视觉识别,可以识别摄像头中心的颜色。
Ehicy Nov 24, 2024
590a57e
这是第一版视觉识别,可以识别摄像头中心的颜色。
Ehicy Nov 24, 2024
84bed6c
这是第二版视觉识别,可以识别摄像头中心的颜色
Ehicy Nov 25, 2024
74ab281
1111
Ehicy Nov 25, 2024
2ff6a2c
wtf
Ehicy Nov 25, 2024
1d0d8e7
Feat:Add some exegeses
LeoLBWK Nov 26, 2024
192cd21
Feat:Add some armServos in RobotTop.java
LeoLBWK Nov 26, 2024
d5cdeb8
Feat:Add roadrunner
LeoLBWK Nov 27, 2024
91cef18
Feat:Fix some low errors
LeoLBWK Nov 27, 2024
54241be
Feat:Add ServoTest
LeoLBWK Nov 28, 2024
451788f
third commit to improve the vision
Ehicy Nov 28, 2024
78514df
third commit to improve the vision
Ehicy Nov 28, 2024
faadba1
Feat:Fixed some errors
LeoLBWK Nov 28, 2024
63e3f76
Merge remote-tracking branch 'origin/develop' into develop
Ehicy Nov 28, 2024
462f867
forth commit to improve the vision
Ehicy Nov 28, 2024
fb1c5b6
forth commit to improve the vision
Ehicy Nov 28, 2024
d133d08
fuck the commit to improve the vision
Ehicy Nov 28, 2024
cc4b3e9
temp commit
Eternity0xd3 Nov 29, 2024
72e0bc0
Feat:Rename the VisionCameraTest
LeoLBWK Nov 29, 2024
7f0312e
temp commit2
Eternity0xd3 Nov 29, 2024
fb27156
Feat:Add Tests package
LeoLBWK Nov 29, 2024
97550a0
Feat:Enhanced dtx's Vision
LeoLBWK Nov 29, 2024
ebe25d7
Feat: robot arm finished
Eternity0xd3 Nov 29, 2024
feb9d9c
Feat: robot arm finished
Eternity0xd3 Nov 29, 2024
be85839
Feat: slow down the servos
Eternity0xd3 Nov 29, 2024
f4fc949
Feat: slow down the servos
Eternity0xd3 Nov 29, 2024
ed24a6d
Feat:Fixed a lot errors
LeoLBWK Nov 29, 2024
b08b3f1
Merge remote-tracking branch 'origin/develop' into develop
Eternity0xd3 Nov 29, 2024
ab63216
Feat:Fixed a lot errors
LeoLBWK Nov 29, 2024
4bb7db5
Merge branch 'refs/heads/Leo-experiments' into develop
LeoLBWK Nov 29, 2024
2318682
Sort the files, add RoadRunner
Eternity0xd3 Nov 29, 2024
d686913
Sort the files, add RoadRunner
Eternity0xd3 Nov 29, 2024
8171ace
Feat:Fixed errors
LeoLBWK Nov 29, 2024
77bbdb7
Merge remote-tracking branch 'origin/develop' into develop
LeoLBWK Nov 29, 2024
4a6c15f
Feat:Added MeepMeepTest
LeoLBWK Nov 29, 2024
4606a63
Style: use constants & formatting
Eternity0xd3 Nov 29, 2024
866a99f
Feat:Added RRTest
LeoLBWK Dec 1, 2024
d80278d
Merge remote-tracking branch 'origin/develop' into develop
LeoLBWK Dec 1, 2024
92baaa9
Feat:Change Op
LeoLBWK Dec 2, 2024
15c0dc1
add the 负数 in rotate
Ehicy Dec 2, 2024
ec67232
Feat:Change Op
LeoLBWK Dec 2, 2024
a5c10b0
add the minus in rotate
Ehicy Dec 2, 2024
6927c2f
Merge remote-tracking branch 'origin/develop' into develop
Ehicy Dec 2, 2024
8d00b89
Feat:Replace Space
LeoLBWK Dec 2, 2024
e7dbd99
Feat:Fit the robot
LeoLBWK Dec 2, 2024
51ed8e0
Feat:Fit the robot
LeoLBWK Dec 2, 2024
8bb0bdc
add the distance detection
Ehicy Dec 2, 2024
66ff218
Merge remote-tracking branch 'origin/develop' into develop
Ehicy Dec 2, 2024
06047e3
add the distance detection
Ehicy Dec 2, 2024
9f81293
add the new function
Ehicy Dec 3, 2024
2359d29
Feat: manual op seemly completed
Eternity0xd3 Dec 3, 2024
2dbc378
Feat:Add Sparkfun device
LeoLBWK Dec 3, 2024
7fab928
add the new function
Ehicy Dec 3, 2024
d22e320
Merge remote-tracking branch 'origin/develop' into develop
Ehicy Dec 4, 2024
4ab9ba4
Feat:Fixed Sync problems.
LeoLBWK Dec 4, 2024
f30cf00
add the new function
Ehicy Dec 4, 2024
c6c0831
add the new function
Ehicy Dec 4, 2024
88f039e
add the new function
Ehicy Dec 4, 2024
8e17663
Merge remote-tracking branch 'origin/develop' into develop
Ehicy Dec 4, 2024
2334c40
add the new function
Ehicy Dec 4, 2024
f17672a
Feat:Fixed RR problems.The next step is to make the stability
LeoLBWK Dec 4, 2024
924ea89
Feat:Fixed RR problems.The next step is to make the stability
LeoLBWK Dec 4, 2024
4e67253
Feat:Fixed RR problems.The next step is to make the stability
LeoLBWK Dec 4, 2024
994b6c1
Update RobotCameraDistance.java
Ehicy Dec 4, 2024
6c61ad9
Feat:Refactored the roadrunner.
LeoLBWK Dec 4, 2024
d21d4ea
Manual temporarily completed, which is seemly a piece of sh!t
Eternity0xd3 Dec 5, 2024
d7f4a9e
Merge remote-tracking branch 'origin/develop' into develop
Eternity0xd3 Dec 5, 2024
1146afe
Update RobotVisionAngle.java
Ehicy Dec 5, 2024
49e54b7
Feat:FIXED.
LeoLBWK Dec 5, 2024
046df6c
Merge remote-tracking branch 'origin/develop' into develop
LeoLBWK Dec 5, 2024
999e279
Feat:FIXED RRTest.
LeoLBWK Dec 5, 2024
b9ee321
Manual completed
Eternity0xd3 Dec 5, 2024
3a331c1
Manual completed
Eternity0xd3 Dec 5, 2024
7b09c61
Feat:FIXED RRTest.
LeoLBWK Dec 5, 2024
1c48953
Update ManualOpMode.java
Ehicy Dec 5, 2024
2cbc477
fuck the sdk
Ehicy Dec 4, 2024
0285bb1
Feat:FIXED RRTest.
LeoLBWK Dec 5, 2024
67fe2c6
Merge remote-tracking branch 'origin/develop' into develop
Ehicy Dec 6, 2024
6ecdd73
the day before the first qualification race
Eternity0xd3 Dec 6, 2024
73b9606
the day before the first qualification race
Eternity0xd3 Dec 6, 2024
3e670d1
Merge remote-tracking branch 'origin/develop' into develop
Ehicy Dec 6, 2024
72b1cd0
Feat:Unified
LeoLBWK Dec 6, 2024
1c32dbf
fix the strange screen presentation
Ehicy Dec 6, 2024
b1ca9e0
Merge remote-tracking branch 'origin/develop' into develop
Ehicy Dec 6, 2024
6ff6095
try to solve the mis-record of a missing '}' in Github
Eternity0xd3 Dec 6, 2024
736e7d3
Merge remote-tracking branch 'origin/develop' into develop
Eternity0xd3 Dec 6, 2024
270cfd0
f~~k the robot
Eternity0xd3 Dec 7, 2024
e0b369a
A good ManualOpMode
Eternity0xd3 Dec 7, 2024
3f5acc5
???
Eternity0xd3 Dec 7, 2024
5d0cd2a
code of HangZhou FTC
Eternity0xd3 Dec 8, 2024
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
Prev Previous commit
Next Next commit
unfinished
Eternity0xd3 committed Nov 22, 2024
commit 382c9b929d030963ce6730ae12b8ab9c6a36fe48
Original file line number Diff line number Diff line change
@@ -25,18 +25,25 @@ public void runOpMode() {
if(liftState == LiftState.BOTTOM){
if(gamepad1.y && liftPosition <= 1100){
robotTop.setLeftPower(0.7);
} else if (liftPosition >= 1100) {
}else if (liftPosition >= 1250) {
robotTop.setLeftPower(0);
liftState = LiftState.TOP;
} else if (liftPosition >= 1100) {
robotTop.setLeftPower(0.3);
}
} else if (liftState == LiftState.TOP) {
if(gamepad1.y && liftPosition >= 100){
robotTop.setLeftPower(-0.5);
} else if (liftPosition <= 100) {
if(gamepad1.y && liftPosition >= 200){
robotTop.setLeftPower(-0.6);
} else if (liftPosition <= 50) {
robotTop.setLeftPower(0);
liftState = LiftState.BOTTOM;
}else if (liftPosition <= 200) {
robotTop.setLeftPower(-0.2);
}
}
telemetry.addData("pos", liftPosition);
telemetry.addData("state", liftState);
telemetry.update();
sleep(10);
}
}
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ public RobotTop(LinearOpMode opMode) {
public void init() {
leftLiftMotor = hardwareMap.get(DcMotor.class, "leftLift");
rightLiftMotor = hardwareMap.get(DcMotor.class, "rightLift");
armStretchServo = hardwareMap.get(Servo.class, "armStretch");
//armStretchServo = hardwareMap.get(Servo.class, "armStretch");

leftLiftMotor.setDirection(DcMotor.Direction.FORWARD);
rightLiftMotor.setDirection(DcMotor.Direction.REVERSE);