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

Tank #4

Open
wants to merge 126 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
b97e7df
deleted the second auton library which was exactly the same as the fi…
abohl22 Jan 14, 2022
c49b533
rotini should use encoders now..
abohl22 Jan 14, 2022
692866d
added autons
kenna26 Jan 14, 2022
4fcc23a
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
kenna26 Jan 14, 2022
ab7351d
a
abohl22 Jan 21, 2022
5ea8ef0
comments + controller diagram
yhuang2024 Jan 21, 2022
a697494
delete
kenna26 Jan 21, 2022
d228eaa
fixesd
yhuang2024 Jan 22, 2022
de13f28
karla code
kenna26 Jan 22, 2022
a0046c5
changed formula for target of light cube to not multiply by 0
s-lichterfeld Jan 22, 2022
bb5d64c
tank teleop
yhuang2024 Jan 22, 2022
7592da0
fixed errors
kenna26 Jan 22, 2022
ea232b0
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
kenna26 Jan 22, 2022
c3f179f
some classes disabled
s-lichterfeld Jan 22, 2022
6b0a000
stashed changes merged?
s-lichterfeld Jan 22, 2022
9fa4259
finally fixed github issues
yhuang2024 Jan 22, 2022
2e3879f
resolving conflicts
yhuang2024 Jan 22, 2022
3dee270
resolving conflicts 2.0
yhuang2024 Jan 22, 2022
7fd3658
pulling opencv from main
karlasahin Jan 22, 2022
52df9b7
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
karlasahin Jan 22, 2022
a17f832
comments and controller diagram
yhuang2024 Jan 22, 2022
1c724a5
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
yhuang2024 Jan 22, 2022
87d7749
capping
yhuang2024 Jan 22, 2022
410794e
integrated opencv code into TankDrive and AutonBlueBottom but need to…
karlasahin Jan 22, 2022
f9aeb10
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
karlasahin Jan 22, 2022
c042fd3
Intake spinners code
kenna26 Jan 28, 2022
0357587
auton + teleop
yhuang2024 Jan 29, 2022
dc8b303
commenting out everything
yhuang2024 Jan 29, 2022
631bea8
worked on tank teleop
kenna26 Feb 5, 2022
58a9db9
Fixed the Tank Tele Op
kenna26 Feb 5, 2022
c87b0bb
made only on box servo in tank tele op
kenna26 Feb 5, 2022
296f117
fixed soemthing small
kenna26 Feb 5, 2022
21cd847
fixed lifty teleOp
kenna26 Feb 5, 2022
1c12252
I fixed Lifty TeleOp and added a lot of stuff
kenna26 Feb 5, 2022
f173cb8
fixed duck spinner on tank tele Op
kenna26 Feb 5, 2022
eff3d96
qualifier changes
abohl22 Feb 5, 2022
b9c6665
breaknt
abohl22 Feb 11, 2022
5211ed9
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
abohl22 Feb 11, 2022
5b67fb7
ahh
abohl22 Feb 11, 2022
bc80588
fdhsa
abohl22 Feb 12, 2022
53cfaa8
opencv
karlasahin Feb 12, 2022
e1dbed7
put arm code into auton w webcam
karlasahin Feb 12, 2022
f141562
Added Front Intake Spinner
kenna26 Feb 12, 2022
be0d351
a
abohl22 Feb 12, 2022
dcbf41a
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
abohl22 Feb 12, 2022
892f050
asfh
abohl22 Feb 12, 2022
0686dd8
added different duck spnning directions
kenna26 Feb 12, 2022
d3056c7
new code for box servo
kenna26 Feb 12, 2022
0c857b7
implemented new servo code
emilylutzker Feb 12, 2022
8e9ba65
box servos
kenna26 Feb 12, 2022
e6cf45c
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
kenna26 Feb 12, 2022
932cf47
dthfjygh
yhuang2024 Feb 12, 2022
25bcbda
liftie teleop off buttons added
s-lichterfeld Feb 12, 2022
5210900
fixing
kenna26 Feb 12, 2022
9eb7d0b
teleop changes
s-lichterfeld Feb 12, 2022
8a4b02c
updated stuff
kenna26 Feb 12, 2022
8254f7c
change auton + make new auton
yhuang2024 Feb 12, 2022
be588db
so much stuff autons and TeleOps
kenna26 Feb 12, 2022
bb86ee9
qualifier 1 teleop and auton for Liftie
s-lichterfeld Feb 13, 2022
7109b86
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
s-lichterfeld Feb 13, 2022
56d49f1
Made duck spinner more efficient with a new button
kenna26 Feb 15, 2022
222a782
stuff
kenna26 Feb 18, 2022
9376df1
idk
abohl22 Feb 18, 2022
7883815
a
abohl22 Feb 18, 2022
1a3e0c4
fixing auton
abohl22 Feb 19, 2022
6adffbf
a
abohl22 Feb 25, 2022
df26348
new unfinished auton code w/ opencv
karlasahin Feb 25, 2022
ac9dbd8
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
karlasahin Feb 25, 2022
6c024fd
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
yhuang2024 Feb 26, 2022
873d275
encodersgit add .
abohl22 Feb 26, 2022
1f72d72
Mt puserge branch 'Tank' of https://github.com/the-winsor-school/Wild…
abohl22 Feb 26, 2022
5645513
a
yhuang2024 Feb 26, 2022
837906a
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
abohl22 Feb 26, 2022
50dde14
rotini up down fixed maybe
abohl22 Feb 26, 2022
9963660
b
yhuang2024 Feb 26, 2022
8293b4e
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
yhuang2024 Feb 26, 2022
788e55a
TeleOp Stuff
kenna26 Feb 26, 2022
1686c7b
c
yhuang2024 Feb 26, 2022
4b58d40
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
yhuang2024 Feb 26, 2022
251a47a
blue top auton
abohl22 Feb 26, 2022
c8ef819
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
abohl22 Feb 26, 2022
71d56db
accidental issue with auton blue top
abohl22 Feb 26, 2022
212cde1
disabled a lot of files
abohl22 Feb 26, 2022
efdafbd
arm encoders changes
kenna26 Feb 26, 2022
80f8a86
auton blue bottom
abohl22 Feb 26, 2022
3765e8e
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
abohl22 Feb 26, 2022
0f65d35
fixed
kenna26 Feb 26, 2022
13bb38c
d
yhuang2024 Feb 26, 2022
043bc2b
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
yhuang2024 Feb 26, 2022
5548c9f
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
abohl22 Feb 26, 2022
0553b63
e
yhuang2024 Feb 26, 2022
bd113e9
deleted so many things
kenna26 Feb 26, 2022
676cc77
delete many files
kenna26 Feb 26, 2022
dfc2840
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
abohl22 Feb 26, 2022
cac3f4b
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
s-lichterfeld Feb 26, 2022
2288662
teleOp Stuff
kenna26 Feb 26, 2022
97eefd0
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
kenna26 Feb 26, 2022
1842e17
delete unessary things
kenna26 Feb 26, 2022
2b5b94c
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
abohl22 Feb 26, 2022
7a934b3
delete liftie things
kenna26 Feb 26, 2022
38597ed
fixing
kenna26 Feb 26, 2022
0209e3f
Update AutonBlueBottom.java
kenna26 Feb 26, 2022
ae6a109
ahh
abohl22 Feb 26, 2022
121c91d
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
abohl22 Feb 26, 2022
591f50b
the auton
kenna26 Feb 26, 2022
0cf3acd
speed up rotini in auton
kenna26 Feb 27, 2022
934c810
fixed gradle issues
karlasahin Feb 28, 2022
935f6a7
add brake stop to rotini code to aviod driving issues with the sleep
kenna26 Mar 1, 2022
c8d91a2
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
kenna26 Mar 1, 2022
ba9a90c
fixing stuff
kenna26 Mar 1, 2022
34a20ef
integrated opencv code into auton and fixed drive values
karlasahin Mar 1, 2022
5e31772
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
karlasahin Mar 1, 2022
fa71d67
duck encoder
abohl22 Mar 3, 2022
644db00
changes
kenna26 Mar 3, 2022
24f1153
f
yhuang2024 Mar 4, 2022
2ca28ad
g
yhuang2024 Mar 4, 2022
009c51e
teleop changes
abohl22 Mar 4, 2022
8751407
capping
yhuang2024 Mar 4, 2022
a27eb97
jdsaklfjas
karlasahin Mar 4, 2022
43e8429
Merge branch 'Tank' of https://github.com/the-winsor-school/Wildbots-…
karlasahin Mar 4, 2022
db16ab5
open cv
abohl22 Mar 5, 2022
ffd6dff
vyukvkuv
kenna26 Mar 5, 2022
3d26bec
l
yhuang2024 Mar 5, 2022
8d33100
abby things
kenna26 Mar 5, 2022
dfb06c7
mass states competition updates
karlasahin Mar 6, 2022
ff8d090
comments explaining tank drive
kenna26 Sep 24, 2022
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
6 changes: 5 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions FtcRobotController/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ android {
//noinspection ExpiredTargetSdkVersion
targetSdkVersion 28
buildConfigField "String", "APP_BUILD_TIME", '"' + (new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.ROOT).format(new Date())) + '"'

}

