Skip to content

Commit 45dbb7c

Browse files
authored
Merge pull request #48 from strykeforce/initialClimbTest
Initial Climb Testing
2 parents a302e21 + 6db5e6b commit 45dbb7c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2257
-259
lines changed

README.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,21 @@
5757
| Robot | eventInterlock | 6 |
5858
| | | 7 |
5959
| | | 8 |
60-
| | | 9 |
60+
| | | 9 |
61+
62+
## PWM
63+
| Subsystem | name | ID |
64+
| --------- | ------------ | --- |
65+
| Climb | leftRatchet | 0 |
66+
| Climb | rightRatchet | 1 |
67+
| Climb | leftTrapBar | 2 |
68+
| Climb | rightTrapBar | 3 |
69+
| | | 4 |
70+
| | | 5 |
71+
| | | 6 |
72+
| | | 7 |
73+
| | | 8 |
74+
| | | 9 |
6175

6276
## MXP
6377
| Subsystem | name | ID |

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "2024.2.1"
3+
id "edu.wpi.first.GradleRIO" version "2024.3.1"
44
id "com.diffplug.spotless" version "6.12.1"
55
id "com.peterabeles.gversion" version "1.10"
66
}

src/main/java/frc/robot/Robot.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void robotInit() {
7373
Logger.start();
7474

7575
m_robotContainer = new RobotContainer();
76-
m_robotContainer.setIsEvent(isEvent);
76+
// m_robotContainer.setIsEvent(isEvent);
7777
if (!isEvent) {
7878
m_robotContainer.configureTelemetry();
7979
// m_robotContainer.configurePitDashboard();
@@ -88,7 +88,7 @@ public void robotPeriodic() {
8888
Alliance alliance = DriverStation.getAlliance().get();
8989
if (alliance == Alliance.Blue || alliance == Alliance.Red) {
9090
hasAlliance = true;
91-
m_robotContainer.setAllianceColor(alliance);
91+
// m_robotContainer.setAllianceColor(alliance);
9292
logger.info("Set Alliance to {}", alliance);
9393
}
9494
} catch (NoSuchElementException error) {
@@ -108,6 +108,7 @@ public void disabledExit() {}
108108

109109
@Override
110110
public void autonomousInit() {
111+
if (!m_robotContainer.hasElbowZeroed()) m_robotContainer.zeroElbow();
111112
m_autonomousCommand = m_robotContainer.getAutonomousCommand();
112113

113114
if (m_autonomousCommand != null) {
@@ -126,6 +127,9 @@ public void teleopInit() {
126127
if (m_autonomousCommand != null) {
127128
m_autonomousCommand.cancel();
128129
}
130+
if (!m_robotContainer.hasElbowZeroed()) {
131+
m_robotContainer.zeroElbow();
132+
}
129133
}
130134

131135
@Override

0 commit comments

Comments
 (0)