Skip to content

Commit

Permalink
Merge branch 'main' into onTheSubjectOfRelocatingRubberHoops
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelLesirge committed Feb 29, 2024
2 parents 40ad7bb + 326c5c5 commit cdcf438
Show file tree
Hide file tree
Showing 35 changed files with 2,686 additions and 1,797 deletions.
77 changes: 38 additions & 39 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
{
"java.configuration.updateBuildConfiguration": "automatic",
"java.server.launchMode": "Standard",
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true,
"bin/": true,
"**/.classpath": true,
"**/.project": true,
"**/.settings": true,
"**/.factorypath": true,
"**/*~": true
},
"java.test.config": [
{
"name": "WPIlibUnitTests",
"workingDirectory": "${workspaceFolder}/build/jni/release",
"vmargs": [ "-Djava.library.path=${workspaceFolder}/build/jni/release" ],
"env": {
"LD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release" ,
"DYLD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release"
}
},
],
"java.test.defaultConfig": "WPIlibUnitTests",
"cSpell.words": [
"AHRS",
"Brushless",
"Deadzone",
"Odometry",
"Robo",
"setpoint",
"teleop",
"teleoperated"
]
}

"java.configuration.updateBuildConfiguration": "automatic",
"java.server.launchMode": "Standard",
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true,
"bin/": true,
"**/.classpath": true,
"**/.project": true,
"**/.settings": true,
"**/.factorypath": true,
"**/*~": true
},
"java.test.config": [
{
"name": "WPIlibUnitTests",
"workingDirectory": "${workspaceFolder}/build/jni/release",
"vmargs": [
"-Djava.library.path=${workspaceFolder}/build/jni/release"
],
"env": {
"LD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release",
"DYLD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release"
}
},
],
"java.test.defaultConfig": "WPIlibUnitTests",
// Auto Formatter
"editor.formatOnSave": true, // So you cant forget
"editor.tabSize": 4, // 4 char width indentation
"editor.detectIndentation": false, // Prevent above from being overridden
"editor.insertSpaces": false, // use tab character instead of spaces
"editor.codeActionsOnSave": {
"source.fixAll": "always"
}
}
185 changes: 160 additions & 25 deletions shuffleboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"vgap": 16.0,
"titleType": 0,
"tiles": {
"0,0": {
"4,2": {
"size": [
1,
1
Expand Down Expand Up @@ -39,24 +39,7 @@
"Colors/Color when false": "#8B0000FF"
}
},
"1,0": {
"size": [
2,
2
],
"content": {
"_type": "Gyro",
"_source0": "network_table:///SmartDashboard/Heading Degrees",
"_title": "Heading Degrees",
"_glyph": 139,
"_showGlyph": true,
"Visuals/Major tick spacing": 45.0,
"Visuals/Starting angle": 180.0,
"Visuals/Show tick mark ring": true,
"Visuals/Counter clockwise": false
}
},
"9,1": {
"9,5": {
"size": [
1,
1
Expand All @@ -69,7 +52,7 @@
"_showGlyph": false
}
},
"3,0": {
"4,0": {
"size": [
1,
2
Expand All @@ -88,7 +71,7 @@
"Visuals/Orientation": "VERTICAL"
}
},
"9,0": {
"0,0": {
"size": [
1,
1
Expand All @@ -97,11 +80,150 @@
"_type": "Boolean Box",
"_source0": "network_table:///SmartDashboard/ControlActive",
"_title": "ControlActive",
"_glyph": 148,
"_showGlyph": false,
"_glyph": 392,
"_showGlyph": true,
"Colors/Color when true": "#7CFC00FF",
"Colors/Color when false": "#8B0000FF"
}
},
"1,2": {
"size": [
2,
1
],
"content": {
"_type": "Text View",
"_source0": "network_table:///SmartDashboard/Bot Name",
"_title": "Bot Name",
"_glyph": 474,
"_showGlyph": true
}
},
"7,1": {
"size": [
1,
1
],
"content": {
"_type": "Text View",
"_source0": "network_table:///SmartDashboard/PoseX",
"_title": "PoseX",
"_glyph": 114,
"_showGlyph": true
}
},
"6,1": {
"size": [
1,
1
],
"content": {
"_type": "Text View",
"_source0": "network_table:///SmartDashboard/PoseY",
"_title": "PoseY",
"_glyph": 115,
"_showGlyph": true
}
},
"8,1": {
"size": [
1,
1
],
"content": {
"_type": "Text View",
"_source0": "network_table:///SmartDashboard/PoseDegrees",
"_title": "PoseDegrees",
"_glyph": 419,
"_showGlyph": true
}
},
"6,2": {
"size": [
3,
1
],
"content": {
"_type": "Split Button Chooser",
"_source0": "network_table:///SmartDashboard/Auto Chooser",
"_title": "Auto Chooser",
"_glyph": 167,
"_showGlyph": true
}
},
"7,0": {
"size": [
1,
1
],
"content": {
"_type": "Number Bar",
"_source0": "network_table:///SmartDashboard/SpeedX",
"_title": "SpeedX",
"_glyph": 114,
"_showGlyph": true,
"Range/Min": -1.0,
"Range/Max": 1.0,
"Range/Center": 0.0,
"Visuals/Num tick marks": 5,
"Visuals/Show text": true,
"Visuals/Orientation": "HORIZONTAL"
}
},
"6,0": {
"size": [
1,
1
],
"content": {
"_type": "Number Bar",
"_source0": "network_table:///SmartDashboard/SpeedY",
"_title": "SpeedY",
"_glyph": 115,
"_showGlyph": true,
"Range/Min": -1.0,
"Range/Max": 1.0,
"Range/Center": 0.0,
"Visuals/Num tick marks": 5,
"Visuals/Show text": true,
"Visuals/Orientation": "HORIZONTAL"
}
},
"8,0": {
"size": [
1,
1
],
"content": {
"_type": "Number Bar",
"_source0": "network_table:///SmartDashboard/Spin",
"_title": "Spin",
"_glyph": 419,
"_showGlyph": true,
"Range/Min": -1.0,
"Range/Max": 1.0,
"Range/Center": 0.0,
"Visuals/Num tick marks": 5,
"Visuals/Show text": true,
"Visuals/Orientation": "HORIZONTAL"
}
},
"1,0": {
"size": [
2,
2
],
"content": {
"_type": "Gyro",
"_source0": "network_table:///SmartDashboard/Heading Degrees",
"_title": "Heading Degrees",
"_glyph": 148,
"_showGlyph": false,
"Visuals/Major tick spacing": 45.0,
"Visuals/Starting angle": 180.0,
"Visuals/Show tick mark ring": true,
"Visuals/Counter clockwise": false
}
}
}
}
Expand All @@ -118,12 +240,25 @@
"titleType": 0,
"tiles": {}
}
},
{
"title": "Tab 3",
"autoPopulate": false,
"autoPopulatePrefix": "",
"widgetPane": {
"gridSize": 128.0,
"showGrid": true,
"hgap": 16.0,
"vgap": 16.0,
"titleType": 0,
"tiles": {}
}
}
],
"windowGeometry": {
"x": -7.199999809265137,
"y": -7.199999809265137,
"width": 1550.4000244140625,
"height": 830.4000244140625
"width": 1551.199951171875,
"height": 831.2000122070312
}
}
15 changes: 11 additions & 4 deletions simgui.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
{
"NTProvider": {
"types": {
"/FMSInfo": "FMSInfo"
"/FMSInfo": "FMSInfo",
"/SmartDashboard/Auto Chooser": "String Chooser",
"/SmartDashboard/SendableChooser[0]": "String Chooser"
}
},
"NetworkTables": {
"Transitory Values": {
"open": false
}
},
"NetworkTables Info": {
"Connections": {
"open": true
},
"Server": {
"open": true
},
"visible": true
},
"NetworkTables View": {
"visible": false
}
}
Loading

0 comments on commit cdcf438

Please sign in to comment.