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

Jump to bottom

Develop #3

Open
wants to merge 143 commits into
base: master
Choose a base branch
from
Open

Develop #3

wants to merge 143 commits into from

Conversation

LeoLBWK
Copy link

@LeoLBWK LeoLBWK commented Dec 8, 2024

Delete all quotes before making PR.

Introduction

A brief introduction for your PR.

Background

Why did you make these changes?

Status

Select one of the options for each entry.

  • Merge status: Ready to merge. / Help wanted. / Work in progress.
  • Real robot test: Real robot tests have been performed. / No real robot tests have been performed. Test results in the future should be added to this PR to determine whether to reopen it.

You should also add PR labels accordingly.

LeChocolatChaud and others added 30 commits September 9, 2024 23:18
@LeChocolatChaud
Merge branch 'FIRST-Tech-Challenge:master' into master
ff203e5
Merge branch 'FIRST-Tech-Challenge:master' into master
b38b73f
Merge branch 'FIRST-Tech-Challenge:master' into master
843b168
@LeoLBWK
Merge branch 'FIRST-Tech-Challenge:master' into master
0e39465
@LeoLBWK
Merge branch 'FIRST-Tech-Challenge:master' into master
a3571a4
@LeoLBWK
Merge branch 'FIRST-Tech-Challenge:master' into master
b245e54
@LeoLBWK
Merge branch 'FIRST-Tech-Challenge:master' into master
97110fc
@LeoLBWK
Merge branch 'FIRST-Tech-Challenge:master' into master
3e70e46
@LeoLBWK
Merge branch 'FIRST-Tech-Challenge:master' into master
018781a
@LeoLBWK
Merge branch 'FIRST-Tech-Challenge:master' into master
3de097a
@LeChocolatChaud
Fix this damn S-word looking commit history by doing a reasonable change
d569d6b
@LeoLBWK
Add new ManualOpMode structure
234fd46
@LeoLBWK
Add new ManualOpMode structure
d4df22b
@LeChocolatChaud
Some concepts about Task based multitask
39bb7e5
@LeChocolatChaud
add register method
914b2b6
@LeChocolatChaud
feat: a more detailed concept demo on Task
550f481
@LeChocolatChaud
feat: adding scheduler design and some frequently used task
f8a4a0a
@LeChocolatChaud
fix: finalizing the task design and delete unused demo classes
4a4183c
@LeChocolatChaud
fix: rollback non deployment changes
55c9e8e
@Eternity0xd3
Merge pull request #1 from FFFabulousRobotics/task-concept
7fb639d 
Brand new Task design
@LeChocolatChaud
Merge branch 'FFFabulousRobotics:master' into master
8747d2a
@LeChocolatChaud
Merge branch 'FFFabulousRobotics:master' into master
cb6709e
@LeChocolatChaud
Create android.yml
1ef66dc
@LeoLBWK
Add new ManualOpMode structure
70758d1
@Eternity0xd3
Fix:try to change the logic of TaskOp to make it less complex
a3b3d9b 
maybe I was creating more bugs and made it more complex...
@LeChocolatChaud
fix: simplify the design by add more prebuilt tasks and clean up unus…
e3bcaa0 
…ed classes
@LeChocolatChaud
Merge branch 'master' into task-concept
c17ab60
@Eternity0xd3
Docs: add docs
a021735
@LeChocolatChaud
Merge pull request #2 from FFFabulousRobotics/task-concept
19d33f9 
Task system update
@Eternity0xd3
Fix: call task.init() in a right timing
40b86b6
LeoLBWK and others added 30 commits December 4, 2024 20:08
@LeoLBWK
Feat:Fixed RR problems.The next step is to make the stability
4e67253
@Ehicy
Update RobotCameraDistance.java
994b6c1 
fuck the android studio and the google
@LeoLBWK
Feat:Refactored the roadrunner.
6c61ad9
@Eternity0xd3
Manual temporarily completed, which is seemly a piece of sh!t
d21d4ea
@Eternity0xd3
Merge remote-tracking branch 'origin/develop' into develop
d7f4a9e
@Ehicy
Update RobotVisionAngle.java
1146afe 
add the minus
@LeoLBWK
Feat:FIXED.
49e54b7
@LeoLBWK
Merge remote-tracking branch 'origin/develop' into develop
046df6c
@LeoLBWK
Feat:FIXED RRTest.
999e279
@Eternity0xd3
Manual completed
b9ee321
@Eternity0xd3
Manual completed
3a331c1
@LeoLBWK
Feat:FIXED RRTest.
7b09c61
@Ehicy
Update ManualOpMode.java
1c48953 
correct the calculations
@Ehicy
fuck the sdk
2cbc477
@LeoLBWK
Feat:FIXED RRTest.
0285bb1
@Ehicy
Merge remote-tracking branch 'origin/develop' into develop
67fe2c6
@Eternity0xd3
the day before the first qualification race
6ecdd73
@Eternity0xd3
the day before the first qualification race
73b9606
@Ehicy
Merge remote-tracking branch 'origin/develop' into develop
3e670d1
@LeoLBWK
Feat:Unified
72b1cd0
@Ehicy
fix the strange screen presentation
1c32dbf
@Ehicy
Merge remote-tracking branch 'origin/develop' into develop
b1ca9e0
@Eternity0xd3
try to solve the mis-record of a missing '}' in Github
6ff6095
@Eternity0xd3
Merge remote-tracking branch 'origin/develop' into develop
736e7d3 
# Conflicts:
#	TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ManualOpMode.java
@Eternity0xd3
f~~k the robot
270cfd0
@Eternity0xd3
A good ManualOpMode
e0b369a
@Eternity0xd3
???
3f5acc5
@Eternity0xd3
code of HangZhou FTC
5d0cd2a
@LeoLBWK
Feat:Deleted unused roadrunner,fixed gradle building.
7b694b3
@LeoLBWK
Feat:Completed the fix
7416265
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@LeoLBWK @Ehicy @LeChocolatChaud @Eternity0xd3