Skip to content

Commit

Permalink
Changes for/from Long Island Regional #2 (#143)
Browse files Browse the repository at this point in the history 
* Allow robot score to score mid tip out

* Make wrist safe angle global

* Tune arm trajectories

* Change tip out led  color

* boom

* Tune cone intaking

* Add glass arm plots

* Fix align poses

* Add validate score side to align button

* Add front limelight and tune toscorepose rotation

* Recharacterize drivetrain

* auton changes

* push stuff

* upload sysid

* push commit

* make p = 3

* autons for li2

* Fix bindings

* driver practice hanges

* Revert "Merge branch 'main' into robot/mar-22"

This reverts commit 9019329 [formerly ebd3fef], reversing
changes made to 6fe610c [formerly f09d34a].

* Driver button bindings changes

* Disable more status frames

* adjust 2 piece path, balance, and color

* auton adjustments

* ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS ADD LOGS

* allow changing acquire modes

* update 2 piece wire path

* Remove chooser gamepad

* slow down balance on 2piecedock

* recalibrate swerve modules, add velocity target deadband

* implement velocity deadband in mdoule

* two piece wire default auton

* update glass?

* Update 2 piece wire path

---------

Co-authored-by: Vincent Wang <[email protected]>
Co-authored-by: Prog694 <[email protected]>
Co-authored-by: Ivan Chen <[email protected]>
Former-commit-id: 49b4b13
  • Loading branch information
