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

Main dev #35

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

Main dev #35

wants to merge 142 commits into from

Conversation

camtriggerhappy
Copy link
Member

finalizing code, goodnight sweet prince

camtriggerhappy and others added 30 commits January 27, 2022 16:36
@camtriggerhappy
Merge pull request #3 from 3492PARTs/main
468f08c 
Talon srx library added
@camtriggerhappy
Revert "Main dev sussy imposters"
2a0b099
@camtriggerhappy
Merge pull request #5 from 3492PARTs/revert-4-Main-Dev-SussyImposters
477df8b 
Revert 4 main dev sussy imposters
@Jurassichelper
added functions and susbsytems
d54eab6
@DanielCurtis1
added shooter.java
4836657
@Jurassichelper
Merge pull request #11 from 3492PARTs/Main-Dev-SussyImposters
3a9d0b7 
added shooter.java
@DanielCurtis1
added getballshooter and setshooterspeed
7a3de09
@camtriggerhappy
Merge pull request #12 from 3492PARTs/Main-Dev-SussyImposters
57d1c3c 
added getballshooter and setshooterspeed
@camtriggerhappy
Merge pull request #15 from 3492PARTs/main-dev-dream
ddded17 
Main dev dream
@Ashton-james
driverInteractionupdate
27ff02c
@camtriggerhappy
Merge pull request #16 from 3492PARTs/main-dev-dream
503bce0 
driverInteractionupdate
@Jurassichelper
Updated shooter and other.
30a8692
@camtriggerhappy
Merge pull request #20 from 3492PARTs/main-dev-dream
be5f3eb 
Main dev dream
@camtriggerhappy
Removed Important
39529b1
@camtriggerhappy
Merge pull request #22 from 3492PARTs/Main-Dev
045a576 
Main dev
@DanielCurtis1
Added toggleIntake
d8c13ad
@camtriggerhappy
Merge branch 'Main-Dev' into Main-Dev-SussyImposters
0da14ed
@camtriggerhappy
Merge pull request #23 from 3492PARTs/Main-Dev-SussyImposters
43a032c 
Main dev sussy imposters
@camtriggerhappy
Fixed errors from a merge conflict
442fa7a
@camtriggerhappy
Merge pull request #24 from 3492PARTs/Main-Dev
9370e5a 
Main dev
@camtriggerhappy
Added new talon distance sensor
3c50e99
@DanielCurtis1
Added toggleShooter
8f7ee7d
@DanielCurtis1
Merge branch 'Main-Dev-SussyImposters' of https://github.com/3492PART…
8d1d2b2 
…s/PARTsOS11 into Main-Dev-SussyImposters
@camtriggerhappy
Added PID test Values
a2fe883
@kalebcool9988
No change git being strange
3d752e8
@kalebcool9988
Merge branch 'Main-Dev-SussyImposters' of https://github.com/3492PART…
b41bff0 
…s/PARTsOS11 into Main-Dev-SussyImposters
@kalebcool9988
Changes being weird
3fbce4f
@camtriggerhappy
notes from testing
f6643ad
@camtriggerhappy
intake changes
c3730c1
@camtriggerhappy
Merge branch 'Main-Dev-SussyImposters' into Main-Dev
c0e5451
camtriggerhappy and others added 30 commits April 6, 2022 08:57
@camtriggerhappy
Added a function to move robot into shooting sweet spot
9b0324d
@camtriggerhappy
added new commands and noted which ones were finished in the driver i…
c7fe2d3 
…nteraction class
@camtriggerhappy
added dpad as button functionality to controller
b2737dd
@camtriggerhappy
got rid of driver interation(commented for now) and made limelight tu…
efcba8a 
…rn a teleop style command
@camtriggerhappy
got rid of driver interaction related errors
318ed34
@camtriggerhappy
added triggers as binary buttons functionality
21ef5e3
@camtriggerhappy
added documentation
0270a05
@camtriggerhappy
fixed some minor errors
68726bf
@camtriggerhappy
added new commands and encoder modules
7a5f2e7
@camtriggerhappy
fixed likely bug
86fda9d
@camtriggerhappy
made joysticks control movement in teleop
cfeebd6
@camtriggerhappy
got rid of unused imports
4e354a7
@camtriggerhappy
removed warnings from generics not being used properly
426057c
@kalebcool9988
final comp stuff
c066205
@camtriggerhappy
removed a change and moved it to a more suitable branch
4252ca3
@camtriggerhappy
fixed a very simple mistake
3f0ab63
@camtriggerhappy
changed some concepts in the command
826785b
@camtriggerhappy
shoot with rev command
fabe41f
@camtriggerhappy
Merge branch 'controlsIntoCommands' of https://github.com/3492PARTs/P…
af51fef 
…ARTsOS11 into controlsIntoCommands
@camtriggerhappy
added beanie drivetrain interface
9b66c39
@camtriggerhappy
Merge branch 'controlsIntoCommands' into features/driveTrainInterface
93f1410
@camtriggerhappy
Merge pull request #33 from 3492PARTs/features/driveTrainInterface
3504611 
Features/drive train interface
@camtriggerhappy
added a constant to correct trig mesurement
6d2d3dd
@camtriggerhappy
tested and confirmed that buttons work as intended
75db136
@camtriggerhappy
added debug shooter statements
0034f9f
@camtriggerhappy
limelight alligns
5cda170
@camtriggerhappy
fixed cameron meters
2a5b240
@camtriggerhappy
added new buttons for the operator
b3fc010
@camtriggerhappy
Merge branch 'Main-Dev' into controlsIntoCommands
431f362
@camtriggerhappy
Merge pull request #34 from 3492PARTs/controlsIntoCommands
bc92c81 
Controls into commands
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.
5 participants
@camtriggerhappy @Jurassichelper @DanielCurtis1 @Ashton-james @kalebcool9988