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

For tracking changes in game robot: Post sfr #59

Draft
wants to merge 72 commits into
base: main
Choose a base branch
from
Draft

For tracking changes in game robot: Post sfr #59

Show file tree
Hide file tree
Changes from 70 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
3795d57
paths and arm gains
CatonQ Mar 30, 2024
3dc5929
Merge branch 'Post-SFR' of https://github.com/gwhs/2024v2 into Post-SFR
CatonQ Mar 30, 2024
5360b9a
changed intake encoder offset
Apr 1, 2024
e8af97e
changed intake encoder offset
Apr 1, 2024
b41bcbc
done tuning arm pid
Apr 1, 2024
a3cd95d
dynamically change arm angle functionality; shuffleboard works
Apr 1, 2024
4152945
rotate in place ang was flipped
Apr 1, 2024
24efbe6
want limelight data
Apr 1, 2024
70fe70d
Merge branch 'advanceScoreSpeaker' into Post-SFR
Apr 1, 2024
54574c5
climb ಥ_ಥ
CatonQ Apr 1, 2024
da70f19
added code for second Servo
Chvoong24 Apr 2, 2024
d8bbf6e
Merge branch 'Post-SFR' of https://github.com/gwhs/2024v2 into Post-SFR
Chvoong24 Apr 2, 2024
d7f72c2
test servo
Apr 2, 2024
4333345
servo works. changed intake encoder offset
Apr 2, 2024
b57047d
servo return true
Apr 2, 2024
fdfeeca
cloim
CatonQ Apr 2, 2024
def9fd2
fices???
CatonQ Apr 2, 2024
9dd737c
teleop init with timeout
Apr 2, 2024
37aa579
Merge branch 'Post-SFR' of https://github.com/gwhs/2024v2 into Post-SFR
Apr 2, 2024
dacecc6
made command
Chvoong24 Apr 2, 2024
5caa7e1
Merge branch 'Post-SFR' of https://github.com/gwhs/2024v2 into Post-SFR
Chvoong24 Apr 2, 2024
ff46ed7
check pls
Chvoong24 Apr 2, 2024
60bd170
bug arm and intake arm not moving
Apr 2, 2024
0b4dc0f
Merge branch 'Post-SFR' of https://github.com/gwhs/2024v2 into Post-SFR
Apr 2, 2024
dd5a1fc
Merge branch 'main' into Post-SFR
Apr 2, 2024
5ee7d90
arm intake still not spinning
Apr 2, 2024
bbc11cd
reaction bar
CatonQ Apr 2, 2024
182c4e7
Merge branch 'Post-SFR' of https://github.com/gwhs/2024v2 into Post-SFR
CatonQ Apr 2, 2024
3adbd63
revert arm angle from shuffleboard
Apr 2, 2024
b2caba2
score in trap stutter use climb arm angle constant
Apr 2, 2024
d41a140
arm works
Apr 2, 2024
d13172b
adjusted arm speed safety guards
isaacngkh Apr 2, 2024
590eb1e
adjusted set up shuffleboard
isaacngkh Apr 2, 2024
2de2589
change arm volt contraints
isaacngkh Apr 2, 2024
e054e1b
reaction bar fixed
isaacngkh Apr 2, 2024
d3015bd
fix servo
isaacngkh Apr 2, 2024
ac0c15a
fix intake not moving
isaacngkh Apr 2, 2024
1a41b18
tested and almost work except swinging servo back
CatonQ Apr 2, 2024
37918b1
slight changes
Apr 2, 2024
f7a53aa
timing
CatonQ Apr 2, 2024
05464e7
Merge branch 'Post-SFR' of https://github.com/gwhs/2024v2 into Post-SFR
CatonQ Apr 2, 2024
e5145a4
.
Apr 2, 2024
807d4a2
clean up
Apr 2, 2024
8a17b76
cpu high
Apr 2, 2024
fbdd9a7
Merge branch 'Post-SFR' of https://github.com/gwhs/2024v2 into Post-SFR
CatonQ Apr 2, 2024
4921a4a
.
CatonQ Apr 2, 2024
78d61c1
testing
CatonQ Apr 3, 2024
25b1686
more logs
Apr 3, 2024
535547d
increase arm P
Apr 3, 2024
a80a36b
intake command change
CatonQ Apr 3, 2024
5a4166a
Merge branch 'Post-SFR' into modifyMotorLogging
CatonQ Apr 3, 2024
868712f
pushed
CatonQ Apr 3, 2024
39b8d63
paths
Chvoong24 Apr 3, 2024
3b71c46
hi
wilsomc Apr 4, 2024
02c5189
reaction bar works and put back tree
Chvoong24 Apr 4, 2024
fe4ae52
tree
Chvoong24 Apr 4, 2024
3ffacd6
Merge branch 'Post-SFR' of https://github.com/gwhs/2024v2 into Post-SFR
Chvoong24 Apr 4, 2024
d346242
clean up
isaacngkh Apr 4, 2024
79351b7
clean up
isaacngkh Apr 4, 2024
1f0b8b2
faceamp
CatonQ Apr 4, 2024
9f25668
faceamp
CatonQ Apr 4, 2024
28f6cc9
uh
CatonQ Apr 4, 2024
34d3638
u
CatonQ Apr 4, 2024
b38ce34
a
CatonQ Apr 4, 2024
39f2398
aimbot
CatonQ Apr 4, 2024
77bafef
gyro
CatonQ Apr 4, 2024
544cea0
back
CatonQ Apr 4, 2024
43f7406
binded buttons
CatonQ Apr 4, 2024
1123a77
changed aimbot to back speaker
CatonQ Apr 4, 2024
eb2a277
teleopdrive thing im not sure
CatonQ Apr 5, 2024
e4539f4
I added a comment
Aug 27, 2024
8d4f10e
another one
R1shy Aug 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
12 changes: 6 additions & 6 deletions .pathplanner/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
"Starting from Mid Field Notes"
],
"autoFolders": [
"0.",
"1. A",
"1. C",
"2. A+A",
"2. A+C",
"3. A+A+C",
"0."
"Hajel"
],
"defaultMaxVel": 1.5,
"defaultMaxAccel": 3.0,
"defaultMaxAngVel": 30.0,
"defaultMaxAngAccel": 30.0,
"defaultMaxVel": 2.0,
"defaultMaxAccel": 2.0,
"defaultMaxAngVel": 50.0,
"defaultMaxAngAccel": 100.0,
"maxModuleSpeed": 4.0
}
67 changes: 41 additions & 26 deletions simgui-ds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"System Joysticks": {
"Keyboard 0 Settings": {
"window": {
"visible": false
"visible": true
}
},
"Keyboard 1 Settings": {
"window": {
"visible": true
}
},
"keyboardJoysticks": [
Expand All @@ -23,24 +28,23 @@
}
],
"axisCount": 3,
"buttonCount": 4,
"buttonCount": 14,
"buttonKeys": [
90,
88,
67,
86
],
"povConfig": [
{
"key0": 328,
"key135": 323,
"key180": 322,
"key225": 321,
"key270": 324,
"key315": 327,
"key45": 329,
"key90": 326
}
321,
322,
323,
324,
-1,
326,
327,
328,
329,
320,
-1,
-1,
-1,
-1,
-1
],
"povCount": 1
},
Expand All @@ -56,12 +60,21 @@
}
],
"axisCount": 2,
"buttonCount": 4,
"buttonCount": 13,
"buttonKeys": [
77,
44,
46,
47
-1,
-1,
-1,
-1,
-1,
-1,
-1,
-1,
325,
-1,
-1,
-1,
-1
],
"povCount": 0
},
Expand Down Expand Up @@ -96,8 +109,10 @@
],
"robotJoysticks": [
{
"guid": "78696e70757401000000000000000000",
"useGamepad": true
"guid": "Keyboard0"
},
{
"guid": "Keyboard1"
}
]
}
17 changes: 17 additions & 0 deletions simgui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"HALProvider": {
"Other Devices": {
"window": {
"visible": false
}
}
},
"NTProvider": {
"types": {
"/FMSInfo": "FMSInfo",
Expand All @@ -18,7 +25,9 @@
"/Shuffleboard/GameTab/Field": "Field2d",
"/Shuffleboard/GameTab/Filed": "Field2d",
"/Shuffleboard/GameTab/Increase Intake Offset": "Command",
"/Shuffleboard/GameTab/Intake Reject Note": "Command",
"/Shuffleboard/GameTab/IntakeRejectNote": "Command",
"/Shuffleboard/GameTab/RESET TELEOP DRIVE": "Command",
"/Shuffleboard/GameTab/Reset Arm": "Command",
"/Shuffleboard/GameTab/Reset Intake": "Command",
"/Shuffleboard/GameTab/Retract Reaction Bar": "Command",
Expand All @@ -29,6 +38,11 @@
"/SmartDashboard/Pigeon 2 (v6) [30]": "Gyro"
},
"windows": {
"/Shuffleboard/GameTab/Autonomous Chooser": {
"window": {
"visible": true
}
},
"/Shuffleboard/GameTab/Field": {
"bottom": 1476,
"height": 8.210550308227539,
Expand All @@ -55,5 +69,8 @@
},
"NetworkTables Info": {
"visible": true
},
"NetworkTables View": {
"visible": false
}
}
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/autos/0N-S1-Leave (underhand).auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.75,
"y": 6.69
"x": 0.72,
"y": 6.67
},
"rotation": -121.0
"rotation": -120.0
},
"command": {
"type": "sequential",
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/autos/0N-S1-noLeave (underhand).auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.75,
"y": 6.69
"x": 0.72,
"y": 6.67
},
"rotation": -121.0
"rotation": -120.0
},
"command": {
"type": "sequential",
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/0N-S1-noLeave.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.7518994781213513,
"y": 6.686887667641241
"x": 0.72,
"y": 6.67
},
"rotation": 60.0
},
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/0N-S2-noLeave (underhand).auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 1.35,
"x": 1.33,
"y": 5.54
},
"rotation": 180.0
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/0N-S3-Leave (underhand).auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.8,
"x": 0.72,
"y": 4.44
},
"rotation": 121.0
"rotation": 120.0
},
"command": {
"type": "sequential",
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/0N-S3-Leave.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.8,
"x": 0.72,
"y": 4.44
},
"rotation": -60.0
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/0N-S3-noLeave (underhand).auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.8,
"x": 0.72,
"y": 4.44
},
"rotation": 121.0
"rotation": 120.0
},
"command": {
"type": "sequential",
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/0N-S3-noLeave.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.7167669684840067,
"y": 4.391563704668065
"x": 0.72,
"y": 4.44
},
"rotation": -60.0
},
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/autos/1N-S1-A1.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.85,
"y": 6.62
"x": 0.72,
"y": 6.67
},
"rotation": 59.0
"rotation": 60.0
},
"command": {
"type": "sequential",
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/1N-S3-C4.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.8,
"x": 0.72,
"y": 4.44
},
"rotation": -59.0
"rotation": -60.0
},
"command": {
"type": "sequential",
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/1N-S3-C5.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.8,
"x": 0.72,
"y": 4.44
},
"rotation": -59.0
"rotation": -60.0
},
"command": {
"type": "sequential",
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/1N-Speaker2-A2.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 1.3535296301361848,
"x": 1.33,
"y": 5.545221859674489
},
"rotation": 0
Expand Down
82 changes: 0 additions & 82 deletions src/main/deploy/pathplanner/autos/2N-S1-A1.auto
View file
Open in desktop

This file was deleted.

Loading