Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions simgui-ds.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"Keyboard 0 Settings": {
"Joysticks": {
"window": {
"visible": true
"visible": false
}
},
"keyboardJoysticks": [
{
"axisConfig": [
{
"decKey": 65,
"incKey": 68
},
{
Expand All @@ -29,10 +28,11 @@
"axisCount": 5,
"buttonCount": 4,
"buttonKeys": [
90,
65,
88,
67,
86
86,
-1
],
"povConfig": [
{
Expand Down
87 changes: 82 additions & 5 deletions simgui.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{
"HALProvider": {
"DIO": {
"window": {
"visible": true
}
},
"Other Devices": {
"SPARK MAX [1] RELATIVE ENCODER": {
"header": {
"open": true
}
},
"SPARK MAX [2]": {
"header": {
"open": true
Expand All @@ -21,6 +31,16 @@
"open": true
}
},
"Talon FX (v6)[10]": {
"header": {
"open": true
}
},
"Talon FX (v6)[12]": {
"header": {
"open": true
}
},
"Talon FX (v6)[2]/Rotor Sensor": {
"header": {
"open": true
Expand Down Expand Up @@ -51,15 +71,43 @@
"open": true
}
}
},
"RoboRIO": {
"6V Rail": {
"open": true
},
"RoboRIO Input": {
"open": true
}
}
},
"NTProvider": {
"types": {
"/FMSInfo": "FMSInfo",
"/LiveWindow/SwerveSubsystem": "Subsystem",
"/LiveWindow/Ungrouped/DigitalInput[0]": "Digital Input",
"/LiveWindow/Ungrouped/DigitalInput[3]": "Digital Input",
"/LiveWindow/Ungrouped/PIDController[12]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[13]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[1]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[2]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[3]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[4]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[5]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[6]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[7]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[8]": "PIDController",
"/LiveWindow/Ungrouped/Pigeon 2 [13]": "Gyro",
"/LiveWindow/Ungrouped/Scheduler": "Scheduler",
"/LiveWindow/Ungrouped/Talon FX (v6) [10]": "Motor Controller",
"/LiveWindow/Ungrouped/Talon FX (v6) [11]": "Motor Controller",
"/LiveWindow/Ungrouped/Talon SRX [13]": "Motor Controller",
"/LiveWindow/Ungrouped/Victor SPX [14]": "Motor Controller",
"/Shuffleboard/Autonomous/Choose Autonomous Routine": "String Chooser",
"/Shuffleboard/Joint Subsystem/Closed Loop Command": "Command",
"/Shuffleboard/Joint Subsystem/Update Controllers Parameters Command": "Command",
"/SmartDashboard/ADXRS450_Gyro[0]": "Gyro",
"/SmartDashboard/Alerts": "Alerts",
"/SmartDashboard/Encoders": "Alerts",
"/SmartDashboard/Field": "Field2d",
"/SmartDashboard/IMU": "Alerts",
Expand Down Expand Up @@ -118,22 +166,51 @@
}
},
"NetworkTables": {
"retained": {
"Shuffleboard": {
"Main": {
"open": true
},
"open": true
}
},
"transitory": {
"FMSInfo": {
"open": true
},
"SmartDashboard": {
"Field": {
"Joint Subsystem": {
"Absolute Encoder": {
"open": true
},
"open": true
},
"open": true,
"swerve": {
"open": true
}
"open": true
}
}
},
"NetworkTables Info": {
"Clients": {
"open": true
},
"Connections": {
"open": true
},
"Server": {
"Subscribers": {
"open": true
},
"open": true
},
"shuffleboard@1": {
"Publishers": {
"open": true
},
"Subscribers": {
"open": true
},
"open": true
},
"visible": true
}
}
12 changes: 6 additions & 6 deletions src/main/deploy/swerve/modules/backleft.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"location": {
"front": -10.531,
"left": 10.531
"front": 10.531,
"left": -10.531
},
"absoluteEncoderOffset": 82,
"absoluteEncoderOffset": -214,
"drive": {
"type": "sparkmax_neo",
"id": 7,
"id": 3,
"canbus": null
},
"inverted": {
Expand All @@ -15,12 +15,12 @@
},
"angle": {
"type": "sparkmax_neo",
"id": 9,
"id": 2,
"canbus": null
},
"encoder": {
"type": "ma3",
"id": 3,
"id": 0,
"canbus": null
},
"absoluteEncoderInverted": true
Expand Down
14 changes: 7 additions & 7 deletions src/main/deploy/swerve/modules/backright.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"location": {
"front": -10.531,
"left": -10.531
"front": 10.531,
"left": 10.531
},
"absoluteEncoderOffset": 148.7,
"absoluteEncoderOffset": -289,
"drive": {
"type": "sparkmax_neo",
"id": 5,
"id": 1,
"canbus": null
},
"inverted": {
"drive": false,
"drive": true,
"angle": false
},
"angle": {
"type": "sparkmax_neo",
"id": 6,
"id": 4,
"canbus": null
},
"encoder": {
"type": "ma3",
"id": 2,
"id": 1,
"canbus": null
},
"absoluteEncoderInverted": true
Expand Down
14 changes: 7 additions & 7 deletions src/main/deploy/swerve/modules/frontleft.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"location": {
"front": 10.531,
"left": 10.531
"front": -10.531,
"left": -10.531
},
"absoluteEncoderOffset": 251.0,
"absoluteEncoderOffset": -91,
"drive": {
"type": "sparkmax_neo",
"id": 1,
"id": 5,
"canbus": null
},
"inverted": {
"drive": false,
"drive": true,
"angle": false
},
"angle": {
"type": "sparkmax_neo",
"id": 4,
"id": 6,
"canbus": null
},
"encoder": {
"type": "ma3",
"id": 1,
"id": 2,
"canbus": null
},
"absoluteEncoderInverted": true
Expand Down
14 changes: 7 additions & 7 deletions src/main/deploy/swerve/modules/frontright.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"location": {
"front": 10.531,
"left": -10.531
"front": -10.531,
"left": 10.531
},
"absoluteEncoderOffset": 329.1,
"absoluteEncoderOffset": -270,
"drive": {
"type": "sparkmax_neo",
"id": 3,
"id": 7,
"canbus": null
},
"inverted": {
"drive": false,
"drive": true,
"angle": false
},
"angle": {
"type": "sparkmax_neo",
"id": 2,
"id": 9,
"canbus": null
},
"encoder": {
"type": "ma3",
"id": 0,
"id": 3,
"canbus": null
},
"absoluteEncoderInverted": true
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/swerve/modules/pidfproperties.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"iz": 0
},
"angle": {
"p": 0.015,
"p": 0.025,
"i": 0,
"d": 0.2,
"f": 0,
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/swerve/swervedrive.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"imu": {
"type": "navx_usb",
"id": 0,
"type": "pigeon",
"id": 19,
"canbus": null
},
"invertedIMU": false,
Expand Down
Loading