Skip to content

Json config #103

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

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Json config #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
257ae94
Changes ids to match real robot
honzikschenk Feb 17, 2024
65408d7
Merge branch 'main' into scoring-real-integration
honzikschenk Feb 17, 2024
14d3032
Adds configurable feedforward and motion profiling to test mode
honzikschenk Feb 17, 2024
cb60f78
Fixes formating issues
honzikschenk Feb 17, 2024
cfdda87
Integration progress - Saturday
honzikschenk Feb 18, 2024
96ca309
Integration progress - Sunday
honzikschenk Feb 19, 2024
a108014
Integration work - Monday
honzikschenk Feb 20, 2024
153674c
Merge branch 'main' into scoring-real-integration
honzikschenk Feb 20, 2024
8f47901
Adds setpoint clamps and redundancy to aimer
honzikschenk Feb 20, 2024
bacc499
in progress gamepads/joysticks
wrob3rts Feb 11, 2024
4deee53
triggers done!
wrob3rts Feb 11, 2024
8202734
first draft done, needs to be tested!
wrob3rts Feb 11, 2024
557cb7d
appears to be driving with simjoysticks although will need gamepad to…
minhnguyenbhs Feb 13, 2024
15828eb
fixed merge things
minhnguyenbhs Feb 13, 2024
dde73c3
merged with commit stuff, added comments
wrob3rts Feb 14, 2024
c869fc2
is this what you were looking for in singlecontrollertestmode?
wrob3rts Feb 15, 2024
8aa3956
format
wrob3rts Feb 15, 2024
81540e5
warnings added!
Feb 16, 2024
6a4ecb7
fixed after merge(?)
Feb 20, 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
105 changes: 93 additions & 12 deletions advantagescope-configs/scope-layout/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{
"hubs": [
{
"x": 133,
"y": 35,
"x": 119,
"y": 14,
"width": 1100,
"height": 650,
"height": 560,
"state": {
"sidebar": {
"width": 300,
"expanded": [
"/AdvantageKit",
"/AdvantageKit/RealOutputs",
"/AdvantageKit/telemetry",
"/AdvantageKit/scoring",
"/telemetry",
"/RealOutputs",
"/AdvantageKit/RealOutputs/scoring",
"/telemetry/Pose3d",
"/telemetry/Pose3d/translation",
"/AdvantageKit/RealOutputs/endgame"
"/AdvantageKit/RealOutputs/endgame",
"/AdvantageKit/intake",
"/AdvantageKit/RealOutputs/Scoring"
]
},
"tabs": {
Expand All @@ -37,7 +38,66 @@
"type": null,
"factor": 1
},
"fields": []
"fields": [
{
"key": "NT:/AdvantageKit/endgame/Position",
"color": "#2b66a2",
"show": true
}
]
},
"discrete": {
"fields": [
{
"key": "NT:/AdvantageKit/RealOutputs/scoring/State",
"color": "#e5b31b",
"show": true
}
]
},
"right": {
"lockedRange": null,
"unitConversion": {
"type": null,
"factor": 1
},
"fields": [
{
"key": "NT:/AdvantageKit/RealOutputs/Scoring/elevatorLimit",
"color": "#af2437",
"show": true
},
{
"key": "NT:/AdvantageKit/scoring/aimer/AimAngleRad",
"color": "#80588e",
"show": true
}
]
}
},
"title": "Line Graph"
},
{
"type": 1,
"legends": {
"left": {
"lockedRange": null,
"unitConversion": {
"type": null,
"factor": 1
},
"fields": [
{
"key": "NT:/AdvantageKit/scoring/aimer/AimAngleRad",
"color": "#2b66a2",
"show": true
},
{
"key": "NT:/AdvantageKit/scoring/aimer/AimGoalAngleRad",
"color": "#e5b31b",
"show": true
}
]
},
"discrete": {
"fields": []
Expand All @@ -53,6 +113,27 @@
},
"title": "Line Graph"
},
{
"type": 8,
"uuid": "h88lmidg3e3b5f0d0ni8y5fo0ud1a1zn",
"fields": [],
"listFields": [],
"options": {
"ids": [
0,
1,
2
],
"layouts": [
"None",
"None",
"Xbox Controller (Blue)"
]
},
"configHidden": false,
"visualizer": null,
"title": "Joysticks"
},
{
"type": 6,
"uuid": "q06ytxmrkaenac0ijl343nag2sax99il",
Expand Down Expand Up @@ -98,14 +179,14 @@
"cameraIndex": -1,
"orbitFov": 50,
"cameraPosition": [
1.4695761589768194e-15,
5.999999999999987,
-11.999999999999964
10.102714356287965,
0.26622930405943956,
-2.8352716372526316
],
"cameraTarget": [
0,
0.5,
0
1.619835703195438,
-0.10624782552698095,
-5.541832675475496
]
},
"title": "3D Field"
Expand Down
7 changes: 7 additions & 0 deletions simgui-ds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,13 @@
"robotJoysticks": [
{
"guid": "Keyboard0"
},
{
"guid": "Keyboard2"
},
{
"guid": "78696e70757401000000000000000000",
"useGamepad": true
}
]
}
1 change: 1 addition & 0 deletions simgui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"/SmartDashboard/Module 2": "Mechanism2d",
"/SmartDashboard/Module 3": "Mechanism2d",
"/SmartDashboard/PhotonSimField": "Field2d",
"/SmartDashboard/Test Mode Chooser": "String Chooser",
"/SmartDashboard/VisionSystemSim-main/Sim Field": "Field2d"
},
"windows": {
Expand Down
81 changes: 81 additions & 0 deletions src/main/deploy/controllerconfig/SimJoysticks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"controllers": [
{
"port": 0,
"type": "joystick"
},
{
"port": 1,
"type": "joystick"
}
],

"buttons": [
{ "command": "intake",
"controller": 0,
"button": "1"
},
{
"command": "aimSpeaker",
"controller": 0,
"button": "2"
},
{
"command": "aimAmp",
"controller": 0,
"button": "3"
},
{
"command": "manualIdle",
"controller": 0,
"button": "4"
},
{
"command": "align",
"controller": 1,
"button": "1"
},
{
"command": "shoot",
"controller": 1,
"button": "2"
},
{

"command": "endgame",
"controller": 1,
"button": "3"
},
{
"command": "toggleAlign",
"controller": 1,
"button": "4"
}
],

"axes": [
{ "command": "xDrive",
"controller": 0,
"axis": "yAxis",
"negate": true
},
{
"command": "yDrive",
"controller": 0,
"axis": "xAxis",
"negate": true
},
{
"command": "rotation",
"controller": 1,
"axis": "xAxis",
"negate": true
}
],

"pov": [
{ "command": "pov",
"controller": 0
}
]
}
87 changes: 87 additions & 0 deletions src/main/deploy/controllerconfig/SingleController.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
{
"controllers": [
{
"port": 2,
"type": "gamepad"
}
],

"buttons": [
{ "command": "intake",
"controller": 2,
"button": "a"
},
{
"command": "aimSpeaker",
"controller": 2,
"button": "b"
},
{
"command": "aimAmp",
"controller": 2,
"button": "back"
},
{
"command": "stopIntake",
"controller": 2,
"button": "start"
},
{
"command": "align",
"controller": 2,
"button": "rightBumper"
},
{
"command": "shoot",
"controller": 2,
"button": "x"
},
{

"command": "endgame",
"controller": 2,
"button": "y"
},
{
"command": "fieldRelative",
"controller": 2,
"button": "leftBumper"
},
{
"command": "endgame1",
"controller": 2,
"button": "pov0"
},
{
"command": "endgame2",
"controller": 2,
"button": "pov180"
}
],

"axes": [
{ "command": "xDrive",
"controller": 2,
"axis": "leftY",
"negate": false
},
{
"command": "yDrive",
"controller": 2,
"axis": "leftX",
"negate": false
},
{
"command": "rotation",
"controller": 2,
"axis": "rightX",
"negate": true
}
],

"pov": [
{ "command": "pov",
"controller": 2
}
]
}
Loading