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

Merge Cowtown2023 into main #1

Merged
merged 501 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
501 commits
Select commit Hold shift + click to select a range
606ecb0
Google Java Format
Feb 24, 2023
86ddc9a
Fixed threading (idk ask QUinn they did that)
willitcode Feb 25, 2023
d5ca967
Google Java Format
Feb 25, 2023
5d681fe
Passed armPose, added isArmAtSetpoint
AraReighard Feb 25, 2023
76c513d
Google Java Format
Feb 25, 2023
199078a
Changed small name
AraReighard Feb 25, 2023
8fc3fb0
Merge remote-tracking branch 'origin/arm' into arm
AraReighard Feb 25, 2023
665cc1c
Google Java Format
Feb 25, 2023
e8bae64
format will run at 3am daily instead of every push
willitcode Feb 25, 2023
025f271
Merge remote-tracking branch 'origin/staging' into holonomic-drive-co…
willitcode Feb 25, 2023
92984a5
Add RetractArm and change overextension policy
quackitsquinn Feb 25, 2023
7c3107b
Merge remote-tracking branch 'origin/arm' into arm
quackitsquinn Feb 25, 2023
1736d9c
Google Java Format
Feb 25, 2023
b486c42
Fixed some values which were'nt properly mathed
willitcode Feb 25, 2023
d63b0f8
Merge remote-tracking branch 'origin/a-star-pp' into a-star-pp
willitcode Feb 25, 2023
e83b608
Google Java Format
Feb 25, 2023
393db2d
Merge remote-tracking branch 'origin/staging' into arm
quackitsquinn Feb 25, 2023
0017702
Started implementation of manual Extender
AraReighard Feb 25, 2023
3e7caa6
Merge remote-tracking branch 'origin/arm' into arm
AraReighard Feb 25, 2023
6ca33ca
Implemented manual Extender Control
AraReighard Feb 27, 2023
e496fcb
Switched around x's and y's to not cause IndexOutOfBoundException errors
willitcode Feb 27, 2023
9e182d0
Google Java Format
Feb 27, 2023
429df7c
generatePath's giant search blocks now access correct values
willitcode Feb 27, 2023
df4fa15
Merge remote-tracking branch 'origin/a-star-pp' into a-star-pp
willitcode Feb 27, 2023
1f3adfc
Adafruit TCA9548A I2C multiplexer support
willitcode Feb 28, 2023
fedab00
installed revlib
willitcode Feb 28, 2023
03015ff
Merge remote-tracking branch 'origin/arm' into arm
willitcode Feb 28, 2023
602708e
Turn tables the pathlist (reverses)
willitcode Feb 28, 2023
e45eea6
Google Java Format
Feb 28, 2023
052208b
Added general javadoc
willitcode Feb 28, 2023
d6ae308
Merge remote-tracking branch 'origin/a-star-pp' into a-star-pp
willitcode Feb 28, 2023
8bff13f
Google Java Format
Feb 28, 2023
2757410
Added comments
AraReighard Feb 28, 2023
d633608
Google Java Format
Feb 28, 2023
a9a546c
selectBus(int) is now setBus(int)
willitcode Feb 28, 2023
2733727
Added documentation
AraReighard Mar 1, 2023
ba9a38b
Merge remote-tracking branch 'origin/a-star-pp' into a-star-pp
AraReighard Mar 1, 2023
25d469f
Google Java Format
Mar 1, 2023
7854f86
More Documentation, converted cm to dm (decimeters)
AraReighard Mar 1, 2023
fbc7794
Merge branch 'staging' into a-star-pp
AraReighard Mar 1, 2023
9ef7f52
Google Java Format
Mar 1, 2023
0861f55
Merge remote-tracking branch 'origin/a-star-pp' into a-star-pp
AraReighard Mar 1, 2023
7583af9
Merge branch 'arm' into a-star-pp
AraReighard Mar 1, 2023
17ce166
Imported TaskScheduler
AraReighard Mar 1, 2023
4b525a5
Changed Constants to do calculations in Constants instead of AStar
AraReighard Mar 1, 2023
dd32c9f
barely changed some comments
AraReighard Mar 1, 2023
1b3470e
Removed unnecessary comments
AraReighard Mar 1, 2023
f9ba357
Put in shuffleboard/smartdash placeholder outputters
AraReighard Mar 1, 2023
608175a
Removed gear ratio accounting
AraReighard Feb 27, 2023
6f7312a
Changed CTRE Mag Encoder Absolute to Relative Encoder
AraReighard Mar 2, 2023
97b977f
Created method to detect limit switch in base & initialized EncoderRe…
AraReighard Mar 3, 2023
4aa2e58
created method to detect limit switch trip in shoulder
AraReighard Mar 3, 2023
3e49c1c
Added methods to change velocities in the base and shoulder.
AraReighard Mar 3, 2023
29f95b7
Renamed EncoderReset to HomingRoutine
AraReighard Mar 3, 2023
d9fc523
Changed variables to better match other code
AraReighard Mar 3, 2023
c1bf6db
Finished Homing Routine
AraReighard Mar 3, 2023
b109d6f
Removed unnecessary imports in HomingRoutine
AraReighard Mar 3, 2023
b184f6c
Merge branch 'arm-test' into arm
AraReighard Mar 4, 2023
f1dc3ce
Added methods to display quad position to test homing routine
AraReighard Mar 4, 2023
1ed8474
Implemented HomingRoutine for testing
AraReighard Mar 4, 2023
aeddbcb
Added manual ArmExtender Code that dissapeared
AraReighard Mar 6, 2023
d159158
Changed the arbitrary speed for the homing routine
AraReighard Mar 6, 2023
8701f71
changed an and to or
AraReighard Mar 6, 2023
cba3141
Ported AStarTrajectoryGenerator.java from holonomic-drive-controller …
AraReighard Mar 6, 2023
3e1c458
Imported code from holonomic-drive-controller branch for AStarTraject…
AraReighard Mar 6, 2023
f8a83a0
Changed javadoc
AraReighard Mar 6, 2023
004dd6f
Merge branch 'holonomic-drive-controller' into a-star-pp
AraReighard Mar 8, 2023
91d7cc5
Resolved all errors
AraReighard Mar 8, 2023
334373c
Deleted AStarTrajectoryGenerator.java
AraReighard Mar 8, 2023
78834e6
Moved AStarTraj.Gen. into positioning folder
AraReighard Mar 8, 2023
9194f69
check previous commit
AraReighard Mar 8, 2023
9e4a8fe
Removed BaseTests which caused errors according to Quinn
AraReighard Mar 8, 2023
7481f61
uwu
AraReighard Mar 8, 2023
271b19d
check previous commit
AraReighard Mar 8, 2023
2c5016c
Merge branch 'pwm' into staging
AraReighard Mar 20, 2023
1408272
Merge branch 'arm' into staging
AraReighard Mar 20, 2023
b1c967a
plunger subsystem works now
AraReighard Mar 20, 2023
fb6c707
Merge branch 'pwm' into staging
AraReighard Mar 20, 2023
7f229a6
Changed inputs for Extender from left joystick to bumpers
AraReighard Mar 21, 2023
adad343
Merge branch 'arm' into staging
AraReighard Mar 21, 2023
c55e924
Removed unnecessary code
AraReighard Mar 21, 2023
dba7e7b
Merge branch 'arm' into staging
AraReighard Mar 21, 2023
b13745e
Merge branch 'drive-pid' into staging
AraReighard Mar 21, 2023
d5c4292
Removed Redundancies
AraReighard Mar 22, 2023
befbe95
implement field-oriented drive
willitcode Mar 22, 2023
f1c1970
commented out arm pose stuff
willitcode Mar 22, 2023
1083515
robot oriented drive should actually work now
willitcode Mar 22, 2023
c8d2b64
controller buttons are now whileTrue()
willitcode Mar 22, 2023
1ce018e
ManualArm now requires CompilationArm
willitcode Mar 22, 2023
91c15cc
plunger works now I hope
willitcode Mar 22, 2023
d4ef54e
misc fixes
willitcode Mar 23, 2023
a0214c0
I2C schtuff
willitcode Mar 23, 2023
1d39897
I2C manager should work now
AraReighard Mar 23, 2023
73e6ed5
Merge remote-tracking branch 'origin/arm' into staging
AraReighard Mar 23, 2023
85e0cd6
refactor to fix capitalized methods
AraReighard Mar 23, 2023
cb8233a
code likely made by Gabe
AraReighard Mar 24, 2023
426ff0a
Balance no longer runs infinitely after autonomous
AraReighard Mar 25, 2023
4b7f016
made LeaveCommunity.java
AraReighard Mar 25, 2023
dcb6167
split leavecommunity into two files for starting and stopping the motors
AraReighard Mar 25, 2023
6d00c10
Add real values to arm constants
quackitsquinn Mar 25, 2023
d895902
Added the commands to getAutonomousCommand()
AraReighard Mar 25, 2023
abfe2ff
Merge branch 'simple-autonomous' into staging
AraReighard Mar 25, 2023
3565661
Set Z as 8.5
AraReighard Mar 25, 2023
b9fdd36
Make code build and remove unused method
quackitsquinn Mar 25, 2023
569f54a
Inserted values for the poses except close.
phoebeshobe Mar 25, 2023
0d2cc80
fixed YourMom print command
phoebeshobe Mar 25, 2023
e47f7be
no no zones text file
willitcode Mar 25, 2023
67d6d6b
Config shoulder pid
AraReighard Mar 26, 2023
7ef13b2
POIS
willitcode Mar 27, 2023
add3c9e
base pid values
AraReighard Mar 27, 2023
6d2dd8f
misc unbreaking stuff
AraReighard Mar 27, 2023
ff734cd
more misc fixes
AraReighard Mar 27, 2023
c8619ee
arm poses ALMOST work
AraReighard Mar 28, 2023
170a7ef
moving base to a degree setpoint works now
AraReighard Mar 28, 2023
fec83bc
homing routine dir is named correctly now
willitcode Mar 28, 2023
92430cd
shoulder works a little better
willitcode Mar 28, 2023
ddaefa9
Shoulder should work now, constants tuned
AraReighard Mar 28, 2023
0c7c97c
lots of stuff
AraReighard Mar 28, 2023
f61bb9c
MVP for comp
AraReighard Mar 28, 2023
c5d7ead
ArmKinematics maybe works now
willitcode Mar 28, 2023
2337a5c
Fix ArmKinematics angle units
red2fred2 Mar 28, 2023
3b204df
open claw now actually opens the claw
AraReighard Mar 28, 2023
6f3cb61
update button bindings
AraReighard Mar 28, 2023
3a70330
Merge remote-tracking branch 'origin/staging' into staging
AraReighard Mar 28, 2023
93b38d8
balance actually runs
AraReighard Mar 29, 2023
ee0795f
balancing ACTUALLY actually runs
willitcode Mar 29, 2023
2327fe4
refactored axis getter methods
willitcode Mar 29, 2023
3bd8290
remove deprecated MoveToPose
willitcode Mar 29, 2023
b08a7ac
get rid of old todos
willitcode Mar 29, 2023
b84567f
added commands to close to a specified pressure
willitcode Mar 29, 2023
07da79c
manually ran google-java-format
willitcode Mar 29, 2023
93b441c
finish implementing claw pressure
willitcode Mar 29, 2023
8d72cbc
implemented cameras
AraReighard Mar 30, 2023
32cc77c
Merge remote-tracking branch 'origin/staging' into staging
AraReighard Mar 30, 2023
c7a57a8
fixed a couple merge conflict thingys
AraReighard Mar 30, 2023
fb2e3a9
fix claw stuff
AraReighard Mar 30, 2023
5febce0
comp stuff
AraReighard Mar 31, 2023
13c680b
balance.java was only considering the x-axis in terms of being off-angle
AraReighard Mar 31, 2023
a08a250
comp stuff (x2)
AraReighard Mar 31, 2023
55f7f9d
auto stuff
AraReighard Mar 31, 2023
37d088a
fix for non-limit switch claw
AraReighard Mar 31, 2023
eecd820
auto kinda works now
willitcode Apr 2, 2023
a889783
suppress unnecessary warnings
willitcode Sep 18, 2023
ca14f00
differential drive should work now (?)
willitcode Sep 25, 2023
bd19e4e
Google Java Format
Sep 25, 2023
d7fc674
updated rev2mdistancesensor and added commented code t robot.java
AraReighard Sep 25, 2023
2d9e04a
Merge remote-tracking branch 'origin/staging' into ramsete-controller
willitcode Sep 25, 2023
821e375
fix broken merge stuff & use diff drive in cmds
willitcode Sep 25, 2023
9d0b7a6
Merge remote-tracking branch 'origin/ramsete-controller' into ramsete…
willitcode Sep 25, 2023
0087cb9
Supposedly working balance command
quackitsquinn Sep 25, 2023
f20252b
get rid of unused fields
willitcode Sep 25, 2023
3d94ebb
tests broke again so i commented them out
willitcode Sep 25, 2023
c45fe97
Added 2 paths
quackitsquinn Sep 25, 2023
11f3ec6
fix drive motor IDs
willitcode Oct 2, 2023
6d193f9
comment out all arm code
willitcode Oct 2, 2023
5a5ed86
un-screwed-up the drive motor IDs
willitcode Oct 3, 2023
7ad4791
Merge remote-tracking branch 'origin/new-balance' into ramsete-contro…
willitcode Oct 2, 2023
d91a10a
fixed limelight networktables addresses
willitcode Oct 10, 2023
8d27af8
get rid of unused rotation param in javadoc
willitcode Oct 10, 2023
171ed58
demo trajectory for testing
willitcode Oct 10, 2023
b684f46
Testing code for drive PID
willitcode Oct 17, 2023
abe2a38
Added back Asimov's Laws
willitcode Oct 17, 2023
36824bc
sysid + misc trajectory changes
willitcode Oct 20, 2023
b87b322
abstract limelight to take input limelight name
quackitsquinn Oct 23, 2023
629c26a
fix sensor phase
willitcode Oct 23, 2023
3bb0d38
why was it rearLeft? I'm dumb
willitcode Oct 23, 2023
3a6cd32
add LimelightManager
quackitsquinn Oct 23, 2023
d81dd41
front now follows rear & naming change
willitcode Oct 23, 2023
fafa88d
Merge remote-tracking branch 'origin/limelight-manager' into ramsete-…
willitcode Oct 23, 2023
1534399
yeet unused imports
willitcode Oct 23, 2023
2cf7a1b
implement limelightManager into Drive
willitcode Oct 23, 2023
979afad
warn people more aggressively about null vals
willitcode Oct 23, 2023
8fd31ee
Renamed AStarTrajectoryGenerator to Team937TrajectoryUtils
AraReighard Oct 23, 2023
9fd14ad
Created some path JSons
AraReighard Oct 23, 2023
b02010e
Added method to generate trajectories out of pathweaver JSONS
AraReighard Oct 23, 2023
f8c8155
Added the 4 trajectories to constants
AraReighard Oct 23, 2023
47ec4c1
misc drive cleanup
AraReighard Oct 24, 2023
de43e49
fix deprecated warning
AraReighard Oct 24, 2023
20ee18b
the limelight manager comment no longer lies
AraReighard Oct 24, 2023
b9f9295
evil unit conversion
AraReighard Oct 24, 2023
e9ab1d7
add command to reset drive odo
willitcode Oct 26, 2023
043078e
turn down ramsete max accel
willitcode Oct 26, 2023
4ac2442
start big ol cleanup of RobotContainer
quackitsquinn Oct 26, 2023
da0f43f
prune unused files (bye autotasks) :(
quackitsquinn Oct 26, 2023
8190154
remove deprecated method
quackitsquinn Oct 26, 2023
e0876a1
format, all!
quackitsquinn Oct 26, 2023
86ece5a
inline defaultbotpos
quackitsquinn Oct 26, 2023
d82df07
remove SuppressWarnings in robot container
quackitsquinn Oct 26, 2023
f466d7f
remove test thing
quackitsquinn Oct 26, 2023
b843f8f
bye astar
quackitsquinn Oct 26, 2023
8f16dbf
broken yaml syntax
willitcode Oct 26, 2023
8355ede
undo formatting theoretically
quackitsquinn Oct 26, 2023
c0ff0f1
Merge remote-tracking branch 'origin/staging' into broom-time
quackitsquinn Oct 26, 2023
25b09a6
Merge remote-tracking branch 'origin/staging' into broom-time
quackitsquinn Oct 26, 2023
a295554
little bit of spotless
willitcode Oct 26, 2023
5a947eb
botched the claw on purpose
willitcode Oct 27, 2023
dc241b6
manualArm is back
willitcode Oct 27, 2023
fe5dbd5
gave the extender a ramp rate
willitcode Oct 27, 2023
979f173
re-tune constants for new intake
willitcode Oct 27, 2023
292a2db
debug stuff
willitcode Oct 27, 2023
567666b
actually schedule the reset command
willitcode Oct 27, 2023
2967ff7
Merge remote-tracking branch 'origin/staging' into ramsete-controller
willitcode Oct 27, 2023
8b2a525
change time to test
willitcode Oct 26, 2023
bccee0c
SPOTLESS - MERGE ME
willitcode Oct 27, 2023
89cbd8d
remove formatting action
willitcode Oct 27, 2023
82f2803
Merge branch 'staging' into ramsete-controller
willitcode Oct 27, 2023
e0d7214
delete format action (again)
willitcode Oct 27, 2023
bfbda69
FORMATTING - MERGE THIS PLEASE
willitcode Oct 27, 2023
5281c56
Merge branch 'staging' into ramsete-controller
willitcode Oct 27, 2023
0e8bb33
formatting
willitcode Oct 27, 2023
267f1e7
spotless for vscode
willitcode Oct 27, 2023
360f152
Merge branch 'staging' into ramsete-controller
willitcode Oct 27, 2023
f68b1e9
lf line endings for everyone
willitcode Oct 27, 2023
02c1c4a
eol for vscode
willitcode Oct 27, 2023
cbda510
Merge branch 'staging' into ramsete-controller
willitcode Oct 27, 2023
d042ced
Merge remote-tracking branch 'origin/broom-time' into ramsete-controller
willitcode Oct 27, 2023
cf90017
fix type resolution
willitcode Oct 27, 2023
37c2e26
remove code for arm intake and leave method skeleton
quackitsquinn Oct 27, 2023
8d64781
remove old claw stuff
quackitsquinn Oct 27, 2023
1a925e6
remove autotask/astar zombies
quackitsquinn Oct 27, 2023
3639714
add intake commands
quackitsquinn Oct 27, 2023
aa78225
try to invert extender
willitcode Oct 27, 2023
d1f90ac
Merge branch 'ramsete-controller' into cowtown2023
willitcode Oct 27, 2023
6a08ef1
little bit of spotless
willitcode Oct 27, 2023
785c83c
test and see if reset is broken
willitcode Oct 27, 2023
9f360d4
Merge remote-tracking branch 'origin/new-intake' into cowtown2023
willitcode Oct 27, 2023
46f598c
kill old plunger and claw
willitcode Oct 28, 2023
051d109
kill plunger (pt 2)
willitcode Oct 28, 2023
01efe08
invert winch & fix stray negative sign (facepalm)
willitcode Oct 28, 2023
c1ffcf5
drivetrain ramp rate
willitcode Oct 28, 2023
afcb1c3
Merge remote-tracking branch 'origin/a-star-pp' into cowtown2023
willitcode Oct 28, 2023
c1444ca
fixes
willitcode Oct 28, 2023
edaa485
fix auto
willitcode Oct 28, 2023
f843639
debug print spam
AraReighard Oct 30, 2023
decc1b7
Limelights now return WPI botposes
willitcode Oct 31, 2023
9e75848
trajectory keybinds
willitcode Oct 31, 2023
efcad3b
correct path for json
AraReighard Oct 30, 2023
7abbef9
license header now includes Asimov's Laws
willitcode Nov 1, 2023
64bb3d7
fix embarrassing typo
willitcode Nov 1, 2023
5ea9999
remove random newline in build.gradle
willitcode Nov 1, 2023
4b4ad25
put the field on smartdash
willitcode Nov 1, 2023
6af00f3
show trajectories on smartdash
willitcode Nov 2, 2023
b637e1c
remove unused method
quackitsquinn Nov 6, 2023
7271852
Merge remote-tracking branch 'origin/cowtown2023' into cowtown2023
willitcode Nov 8, 2023
5a1b842
Started implementing extender step function
AraReighard Nov 27, 2023
ee1208e
Merge remote-tracking branch 'origin/cowtown2023' into cowtown2023
AraReighard Nov 27, 2023
ecf96ac
minor spotless updates (MERGE ME)
willitcode Jan 16, 2024
562c42e
Comment out broken method
willitcode Jan 16, 2024
a85135d
Fix formatting
willitcode Jan 17, 2024
e31de9f
vmargs auto-updated
willitcode Jan 17, 2024
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
42 changes: 42 additions & 0 deletions .SysId/Data/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"canivore names": [
"rio"
],
"counts per rotation": 4096.0,
"encoder canivore name": "rio",
"encoder type": "Built-in",
"encoding": false,
"gearing denominator": 1.0,
"gearing numerator": 1.0,
"gyro": "NavX",
"gyro canivore name": "rio",
"gyro ctor": "SPI (MXP)",
"is drivetrain": true,
"motor controllers": [
"TalonSRX"
],
"number of samples per average": 10,
"primary encoder inverted": true,
"primary encoder ports": [
0,
1
],
"primary motor ports": [
4
],
"primary motors inverted": [
false
],
"secondary encoder inverted": true,
"secondary encoder ports": [
2,
3
],
"secondary motor ports": [
2
],
"secondary motors inverted": [
true
],
"velocity measurement period": 5
}
Loading
Loading