Skip to content

Commit

Permalink
Add editorconfig for 2 line indent, clean up files, actually use Mono…
Browse files Browse the repository at this point in the history
…logue for the entire robot (not done in unused classes, e.g. MecanumDrive), collision avoidance (don't do anything in cases of a collision), 3D positions for elevator and intake 👀.

Note: I added wpilog files to the gitignore because those files can get large. I accidentally added some log files to a commit and I had to undo those commits since the logs exceeded the Github 100mb max.
  • Loading branch information
jpothen8 committed Dec 4, 2023
1 parent 05e85cc commit 3e9fa1e
Show file tree
Hide file tree
Showing 71 changed files with 12,005 additions and 11,861 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[{*.kt,*.kts}]
indent_size=2
max_line_length=200
ij_kotlin_packages_to_use_import_on_demand = unset
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,5 @@ out/

# Simulation GUI and other tools window save file
*-window.json

*.wpilog
9 changes: 9 additions & 0 deletions simgui-ds.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,14 @@
"buttonCount": 0,
"povCount": 0
}
],
"robotJoysticks": [
{
"guid": "Keyboard0"
},
{
"guid": "78696e70757401000000000000000000",
"useGamepad": true
}
]
}
62 changes: 58 additions & 4 deletions simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@
"/LiveWindow/Ungrouped/PIDController[16]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[17]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[18]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[19]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[1]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[20]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[21]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[22]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[23]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[24]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[2]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[3]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[4]": "PIDController",
Expand All @@ -25,18 +31,31 @@
"/LiveWindow/Ungrouped/PIDController[8]": "PIDController",
"/LiveWindow/Ungrouped/PIDController[9]": "PIDController",
"/LiveWindow/Ungrouped/navX-Sensor[1]": "Gyro",
"/Monologuing/robot/elevator/mech": "Mechanism2d",
"/SmartDashboard/Command Scheduler": "Scheduler",
"/SmartDashboard/Elevator Visual": "Mechanism2d",
"/SmartDashboard/Field": "Field2d",
"/SmartDashboard/Routine Chooser": "String Chooser"
},
"windows": {
"/SmartDashboard/Command Scheduler": {
"window": {
"visible": true
}
},
"/SmartDashboard/Elevator Visual": {
"window": {
"visible": true
}
},
"/SmartDashboard/Field": {
"bottom": 544,
"builtin": "2023 Charged Up",
"height": 8.013679504394531,
"left": 46,
"right": 1088,
"top": 36,
"width": 16.541748046875,
"window": {
"visible": true
}
Expand All @@ -49,18 +68,53 @@
}
},
"NetworkTables": {
"Persistent Values": {
"open": false
},
"Retained Values": {
"open": false
},
"transitory": {
"Intake": {
"open": true
"Monologuing": {
"open": true,
"robot": {
"drive": {
"double[]##v_/Monologuing/robot/drive/Current Chassis Speeds": {
"open": true
},
"double[]##v_/Monologuing/robot/drive/Estimated Pose": {
"open": true
}
},
"elevator": {
"open": true
},
"intake": {
"open": true
},
"open": true
}
},
"Shuffleboard": {
"Robot": {
"Elevator": {
"SwerveSim": {
"BLModule": {
"BLDrive": {
"open": true
},
"BLTurn": {
"BLTurnEnc": {
"open": true
},
"open": true
},
"open": true
},
"open": true
},
"open": true
},
"SmartDashboard": {
"open": true
}
}
},
Expand Down
Loading

0 comments on commit 3e9fa1e

Please sign in to comment.