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

Palmetto #28

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

Palmetto #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
24bac0d
Initizalized branch and added intake subsystem.
JYoung413 Jan 11, 2018
577d37e
Added position methods and direct driving to elevator subsystem.
JYoung413 Jan 11, 2018
6aa178f
Updated Elevator
JYoung413 Jan 12, 2018
6dbd146
1/11 elevator testing changes
JYoung413 Jan 12, 2018
ce4402c
Added commands
JYoung413 Jan 13, 2018
164c234
Refactored to fit designer's naming
unbun Jan 13, 2018
e103195
Added cube lift stuff
JYoung413 Jan 14, 2018
53c9545
Added encoder logging
JYoung413 Jan 14, 2018
6590ca3
Tested elevator stuff... DID NOT WORK!
JYoung413 Jan 14, 2018
71d7dae
merged master into this branch
Brinbri Jan 17, 2018
80a0c58
Added motion magic support for elevator
JYoung413 Jan 17, 2018
e0fba42
Added cmd sequence
Brinbri Jan 17, 2018
7c547b8
added new comands to swap between clamp and grabber positions with on…
Brinbri Jan 18, 2018
0d33098
Changed grabber to double solenoid and added cmds and buttons, Tested…
Brinbri Jan 18, 2018
1bc7f6d
did testing branch:
JYoung413 Jan 20, 2018
36c3be0
fixed commands
JYoung413 Jan 20, 2018
5324662
fixed some id stuff
JYoung413 Jan 20, 2018
1ccc225
dt stuff
JYoung413 Jan 21, 2018
0c554f5
Ughh
JYoung413 Jan 21, 2018
9e1b4d6
Fixed profiling!
JYoung413 Jan 21, 2018
83aba2d
added hold headings and tested motion profiles
JYoung413 Jan 21, 2018
941e090
tested profiles and started tuning
JYoung413 Jan 23, 2018
8cc5060
just making sure its all uploaded
JYoung413 Jan 23, 2018
941611b
edited all pneumatic subsystems to hold constants across the class in…
JYoung413 Jan 23, 2018
5355350
merged week1-drivetrain
JYoung413 Jan 23, 2018
75e02f3
made joystick map
JYoung413 Jan 23, 2018
dbea40d
refactored some commands names, fixed joystick map to public stuff, a…
JYoung413 Jan 23, 2018
81a8669
Commented out double solenoid in favor of single, got rid of changeGr…
Brinbri Jan 25, 2018
eb2b510
a little bit of testing
JYoung413 Jan 25, 2018
9c0e846
merged elevator branches
Brinbri Jan 25, 2018
bef53d3
merged master into this branch
Brinbri Jan 25, 2018
424f74e
tuning
JYoung413 Jan 25, 2018
abc8a12
merged with master
JYoung413 Jan 25, 2018
88961d2
Merge branch 'master' into week1-elevator-motionmagic
Brinbri Jan 25, 2018
fdbb8f0
Added cmd group for returning elevator to a pos after dropping a cube.
Brinbri Jan 26, 2018
6bd2564
tuned stuff
JYoung413 Jan 27, 2018
9202212
tuning
JYoung413 Jan 27, 2018
865177d
fixed command group for intake in and clamp.
Brinbri Jan 27, 2018
56e5dc3
merged branches to prep for week 4 testing & sorted out misc. errors.
Brinbri Jan 27, 2018
e8af606
Kelly fucked up
JYoung413 Jan 28, 2018
1976933
tuned'
JYoung413 Jan 28, 2018
a3e1998
Prepped code for tonights testing 1/?, Added necessary cmds andorgani…
Brinbri Jan 28, 2018
6b71ae1
Prep for Testing 2/?, added missing cmds
Brinbri Jan 28, 2018
2993fae
Prep for Testing 3/? added needed/missing buttons and checked style.
Brinbri Jan 28, 2018
b5d212a
Test Prep 4/? small refactors, cmd changes, and subsystem orginization.
Brinbri Jan 28, 2018
e77013e
Test Prep 5/?, added elevator calibration an other small changes.
Brinbri Jan 28, 2018
559ecc9
set 2 right motors to set inverted
Brinbri Jan 28, 2018
0022d68
Non-working
JYoung413 Jan 29, 2018
2a9b802
tried fixing the stringing together of paths
JYoung413 Jan 30, 2018
3a5a1d9
added stringing together pass functionality
JYoung413 Jan 31, 2018
766ecaa
removed stuff
JYoung413 Jan 31, 2018
729d60e
removed some files
JYoung413 Feb 1, 2018
b9b0728
More removal.
JYoung413 Feb 1, 2018
644a6c1
Remove crap.
JYoung413 Feb 1, 2018
be27238
removed
JYoung413 Feb 1, 2018
ca5bcca
Small changes to better fit future testing and stuff that is being te…
Brinbri Feb 1, 2018
41b92cf
Josh - 'You totally don't have to do this but im going to ask you to …
Brinbri Feb 1, 2018
9013686
Travis hates me
Brinbri Feb 1, 2018
4afbea9
fixed pr stuff
JYoung413 Feb 1, 2018
b18c078
Added missing methods in the robot class.
Brinbri Feb 1, 2018
97a6e5c
wrote down what the distance per tick is
JYoung413 Feb 1, 2018
9d313f5
fixed commands
JYoung413 Feb 2, 2018
9924da0
kylo darevee
Brinbri Feb 2, 2018
65ea557
added stuff for the implementation of live time tuning
JYoung413 Feb 2, 2018
8227539
Merge branch 'Week4-testing' of https://github.com/FRC125/NU18 into W…
JYoung413 Feb 2, 2018
a01e9a8
ready for testing
JYoung413 Feb 2, 2018
e6fd3de
mapped properly for testing
JYoung413 Feb 2, 2018
4680403
organized robot map
JYoung413 Feb 2, 2018
0cc3f93
cleaned some stuff up and commented code
JYoung413 Feb 2, 2018
054d05a
merged drivetrain with main testing branch for testing
JYoung413 Feb 2, 2018
8cc4e34
implemented live time tuning, and made variables for ele pow
JYoung413 Feb 2, 2018
f7c9cc4
Made sure dt followers were victors
Brinbri Feb 2, 2018
95608ed
Tested cubelift enc and hall effect sensor, w/Kyle's hax
Brinbri Feb 3, 2018
2017c35
Added enum for the cubelift states.
Brinbri Feb 3, 2018
5b9f1e6
fixed the elevator stuff
JYoung413 Feb 3, 2018
603487f
tested elevator
JYoung413 Feb 3, 2018
f6eeda9
tried tuning the elevator
JYoung413 Feb 3, 2018
115cb5b
elevator is cool
JYoung413 Feb 4, 2018
d7545bd
tuned
JYoung413 Feb 4, 2018
352778d
Fixed OI mappings
Brinbri Feb 4, 2018
fb9f374
Fixed more Oi stuff.
Brinbri Feb 4, 2018
94d1226
added smart intake debouncer
JYoung413 Feb 4, 2018
c6f599b
Added triggers for intake
Brinbri Feb 4, 2018
a9d75b8
Merged intake logic from sequencing branch
Brinbri Feb 4, 2018
15de445
Fixed the.gitignore meme
Brinbri Feb 4, 2018
77cc285
fixed some commands that should not be doing things in execute.
JYoung413 Feb 5, 2018
7b7a256
Tested elevator
Brinbri Feb 5, 2018
f65645e
Merge branch 'week4-testing-w-dt' of https://github.com/FRC125/NU18 i…
Brinbri Feb 5, 2018
b10d701
worked on elevator testing
JYoung413 Feb 6, 2018
5530dae
refactored clamps to grabbers, added more toggle methods for cube lif…
JYoung413 Feb 6, 2018
10ff494
made some new commands
JYoung413 Feb 6, 2018
d0c5393
added toggles for the double solenoid
JYoung413 Feb 7, 2018
caea97c
tested and confirmed working new absolute value encoder stuffs
JYoung413 Feb 8, 2018
7bed92e
Fixed some refactoring issues, added CurrentReader class for current …
Brinbri Feb 8, 2018
425da18
Added working Current sensing for intake, works with intake currently.
Brinbri Feb 9, 2018
7e38e50
Tested Auto paths and current sensing.
Brinbri Feb 9, 2018
495b112
added stuff
JYoung413 Feb 10, 2018
5f3ff5f
Finnesed the new Elevator Stuff
NUTRONSDS Feb 10, 2018
2b606e4
mapped solenoids
NUTRONSDS Feb 10, 2018
a6c093f
fixed merged conflicts for intake w4 and dt w4
NUTRONSDS Feb 10, 2018
2c36bd9
tuned stuff
NUTRONSDS Feb 11, 2018
c0d30b4
wrote paths for tommorows testing
JYoung413 Feb 11, 2018
a3e2fcb
added pathing meme
NUTRONSDS Feb 12, 2018
4f8c746
Auto paths and intake fix.
NUTRONSDS Feb 13, 2018
4fa3ec6
added autos and cmd groups for climbing
NUTRONSDS Feb 16, 2018
60f48ae
fixed pathing
NUTRONSDS Feb 16, 2018
87f3ceb
fixed autos
JYoung413 Feb 16, 2018
bb1d87f
did stuff
JYoung413 Feb 16, 2018
42d9e84
added more file reading stuff
JYoung413 Feb 16, 2018
b04f71e
Added intake logic for the proximity sensor
Brinbri Feb 16, 2018
a05f5d1
fixed csv writing and reading
NUTRONSDS Feb 17, 2018
3f187dc
fixed stuff
NUTRONSDS Feb 17, 2018
5904ae9
fixed rio and autos
NUTRONSDS Feb 17, 2018
b4d3e8a
week0 changes
NUTRONSDS Feb 17, 2018
e173169
fixed oi and added better climb sequencing
NUTRONSDS Feb 17, 2018
badc585
Fixed Smart intake sensor, tested and works (For stopping intake.).
Brinbri Feb 18, 2018
b63dab2
changed some paths
NUTRONSDS Feb 18, 2018
2989630
Tested proximity sensor on comp bot and it works.
Brinbri Feb 18, 2018
e4e26ef
merged
NUTRONSDS Feb 18, 2018
6fc2dff
broke elevator then fixed lol
NUTRONSDS Feb 19, 2018
f0555d6
did some auto stuff
NUTRONSDS Feb 19, 2018
f78590f
sonos day one work...
NUTRONSDS Feb 20, 2018
4b1addf
end of sonos
NUTRONSDS Feb 21, 2018
f4ce648
pathed most palmetto autos
NUTRONSDS Feb 21, 2018
e85ad28
made palmetto autos
NUTRONSDS Feb 23, 2018
8cf0eab
did stuff
NUTRONSDS Feb 25, 2018
879c951
made sonos progress
NUTRONSDS Feb 26, 2018
cb75e28
day one changes
NUTRONSDS Mar 2, 2018
5f8bb6b
day two and three changes
NUTRONSDS Mar 6, 2018
5f8fbf3
tuesday night changes
NUTRONSDS Mar 8, 2018
d4a93a3
added auto changes and auto intake sensing
NUTRONSDS Mar 14, 2018
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
15 changes: 0 additions & 15 deletions .classpath
View file
Open in desktop

This file was deleted.

43 changes: 43 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,49 @@
*.tar.gz
*.rar

.gradle/*

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
/bin/

# WPILib
bin/
build/
dist/
sysProps.xml
workbench.xmi

# IDE
*.ipr
*.iml
*.iws
out/
tmp/
.settings/
.loadpath
.project
/.idea
.classpath

# Toast/GradleRIO
run/
.gradle/
gradle/.launch/

# OS Files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.AppleDouble
.LSOverride
.Trashes
ehthumbs.db
Thumbs.db

# backup files
*~

# directory for XML generated after running junit tests through ant
junit/
48 changes: 0 additions & 48 deletions .idea/NU18.iml
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions .idea/libraries/CTRE_Phoenix_sources.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/misc.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml
View file
Open in desktop

This file was deleted.

124 changes: 0 additions & 124 deletions .idea/uiDesigner.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml
View file
Open in desktop

This file was deleted.

Loading