@selym3 @vincentw921 @anivanchen
4 people authored Mar 27, 2023
1 parent 176fac6 commit b6a5883
Show file tree
Hide file tree
Showing 67 changed files with 25,499 additions and 393 deletions.
108 changes: 61 additions & 47 deletions .Glass/glass-window.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,24 @@
"Docking": {
"Data": [
"DockSpace ID=0x8B93E3BD Window=0xA787BDB4 Pos=0,22 Size=1920,979 Split=X Selected=0xC98BB475",
"DockNode ID=0x00000002 Parent=0x8B93E3BD SizeRef=1446,979 Split=X",
"DockNode ID=0x00000001 Parent=0x00000002 SizeRef=804,213 Split=Y",
"DockNode ID=0x00000002 Parent=0x8B93E3BD SizeRef=1281,979 Split=X",
"DockNode ID=0x00000001 Parent=0x00000002 SizeRef=793,213 Split=Y",
"DockNode ID=0x00000004 Parent=0x00000001 SizeRef=742,213 Split=X Selected=0x0EC36FA3",
"DockNode ID=0x00000008 Parent=0x00000004 SizeRef=391,190 Selected=0x88571D0D",
"DockNode ID=0x00000009 Parent=0x00000004 SizeRef=411,190 Selected=0x2395FA29",
"DockNode ID=0x00000008 Parent=0x00000004 SizeRef=377,190 Selected=0x88571D0D",
"DockNode ID=0x00000009 Parent=0x00000004 SizeRef=414,190 Selected=0x2395FA29",
"DockNode ID=0x00000005 Parent=0x00000001 SizeRef=742,211 Split=X Selected=0xC59FBC06",
"DockNode ID=0x0000000A Parent=0x00000005 SizeRef=390,188 Selected=0x95522DB5",
"DockNode ID=0x0000000B Parent=0x00000005 SizeRef=412,188 Selected=0xD2C348FC",
"DockNode ID=0x00000007 Parent=0x00000002 SizeRef=640,213 CentralNode=1 Selected=0xC98BB475",
"DockNode ID=0x00000003 Parent=0x8B93E3BD SizeRef=472,979 Split=Y Selected=0x2D9B9756",
"DockNode ID=0x00000006 Parent=0x00000003 SizeRef=501,787 Split=Y Selected=0x2D9B9756",
"DockNode ID=0x0000000D Parent=0x00000006 SizeRef=501,493 Split=Y Selected=0x2D9B9756",
"DockNode ID=0x0000000F Parent=0x0000000D SizeRef=501,431 Selected=0x2D9B9756",
"DockNode ID=0x00000010 Parent=0x0000000D SizeRef=501,60 Selected=0x410DE7DE",
"DockNode ID=0x0000000E Parent=0x00000006 SizeRef=501,292 Selected=0xB5CBE9F0",
"DockNode ID=0x0000000C Parent=0x00000003 SizeRef=501,190 Selected=0xB4604DB7"
"DockNode ID=0x0000000A Parent=0x00000005 SizeRef=383,188 Selected=0x95522DB5",
"DockNode ID=0x0000000B Parent=0x00000005 SizeRef=408,188 Selected=0xD2C348FC",
"DockNode ID=0x00000007 Parent=0x00000002 SizeRef=486,213 Split=Y Selected=0xF5CC1934",
"DockNode ID=0x00000011 Parent=0x00000007 SizeRef=718,484 Split=Y Selected=0x3E90CA91",
"DockNode ID=0x0000000D Parent=0x00000011 SizeRef=713,450 CentralNode=1 Selected=0xB5CBE9F0",
"DockNode ID=0x0000000E Parent=0x00000011 SizeRef=713,32 Selected=0xF5CC1934",
"DockNode ID=0x00000012 Parent=0x00000007 SizeRef=718,493 Selected=0xC98BB475",
"DockNode ID=0x00000003 Parent=0x8B93E3BD SizeRef=637,979 Split=Y Selected=0x2D9B9756",
"DockNode ID=0x00000006 Parent=0x00000003 SizeRef=501,757 Split=Y Selected=0x2D9B9756",
"DockNode ID=0x0000000F Parent=0x00000006 SizeRef=501,642 Selected=0x2D9B9756",
"DockNode ID=0x00000010 Parent=0x00000006 SizeRef=501,113 Selected=0x410DE7DE",
"DockNode ID=0x0000000C Parent=0x00000003 SizeRef=501,220 Selected=0xB4604DB7"
]
},
"MainWindow": {
Expand All @@ -29,93 +31,105 @@
"userScale": "2",
"width": "1920",
"xpos": "0",
"ypos": "29"
"ypos": "34"
}
},
"Table": {
"0x542B5671,2": {
"Column 0 Width": "248",
"Column 1 Width": "269",
"Column 0 Width": "384",
"Column 1 Width": "268",
"RefScale": "16"
}
},
"Window": {
"###/SmartDashboard/Arm Mech2d": {
"Collapsed": "0",
"DockId": "0x00000007,0",
"Pos": "806,22",
"Size": "640,979"
"DockId": "0x00000012,1",
"Pos": "795,508",
"Size": "486,493"
},
"###/SmartDashboard/Autonomous": {
"Collapsed": "0",
"DockId": "0x00000010,0",
"Pos": "1448,455",
"Size": "472,60"
"Pos": "1283,666",
"Size": "637,113"
},
"###/SmartDashboard/Field": {
"Collapsed": "0",
"DockId": "0x0000000E,0",
"Pos": "1448,517",
"Size": "472,292"
"DockId": "0x0000000D,2",
"Pos": "795,22",
"Size": "486,450"
},
"###NetworkTables": {
"Collapsed": "0",
"DockId": "0x0000000F,0",
"Pos": "1448,22",
"Size": "472,431"
"Pos": "1283,22",
"Size": "637,642"
},
"###NetworkTables Settings": {
"Collapsed": "0",
"DockId": "0x0000000C,0",
"Pos": "1448,811",
"Size": "472,190"
"Pos": "1283,781",
"Size": "637,220"
},
"###Plot <0>": {
"Collapsed": "0",
"DockId": "0x00000007,1",
"Pos": "806,22",
"Size": "640,979"
"DockId": "0x0000000D,0",
"Pos": "795,22",
"Size": "486,450"
},
"###Plot <10>": {
"Collapsed": "0",
"DockId": "0x00000008,0",
"Pos": "0,22",
"Size": "391,491"
"Size": "377,491"
},
"###Plot <11>": {
"Collapsed": "0",
"DockId": "0x0000000A,0",
"Pos": "0,515",
"Size": "390,486"
"Size": "383,486"
},
"###Plot <12>": {
"Collapsed": "0",
"DockId": "0x00000009,1",
"Pos": "393,22",
"Size": "411,491"
"Pos": "379,22",
"Size": "414,491"
},
"###Plot <13>": {
"Collapsed": "0",
"DockId": "0x00000008,1",
"Pos": "0,22",
"Size": "391,491"
"Size": "377,491"
},
"###Plot <14>": {
"Collapsed": "0",
"DockId": "0x0000000A,1",
"Pos": "0,515",
"Size": "390,486"
"Size": "383,486"
},
"###Plot <15>": {
"Collapsed": "1",
"Pos": "132,356",
"Size": "1127,672"
},
"###Plot <16>": {
"Collapsed": "0",
"DockId": "0x0000000D,1",
"Pos": "795,22",
"Size": "486,450"
},
"###Plot <17>": {
"Collapsed": "0",
"DockId": "0x00000012,0",
"Pos": "795,508",
"Size": "486,493"
},
"###Plot <1>": {
"Collapsed": "0",
"DockId": "0x00000007,2",
"Pos": "806,22",
"Size": "640,979"
"DockId": "0x0000000E,0",
"Pos": "795,474",
"Size": "486,32"
},
"###Plot <2>": {
"Collapsed": "0",
Expand All @@ -130,8 +144,8 @@
"###Plot <4>": {
"Collapsed": "0",
"DockId": "0x0000000B,1",
"Pos": "392,515",
"Size": "412,486"
"Pos": "385,515",
"Size": "408,486"
},
"###Plot <5>": {
"Collapsed": "0",
Expand All @@ -146,14 +160,14 @@
"###Plot <7>": {
"Collapsed": "0",
"DockId": "0x00000009,0",
"Pos": "393,22",
"Size": "411,491"
"Pos": "379,22",
"Size": "414,491"
},
"###Plot <8>": {
"Collapsed": "0",
"DockId": "0x0000000B,0",
"Pos": "392,515",
"Size": "412,486"
"Pos": "385,515",
"Size": "408,486"
},
"###Plot <9>": {
"Collapsed": "0",
Expand Down
123 changes: 98 additions & 25 deletions .Glass/glass.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"transitory": {
"SmartDashboard": {
"Arm": {
"Shoulder": {
"open": true
},
"open": true
},
"Arm Trajectories": {
"open": true
},
"Auto Balance": {
Expand Down Expand Up @@ -54,12 +54,22 @@
}
},
"Swerve": {
"Back Left": {
"open": true
},
"Back Right": {
"open": true
},
"Drive": {
"open": true
},
"Front Left": {
"open": true
},
"Front Right": {
"open": true
}
},
"open": true
},
"Vision": {
"com.stuypulse.robot.util.Limelight@19d31f3": {
Expand Down Expand Up @@ -127,11 +137,6 @@
"Plot <0>": {
"plots": [
{
"axis": [
{
"autoFit": true
}
],
"height": 933,
"series": [
{
Expand Down Expand Up @@ -241,11 +246,6 @@
"Plot <12>": {
"plots": [
{
"axis": [
{
"autoFit": true
}
],
"height": -30,
"series": [
{
Expand Down Expand Up @@ -311,11 +311,6 @@
"Plot <14>": {
"plots": [
{
"axis": [
{
"autoFit": true
}
],
"height": 418,
"series": [
{
Expand Down Expand Up @@ -383,10 +378,93 @@
"visible": false
}
},
"Plot <1>": {
"Plot <16>": {
"plots": [
{
"height": 933,
"series": [
{
"color": [
0.2980392277240753,
0.44705885648727417,
0.6901960968971252,
1.0
],
"id": "NT:/SmartDashboard/Arm/Shoulder/Velocity (deg per s)"
},
{
"color": [
0.8666667342185974,
0.5176470875740051,
0.32156863808631897,
1.0
],
"id": "NT:/SmartDashboard/Arm/Wrist/Velocity (deg per s)"
}
]
}
],
"window": {
"name": "Arm Velocities"
}
},
"Plot <17>": {
"plots": [
{
"axis": [
{
"autoFit": true
}
],
"height": 425,
"series": [
{
"color": [
0.2980392277240753,
0.44705885648727417,
0.6901960968971252,
1.0
],
"id": "NT:/SmartDashboard/Arm/Shoulder/Output (V)"
},
{
"color": [
0.8666667342185974,
0.5176470875740051,
0.32156863808631897,
1.0
],
"id": "NT:/SmartDashboard/Arm/Wrist/Output (V)"
},
{
"color": [
0.14131689071655273,
0.7481481432914734,
0.2802300751209259,
1.0
],
"id": "NT:/SmartDashboard/Arm/Wrist/Feedback Enabled"
},
{
"color": [
0.7686275243759155,
0.30588236451148987,
0.32156863808631897,
1.0
],
"id": "NT:/SmartDashboard/Arm/Wrist/Feedback Enabled Raw"
}
]
}
],
"window": {
"name": "Arm Voltages"
}
},
"Plot <1>": {
"plots": [
{
"height": -36,
"series": [
{
"color": [
Expand Down Expand Up @@ -488,11 +566,6 @@
"Plot <4>": {
"plots": [
{
"axis": [
{
"autoFit": true
}
],
"height": -30,
"series": [
{
Expand Down
Loading

0 comments on commit b6a5883

Please sign in to comment.