Skip to content

Commit

Permalink
Merge branch 'main' into no-dameon-build
Browse files Browse the repository at this point in the history
  • Loading branch information
a1cd authored Feb 28, 2024
2 parents 0988891 + dc7e386 commit 97454b6
Show file tree
Hide file tree
Showing 38 changed files with 893 additions and 363 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,5 @@ src/main/java/frc/robot/BuildConstants.java
# Network Tables and similar logs
networktables.json
logs/
.sysid/
.sysid/
/.outlineviewer/outlineviewer-window.json
9 changes: 9 additions & 0 deletions .outlineviewer/outlineviewer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Connections": {
"open": true
},
"NetworkTables Settings": {
"mode": "Client (NT4)",
"serverTeam": "6502"
}
}
14 changes: 14 additions & 0 deletions .pathplanner/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"robotWidth": 0.85,
"robotLength": 0.85,
"holonomicMode": true,
"pathFolders": [
"choreo"
],
"autoFolders": [],
"defaultMaxVel": 4.0,
"defaultMaxAccel": 79.0,
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"maxModuleSpeed": 4.5
}
22 changes: 22 additions & 0 deletions RobotControls.rtf
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{\rtf1\ansi\ansicpg1252\cocoartf2759
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
{\*\expandedcolortbl;;}
\margl1440\margr1440\vieww11520\viewh8400\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0

\f0\fs24 \cf0 DriverController - Left Joystick: drive motors\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
\cf0 DriverController - Right Joystick: turn motors\
DriverController - Right Trigger: Shoot/Dump\
DriverController - Left Trigger: Intake\
\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\'96\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
\cf0 OperatorController - Left Joystick: Left Climb\
OperatorController - Right Joystick: Right Climb\
OperatorController - Y Button: Speaker Mode\
OperatorController - B Button: Amp Mode\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
\cf0 OperatorController - A Button: Neutral Mode\
OperatorController - Right Trigger: Start Auto Aim\
}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.1.1"
id "edu.wpi.first.GradleRIO" version "2024.3.1"
id "com.peterabeles.gversion" version "1.10"
id "com.diffplug.spotless" version "6.12.0"
}
Expand Down Expand Up @@ -150,7 +150,7 @@ spotless {
exclude "**/build/**", "**/build-*/**"
}
toggleOffOn()
googleJavaFormat()
// googleJavaFormat()
removeUnusedImports()
trimTrailingWhitespace()
endWithNewline()
Expand Down
Loading

0 comments on commit 97454b6

Please sign in to comment.