Skip to content

Changes from Aug 30/31 #194

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

Merged
merged 10 commits into from
Sep 1, 2023
Merged

Changes from Aug 30/31 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
14a5fb7
Add pose for back
Keobkeig Aug 30, 2023
cc324d7
Changed:
Keobkeig Aug 30, 2023
6945aa8
Clean settings
BenG49 Aug 30, 2023
087dbb0
More alignment logging
BenG49 Aug 31, 2023
3664744
Cone and cube back deaquire arm trajectories
BenG49 Aug 31, 2023
8ff1383
Tune alignment poses
BenG49 Aug 31, 2023
55c7e5c
Tune alignment constants
BenG49 Aug 31, 2023
d4f9350
Tune driver filters
BenG49 Aug 31, 2023
ee43173
LED green when outtaking align
BenG49 Aug 31, 2023
7f83890
Adjust peg Y poses
BenG49 Aug 31, 2023
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
118 changes: 66 additions & 52 deletions .Glass/glass-window.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"Docking": {
"Data": [
"DockSpace ID=0x8B93E3BD Window=0xA787BDB4 Pos=0,22 Size=32,32 Split=X Selected=0xC98BB475",
"DockNode ID=0x00000002 Parent=0x8B93E3BD SizeRef=1281,979 Split=X",
"DockSpace ID=0x8B93E3BD Window=0xA787BDB4 Pos=0,31 Size=2560,1524 Split=X Selected=0xC98BB475",
"DockNode ID=0x00000002 Parent=0x8B93E3BD SizeRef=1565,979 Split=X",
"DockNode ID=0x00000001 Parent=0x00000002 SizeRef=622,213 Split=Y",
"DockNode ID=0x00000004 Parent=0x00000001 SizeRef=742,213 Split=X Selected=0x0EC36FA3",
"DockNode ID=0x00000008 Parent=0x00000004 SizeRef=495,190 Selected=0xE290EDCE",
"DockNode ID=0x00000009 Parent=0x00000004 SizeRef=125,190 Selected=0x2395FA29",
"DockNode ID=0x00000005 Parent=0x00000001 SizeRef=742,211 Split=X Selected=0xC59FBC06",
"DockNode ID=0x0000000A Parent=0x00000005 SizeRef=501,188 Selected=0x3F2B753E",
"DockNode ID=0x0000000B Parent=0x00000005 SizeRef=119,188 Selected=0xD2C348FC",
"DockNode ID=0x00000007 Parent=0x00000002 SizeRef=657,213 Split=Y Selected=0xF5CC1934",
"DockNode ID=0x00000011 Parent=0x00000007 SizeRef=718,484 CentralNode=1 Selected=0xF5CC1934",
"DockNode ID=0x00000007 Parent=0x00000002 SizeRef=941,213 Split=Y Selected=0xF5CC1934",
"DockNode ID=0x00000011 Parent=0x00000007 SizeRef=718,484 CentralNode=1 Selected=0xB5CBE9F0",
"DockNode ID=0x00000012 Parent=0x00000007 SizeRef=718,493 Selected=0xC98BB475",
"DockNode ID=0x00000003 Parent=0x8B93E3BD SizeRef=637,979 Split=Y Selected=0x2D9B9756",
"DockNode ID=0x00000003 Parent=0x8B93E3BD SizeRef=993,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",
Expand All @@ -22,53 +22,52 @@
},
"MainWindow": {
"GLOBAL": {
"fps": "120",
"height": "1001",
"height": "1555",
"maximized": "1",
"style": "0",
"userScale": "2",
"width": "1920",
"width": "2560",
"xpos": "0",
"ypos": "34"
"ypos": "45"
}
},
"Table": {
"0x542B5671,2": {
"Column 0 Width": "391",
"Column 1 Width": "268",
"RefScale": "16"
"Column 0 Width": "493",
"Column 1 Width": "418",
"RefScale": "25"
}
},
"Window": {
"###/SmartDashboard/Arm Mech2d": {
"Collapsed": "0",
"DockId": "0x00000012,1",
"Pos": "9,39",
"Size": "6,15"
"Pos": "624,1062",
"Size": "941,493"
},
"###/SmartDashboard/Autonomous": {
"Collapsed": "0",
"DockId": "0x00000010,0",
"Pos": "17,42",
"Size": "15,3"
"Pos": "1567,1034",
"Size": "993,176"
},
"###/SmartDashboard/Field": {
"Collapsed": "0",
"DockId": "0x00000011,0",
"Pos": "9,22",
"Size": "6,15"
"Pos": "624,31",
"Size": "941,1029"
},
"###NetworkTables": {
"Collapsed": "0",
"DockId": "0x0000000F,0",
"Pos": "17,22",
"Size": "15,18"
"Pos": "1567,31",
"Size": "993,1001"
},
"###NetworkTables Settings": {
"Collapsed": "0",
"DockId": "0x0000000C,0",
"Pos": "17,47",
"Size": "15,7"
"Pos": "1567,1212",
"Size": "993,343"
},
"###Plot <0>": {
"Collapsed": "0",
Expand All @@ -78,32 +77,32 @@
"###Plot <10>": {
"Collapsed": "0",
"DockId": "0x00000008,0",
"Pos": "0,22",
"Size": "4,15"
"Pos": "0,31",
"Size": "495,765"
},
"###Plot <11>": {
"Collapsed": "0",
"DockId": "0x0000000A,0",
"Pos": "0,39",
"Size": "4,15"
"Pos": "0,798",
"Size": "501,757"
},
"###Plot <12>": {
"Collapsed": "0",
"DockId": "0x00000009,1",
"Pos": "6,22",
"Size": "1,15"
"Pos": "497,31",
"Size": "125,765"
},
"###Plot <13>": {
"Collapsed": "0",
"DockId": "0x00000008,1",
"Pos": "0,22",
"Size": "4,15"
"Pos": "0,31",
"Size": "495,765"
},
"###Plot <14>": {
"Collapsed": "0",
"DockId": "0x0000000A,1",
"Pos": "0,39",
"Size": "4,15"
"Pos": "0,798",
"Size": "501,757"
},
"###Plot <15>": {
"Collapsed": "1",
Expand All @@ -118,38 +117,53 @@
"###Plot <17>": {
"Collapsed": "0",
"DockId": "0x00000012,0",
"Pos": "9,39",
"Size": "6,15"
"Pos": "624,1062",
"Size": "941,493"
},
"###Plot <18>": {
"Collapsed": "0",
"DockId": "0x00000008,2",
"Pos": "0,22",
"Size": "4,15"
"Pos": "0,31",
"Size": "495,765"
},
"###Plot <19>": {
"Collapsed": "0",
"DockId": "0x00000009,2",
"Pos": "6,22",
"Size": "1,15"
"Pos": "497,31",
"Size": "125,765"
},
"###Plot <1>": {
"Collapsed": "0",
"DockId": "0x00000011,1",
"Pos": "9,22",
"Size": "6,15"
"Pos": "624,31",
"Size": "941,1029"
},
"###Plot <20>": {
"Collapsed": "0",
"DockId": "0x0000000A,2",
"Pos": "0,39",
"Size": "4,15"
"Pos": "0,798",
"Size": "501,757"
},
"###Plot <21>": {
"Collapsed": "0",
"DockId": "0x0000000B,2",
"Pos": "6,39",
"Size": "1,15"
"Pos": "503,798",
"Size": "119,757"
},
"###Plot <22>": {
"Collapsed": "0",
"Pos": "60,60",
"Size": "770,830"
},
"###Plot <23>": {
"Collapsed": "0",
"Pos": "840,66",
"Size": "718,822"
},
"###Plot <24>": {
"Collapsed": "0",
"Pos": "112,926",
"Size": "1494,619"
},
"###Plot <2>": {
"Collapsed": "0",
Expand All @@ -164,8 +178,8 @@
"###Plot <4>": {
"Collapsed": "0",
"DockId": "0x0000000B,1",
"Pos": "6,39",
"Size": "1,15"
"Pos": "503,798",
"Size": "119,757"
},
"###Plot <5>": {
"Collapsed": "0",
Expand All @@ -180,14 +194,14 @@
"###Plot <7>": {
"Collapsed": "0",
"DockId": "0x00000009,0",
"Pos": "6,22",
"Size": "1,15"
"Pos": "497,31",
"Size": "125,765"
},
"###Plot <8>": {
"Collapsed": "0",
"DockId": "0x0000000B,0",
"Pos": "6,39",
"Size": "1,15"
"Pos": "503,798",
"Size": "119,757"
},
"###Plot <9>": {
"Collapsed": "0",
Expand All @@ -201,8 +215,8 @@
},
"DockSpaceViewport_11111111": {
"Collapsed": "0",
"Pos": "0,22",
"Size": "32,32"
"Pos": "0,31",
"Size": "2560,1524"
}
}
}
Loading