Skip to content

Changes for/from battlecry #191

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 14 commits into from
Jun 5, 2023
Merged

Changes for/from battlecry #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9b88ead
adjust 3 piece wire autons
Jun 3, 2023
aa5ba65
implement button for X mode
Jun 3, 2023
7f3968d
changed shoulder settings
Jun 3, 2023
e0698a7
Fix remote and local ports for limelights
Jun 3, 2023
7648a77
changed 2 piece dock bump
Jun 3, 2023
a35e05e
add intake acquire for cone/cube mid
Jun 4, 2023
c12fad9
change default auton to 2 piece dock wire
Jun 4, 2023
574fe48
Fix IntakeAcquireColyi
Jun 4, 2023
40d5e9b
Changed mid tip in back shoulder! >w<
Jun 4, 2023
f9447c2
Fix 2 piece + dock auton pickup... uwu
Jun 4, 2023
9706eb9
Add comments for when autons were run
Jun 4, 2023
167b741
Set default auto to two piece dock red
Jun 4, 2023
79ce603
fix 2 piece dock blue auton
Jun 4, 2023
ab3f4f0
Remove auton run comments from robotcontainer
Jun 5, 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
12 changes: 6 additions & 6 deletions .DataLogTool/datalogtool-window.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"MainWindow": {
"GLOBAL": {
"fps": "120",
"height": "637",
"maximized": "0",
"height": "1001",
"maximized": "1",
"style": "0",
"userScale": "2",
"width": "1156",
"xpos": "208",
"ypos": "69"
"width": "1920",
"xpos": "0",
"ypos": "29"
}
},
"Window": {
Expand All @@ -19,7 +19,7 @@
},
"Download": {
"Collapsed": "0",
"Pos": "0,312",
"Pos": "2,313",
"Size": "468,325"
},
"Entries": {
Expand Down
2 changes: 1 addition & 1 deletion .DataLogTool/datalogtool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"download": {
"localDir": "C:\\Users\\StuyPulse\\Desktop\\Jim\\logs",
"localDir": "C:\\Users\\StuyPulse\\Desktop\\champs-logs",
"serverTeam": "694"
}
}
112 changes: 54 additions & 58 deletions .Glass/glass-window.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
{
"Docking": {
"Data": [
"DockSpace ID=0x8B93E3BD Window=0xA787BDB4 Pos=0,25 Size=1920,1021 Split=X Selected=0xC98BB475",
"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",
"DockNode ID=0x00000001 Parent=0x00000002 SizeRef=1102,213 Split=Y",
"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=605,190 Selected=0x2395FA29",
"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=599,188 Selected=0xD2C348FC",
"DockNode ID=0x00000007 Parent=0x00000002 SizeRef=177,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=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=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",
Expand All @@ -25,7 +23,7 @@
"MainWindow": {
"GLOBAL": {
"fps": "120",
"height": "1046",
"height": "1001",
"maximized": "1",
"style": "0",
"userScale": "2",
Expand All @@ -36,7 +34,7 @@
},
"Table": {
"0x542B5671,2": {
"Column 0 Width": "384",
"Column 0 Width": "391",
"Column 1 Width": "268",
"RefScale": "16"
}
Expand All @@ -45,68 +43,67 @@
"###/SmartDashboard/Arm Mech2d": {
"Collapsed": "0",
"DockId": "0x00000012,1",
"Pos": "1104,553",
"Size": "177,493"
"Pos": "9,39",
"Size": "6,15"
},
"###/SmartDashboard/Autonomous": {
"Collapsed": "0",
"DockId": "0x00000010,0",
"Pos": "1283,697",
"Size": "637,118"
"Pos": "17,42",
"Size": "15,3"
},
"###/SmartDashboard/Field": {
"Collapsed": "0",
"DockId": "0x0000000D,2",
"Pos": "1104,25",
"Size": "177,492"
"DockId": "0x00000011,0",
"Pos": "9,22",
"Size": "6,15"
},
"###NetworkTables": {
"Collapsed": "0",
"DockId": "0x0000000F,0",
"Pos": "1283,25",
"Size": "637,670"
"Pos": "17,22",
"Size": "15,18"
},
"###NetworkTables Settings": {
"Collapsed": "0",
"DockId": "0x0000000C,0",
"Pos": "1283,817",
"Size": "637,229"
"Pos": "17,47",
"Size": "15,7"
},
"###Plot <0>": {
"Collapsed": "0",
"DockId": "0x0000000D,0",
"Pos": "1104,25",
"Size": "177,492"
"Pos": "-12,19",
"Size": "657,484"
},
"###Plot <10>": {
"Collapsed": "0",
"DockId": "0x00000008,0",
"Pos": "0,25",
"Size": "495,512"
"Pos": "0,22",
"Size": "4,15"
},
"###Plot <11>": {
"Collapsed": "0",
"DockId": "0x0000000A,0",
"Pos": "0,539",
"Size": "501,507"
"Pos": "0,39",
"Size": "4,15"
},
"###Plot <12>": {
"Collapsed": "0",
"DockId": "0x00000009,1",
"Pos": "497,25",
"Size": "605,512"
"Pos": "6,22",
"Size": "1,15"
},
"###Plot <13>": {
"Collapsed": "0",
"DockId": "0x00000008,1",
"Pos": "0,25",
"Size": "495,512"
"Pos": "0,22",
"Size": "4,15"
},
"###Plot <14>": {
"Collapsed": "0",
"DockId": "0x0000000A,1",
"Pos": "0,539",
"Size": "501,507"
"Pos": "0,39",
"Size": "4,15"
},
"###Plot <15>": {
"Collapsed": "1",
Expand All @@ -115,45 +112,44 @@
},
"###Plot <16>": {
"Collapsed": "0",
"DockId": "0x0000000D,1",
"Pos": "1104,25",
"Size": "177,492"
"Pos": "-17,29",
"Size": "657,484"
},
"###Plot <17>": {
"Collapsed": "0",
"DockId": "0x00000012,0",
"Pos": "1104,553",
"Size": "177,493"
"Pos": "9,39",
"Size": "6,15"
},
"###Plot <18>": {
"Collapsed": "0",
"DockId": "0x00000008,2",
"Pos": "0,25",
"Size": "495,512"
"Pos": "0,22",
"Size": "4,15"
},
"###Plot <19>": {
"Collapsed": "0",
"DockId": "0x00000009,2",
"Pos": "497,25",
"Size": "605,512"
"Pos": "6,22",
"Size": "1,15"
},
"###Plot <1>": {
"Collapsed": "0",
"DockId": "0x0000000E,0",
"Pos": "1104,519",
"Size": "177,32"
"DockId": "0x00000011,1",
"Pos": "9,22",
"Size": "6,15"
},
"###Plot <20>": {
"Collapsed": "0",
"DockId": "0x0000000A,2",
"Pos": "0,539",
"Size": "501,507"
"Pos": "0,39",
"Size": "4,15"
},
"###Plot <21>": {
"Collapsed": "0",
"DockId": "0x0000000B,2",
"Pos": "503,539",
"Size": "599,507"
"Pos": "6,39",
"Size": "1,15"
},
"###Plot <2>": {
"Collapsed": "0",
Expand All @@ -168,8 +164,8 @@
"###Plot <4>": {
"Collapsed": "0",
"DockId": "0x0000000B,1",
"Pos": "503,539",
"Size": "599,507"
"Pos": "6,39",
"Size": "1,15"
},
"###Plot <5>": {
"Collapsed": "0",
Expand All @@ -184,14 +180,14 @@
"###Plot <7>": {
"Collapsed": "0",
"DockId": "0x00000009,0",
"Pos": "497,25",
"Size": "605,512"
"Pos": "6,22",
"Size": "1,15"
},
"###Plot <8>": {
"Collapsed": "0",
"DockId": "0x0000000B,0",
"Pos": "503,539",
"Size": "599,507"
"Pos": "6,39",
"Size": "1,15"
},
"###Plot <9>": {
"Collapsed": "0",
Expand All @@ -205,8 +201,8 @@
},
"DockSpaceViewport_11111111": {
"Collapsed": "0",
"Pos": "0,25",
"Size": "1920,1021"
"Pos": "0,22",
"Size": "32,32"
}
}
}
Loading