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 Apr 4, 2024
2 parents 97454b6 + e425da8 commit e3ecbb7
Show file tree
Hide file tree
Showing 125 changed files with 89,490 additions and 1,098 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,7 @@ networktables.json
logs/
.sysid/
/.outlineviewer/outlineviewer-window.json

# Test Logging files
testLog.wpilog
/testLog_sim.wpilog
30 changes: 30 additions & 0 deletions .glass/glass-window.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"MainWindow": {
"GLOBAL": {
"height": "768",
"maximized": "0",
"style": "0",
"userScale": "2",
"width": "1024",
"xpos": "-1",
"ypos": "-1"
}
},
"Window": {
"###NetworkTables": {
"Collapsed": "0",
"Pos": "250,277",
"Size": "750,185"
},
"###NetworkTables Settings": {
"Collapsed": "0",
"Pos": "30,30",
"Size": "254,77"
},
"Debug##Default": {
"Collapsed": "0",
"Pos": "60,60",
"Size": "400,400"
}
}
}
1 change: 1 addition & 0 deletions .glass/glass.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
22 changes: 22 additions & 0 deletions .idea/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions .idea/sshConfigs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions .pathplanner/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
"robotLength": 0.85,
"holonomicMode": true,
"pathFolders": [
"New Folder",
"choreo"
],
"autoFolders": [],
"defaultMaxVel": 4.0,
"defaultMaxAccel": 79.0,
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"defaultMaxVel": 0.5,
"defaultMaxAccel": 2.5,
"defaultMaxAngVel": 521.39,
"defaultMaxAngAccel": 968.3,
"maxModuleSpeed": 4.5
}
}
24 changes: 24 additions & 0 deletions .run/Deploy FRC2024.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Deploy FRC2024" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="deploy" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
39 changes: 39 additions & 0 deletions .run/Test FRC2024.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Test FRC2024" type="GradleRunConfiguration" factoryName="Gradle" show_console_on_std_err="true">
<ExternalSystemSettings>
<option name="env">
<map>
<entry key="AKIT_LOG_PATH" value="testLog.wpilog" />
<entry key="TEST_RUN_MODE" value="true" />
<entry key="disableGUI" value="true" />
</map>
</option>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="simulateJava" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<EXTENSION ID="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension">
<extension name="coverage">
<pattern>
<option name="PATTERN" value="frc.robot.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
</EXTENSION>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
Loading

0 comments on commit e3ecbb7

Please sign in to comment.