Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d372622
Update wpilib
DarkenedDragon Nov 2, 2024
509be30
Actually working simulated swerve speed?
DarkenedDragon Nov 9, 2024
bbd1235
Removed drive speed cap
DarkenedDragon Nov 9, 2024
f166894
Fixed speed scaler
DarkenedDragon Nov 10, 2024
da7f324
Merge branch 'intra-competition-shooter-changes' into eli
DarkenedDragon Nov 10, 2024
f1245b7
Set starting pose
DarkenedDragon Nov 10, 2024
2afb778
Removed a lot of distractions
DarkenedDragon Nov 10, 2024
5cddbeb
Simulating the shooter system
DarkenedDragon Nov 10, 2024
834119b
Added Choreo
DarkenedDragon Nov 10, 2024
a376ac7
Copy Choreo trajectories into the deploy directory as part of the build
DarkenedDragon Nov 10, 2024
09f2f23
Working auto sim
DarkenedDragon Nov 10, 2024
cc3669e
Added warning comment
DarkenedDragon Nov 10, 2024
f0b91b2
Remove unused code
DarkenedDragon Dec 20, 2024
3495dce
Update simulation
DarkenedDragon Dec 20, 2024
e0e73d1
Remove unused code
DarkenedDragon Dec 20, 2024
0ac7dc4
Adjusted controller mappings for Linux
DarkenedDragon Dec 20, 2024
7604429
Moved from double to Units
DarkenedDragon Dec 22, 2024
07b6393
Added 2024 robot model to simulation
DarkenedDragon Dec 24, 2024
266c72c
Refined model config
DarkenedDragon Dec 24, 2024
a9322c5
Added named units
DarkenedDragon Dec 24, 2024
f95417d
Implemented math methods
DarkenedDragon Dec 24, 2024
62a1d63
Simulate a note projectile
DarkenedDragon Dec 26, 2024
e05db79
Add angle units
DarkenedDragon Dec 26, 2024
8b18a5f
Fixed gyro unit
DarkenedDragon Dec 26, 2024
0ee01e6
Corrected trig
DarkenedDragon Dec 26, 2024
d6bad32
Fix offset axis problem
DarkenedDragon Dec 26, 2024
0d406f7
Only show 1 note at a time
DarkenedDragon Dec 26, 2024
4e117a2
Added air resistance
DarkenedDragon Dec 27, 2024
0a0953c
Corrected note shooting sequence
DarkenedDragon Dec 27, 2024
cb05394
Remove stray characters
DarkenedDragon Dec 27, 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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# This gitignore has been specially created by the WPILib team.
# If you remove items from this file, intellisense might break.

# Custom
src/main/deploy/
Choreo/demos

