Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
c6d9c7d
Add Climbing.java
espmancer Jan 15, 2022
f4050d8
Merge branch 'master' into climbing
Jan 18, 2022
6970b43
changed Climbing.java
espmancer Jan 18, 2022
ebe30f5
Update Climbing.java
espmancer Jan 19, 2022
75e6903
Refactor LoggableTimer to accept name
espmancer Jan 21, 2022
d5138db
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
espmancer Jan 21, 2022
ed360cf
Implement timer and cycle algorithm
espmancer Jan 21, 2022
b7a0dc9
Add ClimbingSensors class
espmancer Jan 21, 2022
91f05a3
Implement ClimbingSensors
espmancer Jan 21, 2022
b91979b
Add climberEnabled
espmancer Jan 21, 2022
0636f20
Declared climbing variables
HungryIronApple Jan 22, 2022
eca328d
Added setPower method
HungryIronApple Jan 22, 2022
2261878
Add climber controls
HungryIronApple Jan 22, 2022
cbbb8af
Merge branch 'master' into climbing
dracco1993 Jan 24, 2022
5dfdd72
Merge branch 'master' into climbing
dracco1993 Jan 29, 2022
6fe4207
Merge branch 'master' into climbing
TheBitEffect Feb 5, 2022
fd60b36
Merge branch 'master' into climbing
TheBitEffect Feb 5, 2022
95eab83
Merge branch 'master' into climbing
TheBitEffect Feb 5, 2022
0dfb898
Merge branch 'master' into climbing
dracco1993 Feb 18, 2022
e432045
LoggableTimer formatting
dracco1993 Feb 19, 2022
801fc33
Climbing -> Climber and ClimbingSensors -> ClimberSensors
dracco1993 Feb 19, 2022
187354a
More auto formatting
dracco1993 Feb 19, 2022
5b9cd23
Move to passing the Solenoids into the climber
dracco1993 Feb 19, 2022
bf2571c
Add temporary manual climber driver controls
dracco1993 Feb 19, 2022
40ea3cc
Test Climber Controls
rar1741programmer Feb 19, 2022
a56be21
Fix possibly missing break statements in climber
TheBitEffect Feb 19, 2022
42b8a1d
TEMP: Advance climber state manually
TheBitEffect Feb 19, 2022
c3810c5
Changed Idle Mode
rar1741programmer Feb 19, 2022
e2f28f8
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
rar1741programmer Feb 19, 2022
dd21d55
add loggablegyro
kryllyxofficial01 Feb 22, 2022
d3da78b
whitespace
kryllyxofficial01 Feb 22, 2022
4a0bcaf
Add To-Do Reminder Comment
espmancer Feb 22, 2022
96284aa
Merge branch 'LoggableGyro' into climbing
kryllyxofficial01 Feb 23, 2022
8598fc5
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
espmancer Feb 23, 2022
af09047
add motorstates
kryllyxofficial01 Feb 23, 2022
755d9a0
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
kryllyxofficial01 Feb 23, 2022
b84cf4d
add instances for motor states
kryllyxofficial01 Feb 23, 2022
21ce2b6
Formatting
dracco1993 Feb 23, 2022
2b32468
Add FirstOrderFilter
dracco1993 Feb 23, 2022
8b59184
remove extra motor state method
kryllyxofficial01 Feb 23, 2022
9699d1c
Fix LoggableFirstOrderFilter
dracco1993 Feb 23, 2022
a1d1bb7
Fix conflict in setMotorState
dracco1993 Feb 23, 2022
f7b6dea
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
dracco1993 Feb 23, 2022
a53e235
Ops...
dracco1993 Feb 23, 2022
2495ead
Log both climber filters
dracco1993 Feb 26, 2022
cca5439
Add more manual controls for testing
sreeves750 Feb 26, 2022
8ec5aba
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
sreeves750 Feb 26, 2022
e259f8a
Update climber logging
dracco1993 Feb 26, 2022
443f1d7
Redfine the ClimbingStates enum
dracco1993 Feb 26, 2022
9044350
Put touch sensors into the same class
sreeves750 Feb 26, 2022
d9c9e3c
Add more climbing states
dracco1993 Feb 26, 2022
1f34030
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
dracco1993 Feb 26, 2022
56a384f
WIP on climbing states
dracco1993 Feb 26, 2022
1533de4
Add automatic current shutoff
dracco1993 Feb 26, 2022
811be51
Ad getNextClimbingState
dracco1993 Feb 26, 2022
67741c1
Update next step setup
dracco1993 Feb 26, 2022
c2b3fe6
Comment out old code
dracco1993 Feb 26, 2022
efaadf8
Add next state current detection
dracco1993 Feb 26, 2022
1ec7032
Add climbing photogates for pistons
sreeves750 Feb 26, 2022
526d996
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
sreeves750 Feb 26, 2022
8f6b8aa
Fix climber variable naming
dracco1993 Feb 28, 2022
26b50e5
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
dracco1993 Feb 28, 2022
b0a398a
change wpilib version
kryllyxofficial01 Mar 1, 2022
c0958e8
add simulation configs
kryllyxofficial01 Mar 1, 2022
efac58a
modify debug configs
kryllyxofficial01 Mar 1, 2022
6a13a8a
fix indenting
kryllyxofficial01 Mar 2, 2022
d02495c
change climbingstates formatting
kryllyxofficial01 Mar 2, 2022
60aa96f
Initial testing for using current to change states
rar1741programmer Mar 3, 2022
b8af89d
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
rar1741programmer Mar 3, 2022
2a7e5cf
Set motors to predetermined velocity when climbing
sreeves750 Mar 3, 2022
14a3aba
Add in automatic progression with climbing gates
sreeves750 Mar 3, 2022
461e060
Add automatic progression after swinging
sreeves750 Mar 3, 2022
3411dbb
Change resting piston positions
sreeves750 Mar 3, 2022
b7c0e41
Manually override formatting
dracco1993 Mar 3, 2022
90d6976
Merge branch 'climbing' of https://github.com/RAR1741/RA22_RobotCode …
dracco1993 Mar 3, 2022
7c3cc73
Remove old comment section
dracco1993 Mar 3, 2022
5f40e26
Add more allowed words
dracco1993 Mar 3, 2022
a2533ad
It worked 3 times in a row...
rar1741programmer Mar 15, 2022
5a1d546
Comp Code
rar1741programmer Mar 21, 2022
982f8ca
Tippy code featuring autobalancing & speed control
rar1741programmer Apr 7, 2022
9af3b88
Merge branch 'master' into first-comp
TheBitEffect Apr 8, 2022
4ced966
Remove Shooter code
TheBitEffect Apr 11, 2022
6d5ed0a
Remove Climber from Robot.java
TheBitEffect Apr 11, 2022
3572b0f
Start implimenting reworked climber execution plan
TheBitEffect Apr 12, 2022
c8faf9a
Fix left and right loggables erroring
TheBitEffect Apr 12, 2022
2e47e3e
Merge branch 'master' into first-comp
TheBitEffect Apr 12, 2022
740aae1
Push state comp code
rar1741programmer Apr 18, 2022
ff3a96a
Merge branch 'first-comp' of https://github.com/RAR1741/RA22_RobotCod…
rar1741programmer Apr 18, 2022
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
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ dependencies {
implementation wpi.java.deps.wpilib()
implementation wpi.java.vendor.java()

implementation 'com.google.code.gson:gson:2.9.0'

roborioDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.roborio)
roborioDebug wpi.java.vendor.jniDebug(wpi.platforms.roborio)

