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

Tank #4

Open
wants to merge 126 commits into
base: main
Choose a base branch
from
Open

Tank #4

wants to merge 126 commits into from

Conversation

kenna26
Copy link
Contributor

@kenna26 kenna26 commented Feb 19, 2022

Before issuing a pull request, please see the contributing page.

abohl22 and others added 30 commits January 14, 2022 16:44
@abohl22
deleted the second auton library which was exactly the same as the fi…
b97e7df 
…rst lol
@abohl22
rotini should use encoders now..
c49b533
@kenna26
added autons
692866d
@kenna26
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
4fcc23a 
…2021-2022 into Tank
@abohl22
a
ab7351d
@yhuang2024
comments + controller diagram
5ea8ef0 
added comments to kenna's commentless code. making a labelled diagram for said code. comments are suspicious at best (ahem kenna)
@kenna26
delete
a697494 
deleted bad code
wrote better code
@yhuang2024
fixesd
d228eaa 
its it no
@kenna26
karla code
de13f28 
she lost her code and stole my computer to find it
@s-lichterfeld
changed formula for target of light cube to not multiply by 0
a0046c5
@yhuang2024
tank teleop
bb5d64c 
fixed intake code, added a right servo for intake, coded outtake, added comments
@kenna26
fixed errors
7592da0 
fixed stuff
@kenna26
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
ea232b0 
…2021-2022 into Tank
@s-lichterfeld
some classes disabled
c3f179f
@s-lichterfeld
stashed changes merged?
6b0a000
@yhuang2024
finally fixed github issues
9fa4259 
retrieved old code and made appropriate changes
@yhuang2024
resolving conflicts
2e3879f
@yhuang2024
resolving conflicts 2.0
3dee270 
adding right servo and deleting old stuff
@karlasahin
pulling opencv from main
7fd3658
@karlasahin
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
52df9b7 
…2021-2022 into Tank
@yhuang2024
comments and controller diagram
a17f832
@yhuang2024
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
1c724a5 
…2021-2022 into Tank
@yhuang2024
capping
87d7749 
tankalicious uses GAMEPAD 2
liftie uses GAMEPAD 1
wrote cap code, yet to be tested
@karlasahin
integrated opencv code into TankDrive and AutonBlueBottom but need to…
410794e 
… test
@karlasahin
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
f9aeb10 
…2021-2022 into Tank
@kenna26
Intake spinners code
c042fd3
@yhuang2024
auton + teleop
0357587 
wrote liftie auton and fixed liftie teleop
@yhuang2024
commenting out everything
dc8b303 
taking out errors for auton FOR NOW
@kenna26
worked on tank teleop
631bea8
@kenna26
Fixed the Tank Tele Op
58a9db9
kenna26 and others added 30 commits February 26, 2022 13:29
@kenna26
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
97eefd0 
…2021-2022 into Tank
@kenna26
delete unessary things
1842e17
@abohl22
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
2b5b94c 
…2021-2022 into Tank
@kenna26
delete liftie things
7a934b3
@kenna26
fixing
38597ed
@kenna26
Update AutonBlueBottom.java
0209e3f
@abohl22
ahh
ae6a109
@abohl22
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
121c91d 
…2021-2022 into Tank
@kenna26
the auton
591f50b
@kenna26
speed up rotini in auton
0cf3acd
@karlasahin
fixed gradle issues
934c810
@kenna26
add brake stop to rotini code to aviod driving issues with the sleep
935f6a7
@kenna26
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
c8d91a2 
…2021-2022 into Tank
@kenna26
fixing stuff
ba9a90c
@karlasahin
integrated opencv code into auton and fixed drive values
34a20ef
@karlasahin
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
5e31772 
…2021-2022 into Tank
@abohl22
duck encoder
fa71d67
@kenna26
changes
644db00
@yhuang2024
f
24f1153 
gamepad b issue fixed (hopefully)
capping servo exists now (getting tested)
@yhuang2024
g
2ca28ad
@abohl22
teleop changes
009c51e
@yhuang2024
capping
8751407 
IT WORKS
@karlasahin
jdsaklfjas
a27eb97
@karlasahin
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
43e8429 
…2021-2022 into Tank
@abohl22
open cv
db16ab5
@kenna26
vyukvkuv
ffd6dff
@yhuang2024
l
3d26bec 
dfygjhkuj
@kenna26
abby things
8d33100
@karlasahin
mass states competition updates
dfb06c7
@kenna26
comments explaining tank drive
ff8d090
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.
6 participants
@kenna26 @abohl22 @yhuang2024 @s-lichterfeld @karlasahin @emilylutzker