Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9d241a1
begin implementing intake
cobouch Jan 29, 2026
c014828
Fleshed out `@LazySingleton` annotation + processor
cobouch Jan 30, 2026
869ee22
Refactor intake constants & sim
cobouch Jan 30, 2026
c6bce6e
Decide on logged inputs for the intake
cobouch Jan 30, 2026
fb27173
Write basic intake subsystem
cobouch Jan 30, 2026
dab197f
Ran formatter :/
cobouch Jan 30, 2026
4a8b524
Add basic maple-sim intake simulation
cobouch Jan 31, 2026
0a6b57f
Merge branch 'main' into intake-code
cobouch Jan 31, 2026
3c5fd54
Split intake (hopper extension) from rollers for simplicity
cobouch Feb 1, 2026
a53b510
Add LEDs 💯
cobouch Feb 1, 2026
a55999c
Instantiate new subsystems in RobotContainer
cobouch Feb 1, 2026
87153de
Reduce number of imports for readability
cobouch Feb 1, 2026
195388f
Switch to using the LEDPattern API
cobouch Feb 1, 2026
b44dfed
Fleshed out roller subsystem, added git hook to run Spotless before c…
cobouch Feb 1, 2026
b445219
WORKING INTAKE SIMULATION 😄
cobouch Feb 5, 2026
162f2c2
Added generic beambreak IO implementations, began work on tuning driv…
cobouch Feb 6, 2026
09a60b0
Added better docs for beam break IO layers
cobouch Feb 6, 2026
ec58089
Various simulation fixes
cobouch Feb 7, 2026
c6d04a3
Fixed drive jitter and issues during sim (maybe?)
cobouch Feb 7, 2026
27d5168
Initial shooter implementation + simulation
cobouch Feb 10, 2026
8c279bb
Added simulation of game pieces, intaking & shooting
cobouch Feb 12, 2026
07d4e75
Fixed fuel simulation
cobouch Feb 13, 2026
6b4fc52
Begin implementing commands
cobouch Feb 15, 2026
11123ad
Added magnus effect & bouncing for fuel simulations
cobouch Feb 16, 2026
1fb76a9
real, driving? robot
cobouch Feb 27, 2026
99973d4
practice field day 1
cobouch Feb 27, 2026
9db368d
FInished shooter maps, started on intaking
cobouch Feb 28, 2026
0d107d6
Fix hood PID kD
cobouch Mar 1, 2026
b79c45a
preemptive new code for practice field
cobouch Mar 2, 2026
6f43b0f
(UNTESTED) Moved statussignal refreshes to one place
cobouch Mar 4, 2026
e4eac82
Practice field on 3/4
cobouch Mar 5, 2026
082c697
Practice field updates up to 3/10
cobouch Mar 11, 2026
8812432
practice field changes 3/14
cobouch Mar 15, 2026
9d8593d
made the trench auto work
cobouch Mar 16, 2026
5921dfd
Final updates before URI
cobouch Mar 19, 2026
36c07aa
Qual 10 log file
demiandk Mar 20, 2026
2f9edb8
Merge branch 'subsystem-code' of https://github.com/SalemRobotics/202…
demiandk Mar 20, 2026
cd37ab9
Qual 13 log file
demiandk Mar 20, 2026
f38a8a3
Qual 21 log file
demiandk Mar 20, 2026
04aa0c9
Improvements for URI quals
cobouch Mar 21, 2026
b29c037
Rest of URI log files
demiandk Mar 21, 2026
79b0ca6
Final URI code
cobouch Mar 21, 2026
3b81548
Merge branch 'subsystem-code' of https://github.com/SalemRobotics/202…
cobouch Mar 22, 2026
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
15 changes: 13 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
],
"java.test.defaultConfig": "WPIlibUnitTests",
"java.import.gradle.annotationProcessing.enabled": true,
"java.compile.nullAnalysis.nonnull": [
"javax.annotation.Nonnull",
"org.eclipse.jdt.annotation.NonNull",
"org.springframework.lang.NonNull",
"org.jspecify.annotations.NonNull",
"org.jetbrains.annotations.NotNull"
],
"java.import.gradle.wrapper.enabled": true,
"java.completion.favoriteStaticMembers": [
"org.junit.Assert.*",
"org.junit.Assume.*",
Expand All @@ -39,7 +47,9 @@
"org.mockito.Mockito.*",
"org.mockito.ArgumentMatchers.*",
"org.mockito.Answers.*",
"edu.wpi.first.units.Units.*"
"edu.wpi.first.units.Units.*",
"com.frc6324.**.*",
null
],
"java.completion.filteredTypes": [
"java.awt.*",
Expand All @@ -58,5 +68,6 @@
"edu.wpi.first.math.proto.*",
"edu.wpi.first.math.**.proto.*",
"edu.wpi.first.math.**.struct.*"
]
],
"java.debug.settings.onBuildFailureProceed": true
}
11 changes: 11 additions & 0 deletions annotations/src/main/java/com/frc6324/lib/LazySingleton.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.frc6324.lib;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/** Marks a 'singleton' class that is lazily initialized. */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.SOURCE)
public @interface LazySingleton {}
23 changes: 22 additions & 1 deletion ascope_assets/Robot_TestBot/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"position": [
0,
0,
0
0.0635
],
"cameras": [],
"components": [
Expand All @@ -30,6 +30,27 @@
"degrees": 90.0
}
],
"zeroedPosition": [
0.17145,
-0.34925,
0.06975
]
},
{
"zeroedRotations": [
{
"axis": "x",
"degrees": 90.0
},
{
"axis": "y",
"degrees": 180.0
},
{
"axis": "z",
"degrees": 180.0
}
],
"zeroedPosition": [
0,
0,
Expand Down
Binary file modified ascope_assets/Robot_TestBot/model.glb
Binary file not shown.
Binary file modified ascope_assets/Robot_TestBot/model_0.glb
Binary file not shown.
Binary file added ascope_assets/Robot_TestBot/model_1.glb
Binary file not shown.
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ deploy {
jvmArgs.add("-XX:Tier4InvocationThreshold=2500")

jvmArgs.add("-XX:+UnlockExperimentalVMOptions")
jvmArgs.add("-XX:GCTimeRatio=9")
jvmArgs.add("-XX:GCTimeRatio=5")
jvmArgs.add("-XX:+UseSerialGC")
jvmArgs.add("-XX:MaxGCPauseMillis=50")
jvmArgs.add("-XX:+TieredCompilation")
Expand Down Expand Up @@ -90,6 +90,9 @@ dependencies {
compileOnly 'org.jetbrains:annotations:26.0.2-1'

annotationProcessor project(":processor")
annotationProcessor project(":annotations")

compileOnly project(":processor")
implementation project(":annotations")

annotationProcessor wpi.java.deps.wpilibAnnotations()
Expand Down
Loading
Loading