compileSdkVersion 29


compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
Expand Down
2 changes: 1 addition & 1 deletion TeamCode/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ apply from: '../build.dependencies.gradle'
dependencies {
implementation project(':FtcRobotController')
annotationProcessor files('lib/OpModeAnnotationProcessor.jar')
implementation 'org.openftc:easyopencv:1.5.0'
implementation 'org.openftc:easyopencv:1.5.0' //openCV
}
Original file line number Diff line number Diff line change
Expand Up @@ -162,27 +162,41 @@ public boolean getImageTarget(){
}

public boolean getAllianceTarget(){
boolean targetVisible = false;
return false;
}
/*
public void resetRotini(){
if (drivingLibrary.getRotiniHeight()>0){
drivingLibrary.rotini.setTargetPosition(0);

targetVisible = false;
VuforiaTrackable x = null;
for (VuforiaTrackable trackable : allTrackables) {
if (((VuforiaTrackableDefaultListener)trackable.getListener()).isVisible()) {
opMode.telemetry.addData("Visible Target", trackable.getName());
opMode.telemetry.update();
targetVisible = true;
}
}
*/
/*
public int liftToHeight(){

double currentForce = tank.forceSensitiveResistor.getVoltage();
int weight=0;
//light
if (currentForce > 0.113 && currentForce < 0.169) {
weight=1;
}
//medium
else if (currentForce > 0.189 && currentForce < 0.224) {
weight=2;
}
//heavy
else if (currentForce > 0.235 && currentForce < 0.278){
weight=3;
}
//other??
else {

if(trackable.getName().equals("Blue Alliance Target")) {
OpenGLMatrix robotLocationTransform = ((VuforiaTrackableDefaultListener) trackable.getListener()).getUpdatedRobotLocation();
if (robotLocationTransform != null) {
lastLocation = robotLocationTransform;
}
return true;
}
}
}
return false;

return 0;
}
*/

public float[] lineUpWithGoal () {
float min = 3;
Expand Down

This file was deleted.

Loading