Expand Down
28 changes: 28 additions & 0 deletions src/main/deploy/autos/auto-test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"auto": [
{
"type": "drive",
"unit": "SECONDS",
"amount": 0.1,
"args": [
-0.05,
-0.05
]
},
{
"type": "wait",
"args": [
1
]
},
{
"type": "turnDeg",
"unit": "DEGREES",
"amount": -90,
"args": [
0.1,
-0.1
]
}
]
}
13 changes: 13 additions & 0 deletions src/main/deploy/autos/autonomous.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"auto": [
{
"type": "drive",
"unit": "FEET",
"amount": 3.00,
"args": [
-0.1,
-0.1
]
}
]
}
28 changes: 28 additions & 0 deletions src/main/deploy/autos/current-test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"auto": [
{
"type": "drive",
"unit": "CURRENT",
"amount": 20,
"args": [
0.05,
0.05
]
},
{
"type": "wait",
"args": [
1
]
},
{
"type": "drive",
"unit": "FEET",
"amount": 5,
"args": [
-0.05,
-0.05
]
}
]
}
76 changes: 76 additions & 0 deletions src/main/deploy/autos/distance-test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"auto": [
{
"type": "drive",
"unit": "INCHES",
"amount": 50,
"args": [
-0.05,
-0.05
]
},
{
"type": "turnDeg",
"unit": "DEGREES",
"amount": 90,
"args": [
-0.05,
0.05
]
},
{
"type": "drive",
"unit": "INCHES",
"amount": 50,
"args": [
-0.05,
-0.05
]
},
{
"type": "turnDeg",
"unit": "DEGREES",
"amount": 90,
"args": [
-0.05,
0.05
]
},
{
"type": "drive",
"unit": "INCHES",
"amount": 50,
"args": [
-0.05,
-0.05
]
},
{
"type": "turnDeg",
"unit": "DEGREES",
"amount": 90,
"args": [
-0.05,
0.05
]
},
{
"type": "drive",
"unit": "INCHES",
"amount": 50,
"args": [
-0.05,
-0.05
]
},
{
"type": "turnDeg",
"unit": "DEGREES",
"amount": 90,
"args": [
-0.05,
0.05
]
}
]
}
5 changes: 5 additions & 0 deletions src/main/java/frc/robot/Autonomous.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package frc.robot;

public abstract class Autonomous {
public abstract void run();
}
28 changes: 14 additions & 14 deletions src/main/java/frc/robot/BoostInput.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@

package frc.robot;

public class BoostInput implements InputScaler
{
private final double powerCap;
private boolean enabled;
public class BoostInput implements InputScaler {
private final double powerCap;
private double boostScale;

public BoostInput(double powerCap) {
this.powerCap = powerCap;
this.enabled = false;
}
public BoostInput(double powerCap) {
this.powerCap = powerCap;
this.boostScale = 0;
}

public double scale(double input) {
return enabled ? input : input * powerCap;
}
public double scale(double input) {
double scale = (1 - powerCap) * boostScale;
return input * (powerCap + scale);
}

public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public void setScale(double boostScale) {
this.boostScale = boostScale;
}
}
Loading