### C++ ###
# Prerequisites
*.d
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@
],
"java.test.defaultConfig": "WPIlibUnitTests",
"java.debug.settings.onBuildFailureProceed": true,
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable"
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable",
"java.debug.settings.showHex": false
}
Binary file added AdvantageScope/assets/Robot_619/ARM-00-00.bin
Binary file not shown.
1 change: 1 addition & 0 deletions AdvantageScope/assets/Robot_619/ARM-00-00.gltf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"accessors":[{"bufferView":0,"byteOffset":0,"componentType":5126,"count":20416,"max":[0.2684859375000001,0.00635,0.582464238513265],"min":[-0.2683600681181053,0.0,-0.1541357614867355],"type":"VEC3"},{"bufferView":0,"byteOffset":244992,"componentType":5126,"count":14144,"max":[0.26848593750000007,0.012699999999999996,0.582464238513265],"min":[-0.26839218163026137,0.0063500000000000019,-0.1541060885944417],"type":"VEC3"},{"bufferView":0,"byteOffset":414720,"componentType":5126,"count":1256,"max":[-0.0941964822461537,0.019049999999999999,0.582464238513265],"min":[-0.2177875375,0.012700000000000003,0.3851068625],"type":"VEC3"},{"bufferView":0,"byteOffset":429792,"componentType":5126,"count":640,"max":[0.0254,0.0508,0.012700000000000017],"min":[-0.02540000000000001,-0.05080000000000001,-0.012700000000000017],"type":"VEC3"},{"bufferView":0,"byteOffset":437472,"componentType":5126,"count":296,"max":[0.012699999999999989,0.05715,0.012699999999999976],"min":[-0.012699999999999989,0.0,-0.01270000000000003],"type":"VEC3"},{"bufferView":0,"byteOffset":441024,"componentType":5126,"count":11956,"max":[0.025500000000000003,0.00725,0.025499999999999889],"min":[-0.02550000000000003,-0.00725,-0.025500000000000114],"type":"VEC3"},{"bufferView":0,"byteOffset":584496,"componentType":5126,"count":11956,"max":[0.025500000000000003,0.011,0.025500000000000003],"min":[-0.025500000000000003,-0.011,-0.025500000000000003],"type":"VEC3"},{"bufferView":0,"byteOffset":727968,"componentType":5126,"count":3572,"max":[0.020258045073549496,0.006324600000000004,0.020319200606876168],"min":[-0.020258045073549514,-0.006324600000000004,-0.020319200606876168],"type":"VEC3"},{"bufferView":0,"byteOffset":770832,"componentType":5126,"count":3916,"max":[0.050799999999999987,0.0508,0.012699999999999996],"min":[-0.050799999999999987,-0.0508,-0.0127],"type":"VEC3"},{"bufferView":0,"byteOffset":817824,"componentType":5126,"count":924,"max":[0.06984999999999998,0.0,0.582464238513265],"min":[0.044449999999999979,-0.0254,0.41229279999999998],"type":"VEC3"},{"bufferView":1,"byteOffset":0,"componentType":5126,"count":20416,"type":"VEC3"},{"bufferView":1,"byteOffset":244992,"componentType":5126,"count":14144,"type":"VEC3"},{"bufferView":1,"byteOffset":414720,"componentType":5126,"count":1256,"type":"VEC3"},{"bufferView":1,"byteOffset":429792,"componentType":5126,"count":640,"type":"VEC3"},{"bufferView":1,"byteOffset":437472,"componentType":5126,"count":296,"type":"VEC3"},{"bufferView":1,"byteOffset":441024,"componentType":5126,"count":11956,"type":"VEC3"},{"bufferView":1,"byteOffset":584496,"componentType":5126,"count":11956,"type":"VEC3"},{"bufferView":1,"byteOffset":727968,"componentType":5126,"count":3572,"type":"VEC3"},{"bufferView":1,"byteOffset":770832,"componentType":5126,"count":3916,"type":"VEC3"},{"bufferView":1,"byteOffset":817824,"componentType":5126,"count":924,"type":"VEC3"},{"bufferView":2,"byteOffset":0,"componentType":5123,"count":59322,"type":"SCALAR"},{"bufferView":2,"byteOffset":118644,"componentType":5123,"count":40860,"type":"SCALAR"},{"bufferView":2,"byteOffset":200364,"componentType":5123,"count":3720,"type":"SCALAR"},{"bufferView":2,"byteOffset":207804,"componentType":5123,"count":1872,"type":"SCALAR"},{"bufferView":2,"byteOffset":211548,"componentType":5123,"count":864,"type":"SCALAR"},{"bufferView":2,"byteOffset":213276,"componentType":5123,"count":34608,"type":"SCALAR"},{"bufferView":2,"byteOffset":282492,"componentType":5123,"count":34608,"type":"SCALAR"},{"bufferView":2,"byteOffset":351708,"componentType":5123,"count":10296,"type":"SCALAR"},{"bufferView":2,"byteOffset":372300,"componentType":5123,"count":11064,"type":"SCALAR"},{"bufferView":2,"byteOffset":394428,"componentType":5123,"count":2724,"type":"SCALAR"}],"asset":{"generator":"Open CASCADE Technology 7.6 [dev.opencascade.org]","version":"2.0","extras":{"Author":"","Originating system":"SolidWorks 2024","Organization":"","Comments":"STEP AP214"}},"bufferViews":[{"buffer":0,"byteLength":828912,"byteOffset":0,"byteStride":12,"target":34962},{"buffer":0,"byteLength":828912,"byteOffset":828912,"byteStride":12,"target":34962},{"buffer":0,"byteLength":399876,"byteOffset":1657824,"target":34963}],"buffers":[{"byteLength":2057700,"uri":"ARM-00-00.bin"}],"materials":[{"name":"mat_0","pbrMetallicRoughness":{"baseColorFactor":[0.5906188488006592,0.637596845626831,0.8549926280975342,1.0],"roughnessFactor":0.2121320366859436},"doubleSided":true}],"meshes":[{"name":"ARM-00-01","primitives":[{"attributes":{"NORMAL":10,"POSITION":0},"indices":20,"material":0,"mode":4}]},{"name":"ARM-00-02","primitives":[{"attributes":{"NORMAL":11,"POSITION":1},"indices":21,"material":0,"mode":4}]},{"name":"ARM-00-03","primitives":[{"attributes":{"NORMAL":12,"POSITION":2},"indices":22,"material":0,"mode":4}]},{"name":"ARM-00-04","primitives":[{"attributes":{"NORMAL":13,"POSITION":3},"indices":23,"material":0,"mode":4}]},{"name":"ARM-00-04","primitives":[{"attributes":{"NORMAL":13,"POSITION":3},"indices":23,"material":0,"mode":4}]},{"name":"ARM-00-04","primitives":[{"attributes":{"NORMAL":13,"POSITION":3},"indices":23,"material":0,"mode":4}]},{"name":"ARM-00-04","primitives":[{"attributes":{"NORMAL":13,"POSITION":3},"indices":23,"material":0,"mode":4}]},{"name":"ARM-00-05","primitives":[{"attributes":{"NORMAL":14,"POSITION":4},"indices":24,"material":0,"mode":4}]},{"name":"ARM-00-05","primitives":[{"attributes":{"NORMAL":14,"POSITION":4},"indices":24,"material":0,"mode":4}]},{"name":"ARM-00-05","primitives":[{"attributes":{"NORMAL":14,"POSITION":4},"indices":24,"material":0,"mode":4}]},{"name":"ARM-00-05","primitives":[{"attributes":{"NORMAL":14,"POSITION":4},"indices":24,"material":0,"mode":4}]},{"name":"ARM-00-06","primitives":[{"attributes":{"NORMAL":15,"POSITION":5},"indices":25,"material":0,"mode":4}]},{"name":"ARM-00-06","primitives":[{"attributes":{"NORMAL":15,"POSITION":5},"indices":25,"material":0,"mode":4}]},{"name":"ARM-00-06","primitives":[{"attributes":{"NORMAL":15,"POSITION":5},"indices":25,"material":0,"mode":4}]},{"name":"ARM-00-06","primitives":[{"attributes":{"NORMAL":15,"POSITION":5},"indices":25,"material":0,"mode":4}]},{"name":"ARM-00-06","primitives":[{"attributes":{"NORMAL":15,"POSITION":5},"indices":25,"material":0,"mode":4}]},{"name":"ARM-00-06","primitives":[{"attributes":{"NORMAL":15,"POSITION":5},"indices":25,"material":0,"mode":4}]},{"name":"ARM-00-06","primitives":[{"attributes":{"NORMAL":15,"POSITION":5},"indices":25,"material":0,"mode":4}]},{"name":"ARM-00-06","primitives":[{"attributes":{"NORMAL":15,"POSITION":5},"indices":25,"material":0,"mode":4}]},{"name":"ARM-00-07","primitives":[{"attributes":{"NORMAL":16,"POSITION":6},"indices":26,"material":0,"mode":4}]},{"name":"ARM-00-07","primitives":[{"attributes":{"NORMAL":16,"POSITION":6},"indices":26,"material":0,"mode":4}]},{"name":"ARM-00-07","primitives":[{"attributes":{"NORMAL":16,"POSITION":6},"indices":26,"material":0,"mode":4}]},{"name":"ARM-00-07","primitives":[{"attributes":{"NORMAL":16,"POSITION":6},"indices":26,"material":0,"mode":4}]},{"name":"ARM-00-07","primitives":[{"attributes":{"NORMAL":16,"POSITION":6},"indices":26,"material":0,"mode":4}]},{"name":"ARM-00-07","primitives":[{"attributes":{"NORMAL":16,"POSITION":6},"indices":26,"material":0,"mode":4}]},{"name":"ARM-00-08","primitives":[{"attributes":{"NORMAL":17,"POSITION":7},"indices":27,"material":0,"mode":4}]},{"name":"ARM-00-08","primitives":[{"attributes":{"NORMAL":17,"POSITION":7},"indices":27,"material":0,"mode":4}]},{"name":"ARM-00-08","primitives":[{"attributes":{"NORMAL":17,"POSITION":7},"indices":27,"material":0,"mode":4}]},{"name":"ARM-00-08","primitives":[{"attributes":{"NORMAL":17,"POSITION":7},"indices":27,"material":0,"mode":4}]},{"name":"ARM-00-09","primitives":[{"attributes":{"NORMAL":18,"POSITION":8},"indices":28,"material":0,"mode":4}]},{"name":"ARM-00-09","primitives":[{"attributes":{"NORMAL":18,"POSITION":8},"indices":28,"material":0,"mode":4}]},{"name":"ARM-00-09","primitives":[{"attributes":{"NORMAL":18,"POSITION":8},"indices":28,"material":0,"mode":4}]},{"name":"ARM-00-09","primitives":[{"attributes":{"NORMAL":18,"POSITION":8},"indices":28,"material":0,"mode":4}]},{"name":"ARM-00-09","primitives":[{"attributes":{"NORMAL":18,"POSITION":8},"indices":28,"material":0,"mode":4}]},{"name":"ARM-00-09","primitives":[{"attributes":{"NORMAL":18,"POSITION":8},"indices":28,"material":0,"mode":4}]},{"name":"L-bracket^ARM-00-00","primitives":[{"attributes":{"NORMAL":19,"POSITION":9},"indices":29,"material":0,"mode":4}]},{"name":"L-bracket^ARM-00-00","primitives":[{"attributes":{"NORMAL":19,"POSITION":9},"indices":29,"material":0,"mode":4}]},{"name":"L-bracket^ARM-00-00","primitives":[{"attributes":{"NORMAL":19,"POSITION":9},"indices":29,"material":0,"mode":4}]},{"name":"L-bracket^ARM-00-00","primitives":[{"attributes":{"NORMAL":19,"POSITION":9},"indices":29,"material":0,"mode":4}]}],"nodes":[{"children":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39],"name":"ARM-00-00"},{"mesh":0,"name":"NAUO1"},{"translation":[-1.212830901789648e-15,0.05715,4.9786563760534359e-15],"mesh":1,"name":"NAUO2"},{"translation":[2.9514585220269399e-14,0.08889999999999988,1.2578046243438262e-14],"mesh":2,"name":"NAUO3"},{"rotation":[-0.49999999999999836,-0.5,0.49999999999999836,0.5000000000000036],"translation":[-0.1779015999999993,0.03213242365947713,0.10624820000000111],"mesh":3,"name":"NAUO4"},{"rotation":[-0.5,0.5000000000000018,0.5,-0.4999999999999982],"translation":[0.1779015999999975,0.03304822263134287,0.30624780000000159],"mesh":4,"name":"NAUO5"},{"rotation":[-0.5,0.5000000000000018,0.5,-0.4999999999999982],"translation":[-0.17790160000000033,0.03185153328977558,0.3062477999999995],"mesh":5,"name":"NAUO6"},{"rotation":[-0.5,0.5000000000000018,0.5,-0.4999999999999982],"translation":[0.17790160000000003,0.03174999999999936,0.10624820000000059],"mesh":6,"name":"NAUO7"},{"rotation":[7.571150543111076e-17,0.8715956043360786,-1.1750589177415768e-16,-0.4902255628810333],"translation":[-0.1923875375,0.006350000000000009,0.4745142385132649],"mesh":7,"name":"NAUO8"},{"rotation":[0.0,0.3219675184639639,0.0,0.9467507153702907],"translation":[0.19238753749999996,0.0063500000000000019,0.4745142385132649],"mesh":8,"name":"NAUO9"},{"rotation":[0.0,0.6344455211665221,0.0,0.7729675806084887],"translation":[-0.19812017549278602,0.0063500000000000019,-0.04556295053321841],"mesh":9,"name":"NAUO10"},{"rotation":[0.0,0.16087598606864818,0.0,0.9869746284005684],"translation":[0.19812017549278605,0.006350000000000008,-0.04556295053321853],"mesh":10,"name":"NAUO11"},{"rotation":[0.0,-0.0997365048088287,0.0,0.9950138841285176],"translation":[-0.13408241974616215,0.08027500000000001,0.5204532085796465],"mesh":11,"name":"NAUO12"},{"rotation":[0.0,0.14502937294898669,0.0,0.9894273500272892],"translation":[-0.14638547383637558,0.08027500000000001,0.4464017652164423],"mesh":12,"name":"NAUO13"},{"translation":[-0.2286,0.05317499999999999,-0.1142498239867352],"mesh":13,"name":"NAUO14"},{"translation":[0.22860000000000139,0.05317499999999999,-0.11424982398672599],"mesh":14,"name":"NAUO15"},{"translation":[0.16509999999999146,0.08027500000000004,0.5425783010132701],"mesh":15,"name":"NAUO16"},{"translation":[-0.17790160000000056,0.053175,2.220446049250313e-15],"mesh":16,"name":"NAUO17"},{"translation":[0.17790159999999875,0.05317499999999999,9.441556214278942e-15],"mesh":17,"name":"NAUO18"},{"rotation":[0.0,-0.673510355071642,0.0,0.739177787552677],"translation":[0.1779015999999932,0.08027500000000004,0.42499280000000547],"mesh":18,"name":"NAUO19"},{"translation":[-0.17790159999999997,0.034925,0.21249640000000004],"mesh":19,"name":"NAUO20"},{"translation":[0.1779015999999944,0.034925,0.21249640000000809],"mesh":20,"name":"NAUO21"},{"rotation":[0.0,-0.018098543678665165,0.0,0.999836207944437],"translation":[0.17790159999999323,0.034925,0.42499280000000558],"mesh":21,"name":"NAUO22"},{"translation":[-0.17790160000000053,0.034925,2.220446049250313e-15],"mesh":22,"name":"NAUO23"},{"translation":[-0.17790159999999997,0.034925,0.42499280000000008],"mesh":23,"name":"NAUO24"},{"translation":[0.17790159999999875,0.034925,9.441556214278942e-15],"mesh":24,"name":"NAUO25"},{"translation":[-0.14638547383637558,0.09527540000000001,0.44640176521644228],"mesh":25,"name":"NAUO26"},{"translation":[-0.1779016000000085,0.09527540000000001,0.4249928000000005],"mesh":26,"name":"NAUO27"},{"rotation":[0.0,-0.2777037341443709,0.0,0.9606667663879461],"translation":[-0.16510000000000875,0.09527540000000001,0.5425783010132659],"mesh":27,"name":"NAUO28"},{"rotation":[0.0,0.881785320353058,0.0,-0.47165098198758678],"translation":[-0.1340824197461621,0.09527540000000001,0.5204532085796465],"mesh":28,"name":"NAUO29"},{"rotation":[-0.7071067811865475,0.0,0.0,0.7071067811865475],"translation":[0.2286,0.03322499999999999,-0.1142498239867354],"mesh":29,"name":"NAUO30"},{"rotation":[0.7023653799149907,-0.08174884156286734,0.08174884156286734,0.7023653799149907],"translation":[0.1651,0.022224999999999999,0.542578301013265],"mesh":30,"name":"NAUO31"},{"rotation":[-0.7071067811865475,0.0,0.0,0.7071067811865475],"translation":[0.1651,0.047625,0.542578301013265],"mesh":31,"name":"NAUO32"},{"rotation":[-0.7071067811865475,0.0,0.0,0.7071067811865475],"translation":[-0.2286,0.03322499999999999,-0.1142498239867352],"mesh":32,"name":"NAUO33"},{"rotation":[0.7023653799149907,-0.08174884156286734,0.08174884156286734,0.7023653799149907],"translation":[-0.16510000000000853,0.022224999999999989,0.5425783010132653],"mesh":33,"name":"NAUO34"},{"rotation":[0.7023653799149907,-0.08174884156286734,0.08174884156286734,0.7023653799149907],"translation":[-0.16510000000000853,0.047624999999999997,0.5425783010132653],"mesh":34,"name":"NAUO35"},{"mesh":35,"name":"NAUO36"},{"translation":[-0.08254999999999999,0.0,0.0],"mesh":36,"name":"NAUO37"},{"rotation":[0.0,1.0,0.0,-3.4914813388431335e-15],"translation":[3.989863994746656e-15,0.0,0.994757038513264],"mesh":37,"name":"NAUO38"},{"rotation":[0.0,1.0,0.0,-3.4914813388431335e-15],"translation":[0.08255000000000296,0.0,0.994757038513264],"mesh":38,"name":"NAUO39"}],"scene":0,"scenes":[{"nodes":[0]}]}
Binary file added AdvantageScope/assets/Robot_619/RBT-00-00.bin
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions AdvantageScope/assets/Robot_619/RBT-00-00_no_arm.gltf

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions AdvantageScope/assets/Robot_619/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"name": "Robot_619",
"disableSimplification": false,
"rotations": [
{
"axis": "x",
"degrees": 180
},
{
"axis": "y",
"degrees": 0
},
{
"axis": "z",
"degrees": 90
}
],
"position": [0, 0, 0.11],
"cameras": [
{
"name": "Front Camera",
"rotations": [
{
"axis": "y",
"degrees": 0
}
],
"position": [0.2, 0, 0.8],
"resolution": [960, 720],
"fov": 100
}
],
"components": []
}
1 change: 1 addition & 0 deletions AdvantageScope/assets/Robot_619/model.glb

Large diffs are not rendered by default.

Loading