Skip to content
Open

Jems #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
6228d36
Sample configuration for Joystick vs. XBoxController.
philip-olinger Feb 10, 2024
e733883
Add declarations for operator controller and trigger buttons.
philip-olinger Feb 14, 2024
6e5c2be
Work in progress on shooter, intake subsystem organization.
philip-olinger Feb 14, 2024
b318857
Framework of subsystem code
philip-olinger Feb 17, 2024
d55b25b
Shooter and intake constants and definition sketch
philip-olinger Feb 17, 2024
8869513
Constant updates for working first drive
GadgetGirls Feb 17, 2024
d02f359
Merge branch 'main' into phil_xboxctlr
philip-olinger Feb 17, 2024
356f8e3
Initial NavX2 support
GadgetGirls Feb 17, 2024
211c4eb
Fixing definition compile errors.
philip-olinger Feb 20, 2024
10012cd
Will - NavX Gyro support and drive tweaks.
GadgetGirls Feb 20, 2024
96bd523
Merge pull request #1 from GadgetGirls/phil_xboxctlr
GadgetGirls Feb 20, 2024
ef14f4f
Fixed intake, shooter declarations to use curly-brace initialization.
GadgetGirls Feb 21, 2024
f68e62f
Changed CAN ID's to set new front bumper. Changes to the navx gyro c…
GadgetGirls Feb 24, 2024
9bb2fc8
First draft intake controls.
philip-olinger Feb 24, 2024
c829505
Streamlined intake direction and on/off logic.
philip-olinger Feb 24, 2024
46e391a
Moved intake constants and some init into IntakeSubsystem.h.
philip-olinger Feb 24, 2024
9acc7dc
Will: Commented out intake and shooter inclusion until ready. Fix Nav…
GadgetGirls Feb 24, 2024
414cdfd
Tweaks for compile.
GadgetGirls Feb 24, 2024
b92d31e
Phil: WIP improving intake motor control.
philip-olinger Feb 24, 2024
fabfcbd
Merge branch 'main' of https://github.com/GadgetGirls/2024_4816_Swerve
philip-olinger Feb 24, 2024
da1e206
Compiler errs 'static' fixes and refactoring to StopMotor between dir…
philip-olinger Feb 27, 2024
39422bc
Whitespace tweak.
philip-olinger Feb 28, 2024
9cf6ceb
Will: Fine tuning Joystick throttle behavior.
GadgetGirls Feb 28, 2024
e6ca1c2
Phil: Added Triggers for right stick fw/bw and commands to raise/lowe…
philip-olinger Mar 1, 2024
9871841
First draft intake controls.
philip-olinger Feb 24, 2024
618d71a
Streamlined intake direction and on/off logic.
philip-olinger Feb 24, 2024
1f4a574
Moved intake constants and some init into IntakeSubsystem.h.
philip-olinger Feb 24, 2024
fe0e9ba
Tweaks for compile.
GadgetGirls Feb 24, 2024
25bff93
Phil: WIP improving intake motor control.
philip-olinger Feb 24, 2024
b2a3fd3
Compiler errs 'static' fixes and refactoring to StopMotor between dir…
philip-olinger Feb 27, 2024
e02321c
Whitespace tweak.
philip-olinger Feb 28, 2024
f6500f6
Phil: Added Triggers for right stick fw/bw and commands to raise/lowe…
philip-olinger Mar 1, 2024
7039390
Phil: fixing compile errors.
GadgetGirls Mar 1, 2024
0dc268f
Merge branch 'phil_cmd_intake' of https://github.com/GadgetGirls/2024…
GadgetGirls Mar 1, 2024
d221418
Phil: Fixing compile errors
GadgetGirls Mar 1, 2024
e326faf
Phil: Compile errs WIP
GadgetGirls Mar 2, 2024
22375e3
Fixed all compile errs.
philip-olinger Mar 5, 2024
fb54d22
Add timer,
GadgetGirls Mar 16, 2024
bd210c6
Fix hall sensor counts per rev 42
GadgetGirls Mar 16, 2024
b72318a
Commented on XboxCtlr button.
philip-olinger Mar 16, 2024
81ced61
Merge branch 'main' of https://github.com/GadgetGirls/2024_4816_Swerve
philip-olinger Mar 16, 2024
9da906b
Merge branch 'main' of https://github.com/GadgetGirls/2024_4816_Swerv…
philip-olinger Mar 16, 2024
10ab2db
Change intake deploy to X,Y buttons
philip-olinger Mar 16, 2024
f7bd469
Commented and cleared unused internal waypoints.
philip-olinger Mar 16, 2024
905afc0
Disabled conflicting use of XBoxCtlr RightBumper for setX().
philip-olinger Mar 16, 2024
d02300e
Merge pull request #2 from GadgetGirls/phil_cmd_intake
philip-olinger Mar 20, 2024
ee5d694
Update sparkmax can bus id from 6 to 9 to avoid collide with PDH
GadgetGirls Mar 23, 2024
6c26148
Merge branch 'main' of https://github.com/GadgetGirls/2024_4816_Swerve
GadgetGirls Mar 23, 2024
0b0abcb
Up drive deadband, bring autonomous back to 1m.
GadgetGirls Mar 23, 2024
b9804d5
Working drive code
GadgetGirls Aug 31, 2024
c69dd65
Created a toggle for fieldRelative to robotRelative
GadgetGirls Oct 12, 2024
a1b05a9
Final changes for Thor 2024 season
GadgetGirls Jan 8, 2025
343144e
Josephine's updating the README
follow-the-fireflies Jan 15, 2025
b00ad58
I added Plus to it
follow-the-fireflies Jan 15, 2025
06e04b2
Merge remote-tracking branch 'upstream/main'
GadgetGirls Jan 15, 2025
f53ded3
Phil + Sophia: Fixed 2025 compile errors
philip-olinger Jan 20, 2025
e381aee
Corrected CAN bus numbers for front right drive motors.
GadgetGirls Jan 25, 2025
3d956e6
Fix team number and disable CANbus ID 10.
GadgetGirls Jan 25, 2025
ae20b9f
Merge pull request #3 from GadgetGirls/20250118_compile_fixes
GadgetGirls Jan 25, 2025
0697572
First draft Delia's LED Subsytem
GadgetGirls Jan 25, 2025
20deacc
Fixed linker errors due to non-const frc::Color::kGreen not being const.
philip-olinger Jan 27, 2025
338b13d
Delia + Phil split out the LED pattern setter from RunPattern Command…
GadgetGirls Feb 4, 2025
2140241
Merge branch 'leds' of https://github.com/GadgetGirls/2024_4816_Swerv…
GadgetGirls Feb 5, 2025
2b5bc35
Merge pull request #4 from GadgetGirls/leds
GadgetGirls Feb 5, 2025
82913ef
Skeleton of Elevator Subsystem
philip-olinger Feb 8, 2025
19805e9
Alexa, Sophia, Phil - Elevator subsystem first full draft.
N00dlezRulez Feb 8, 2025
9974904
Phil: Fixed compile/link errors.
philip-olinger Feb 9, 2025
a4ae66b
Added Left Xbox Stick elevator control. Not working yet.
GadgetGirls Feb 12, 2025
17c8c5f
Whoops. One more.
GadgetGirls Feb 12, 2025
2b9035c
Flip the value returned by the limit switch.
GadgetGirls Feb 12, 2025
db9e8cf
Reworked elevator default command for debugging.
GadgetGirls Feb 12, 2025
ae8f54c
Zach and Delia's fancy LED controls
GadgetGirls Feb 15, 2025
42efa86
First draft Will's ultrasound support
GadgetGirls Feb 15, 2025
92f2299
Alexa Added lower limmit switch
GadgetGirls Feb 15, 2025
8f680fd
Merge pull request #5 from GadgetGirls/elevatorsub
GadgetGirls Feb 15, 2025
73140b6
Phil - first working 2025 Intake subsys
GadgetGirls Feb 15, 2025
b9ab82d
Merge pull request #6 from GadgetGirls/intakesub2
GadgetGirls Feb 15, 2025
0b0ccf8
Phil - Merge branch 'main' into leds
GadgetGirls Feb 15, 2025
446dacc
Moved LED patterns into LEDSubsystem
GadgetGirls Mar 5, 2025
4c18a0d
Will & Josephine Gyro fixes and drive and autonomous tweaks.
GadgetGirls Mar 14, 2025
b18b227
Will & Josephine: in pi not radians
GadgetGirls Mar 14, 2025
2bbf5cd
Will & Josephine: Set elevator canbus IDs.
GadgetGirls Mar 14, 2025
d660336
Will & Josephine: Set Intake CANbus IDs
GadgetGirls Mar 14, 2025
ff2eed5
Phil: Tone down auto mode max speed and acceleration by 3
GadgetGirls Mar 14, 2025
d6b9f48
Undo scaling of max speed for autonomous since constants have been ch…
GadgetGirls Mar 14, 2025
79bd2f6
Phil: reenabled basic LEDs
GadgetGirls Mar 15, 2025
af8c7b3
Merge branch 'main' into leds
GadgetGirls Mar 15, 2025
0e67bc6
Fixing compile Errors
GadgetGirls Mar 15, 2025
0ad62d4
Will & Josephine: Adjust swerve controls. Phil: Implement Elevator ru…
GadgetGirls Mar 15, 2025
973a860
toggled fieldRelative to false, removed +90 from navx.GetAngle, swapp…
GadgetGirls Mar 16, 2025
4028ef8
updated build gradle; added "disabled"; changed to 4816; untracked; a…
N00dlezRulez Mar 19, 2025
56a140c
Will: changed "false" to "fieldRelative and added line of code; chang…
GadgetGirls Mar 19, 2025
36c9cf0
Merge branch 'main' of https://github.com/GadgetGirls/2024_4816_Swerve
N00dlezRulez Mar 19, 2025
9076eee
Merge branch 'main' of https://github.com/GadgetGirls/2024_4816_Swerve
N00dlezRulez Mar 19, 2025
c81be15
fixed fieldRelative toggle
GadgetGirls Mar 21, 2025
6180734
Merge branch 'main' of https://github.com/GadgetGirls/2024_4816_Swerve
GadgetGirls Mar 21, 2025
b839051
Removed REVLib.json
GadgetGirls Mar 21, 2025
03d0806
Phil: Cleaned up experimental ultrasound code
GadgetGirls Mar 21, 2025
7500ba3
Restored Zach's Y axis negation
GadgetGirls Mar 21, 2025
e12f22d
Comment out ultrasound
GadgetGirls Mar 22, 2025
8a603f8
Merge branch 'main' into leds try 2
GadgetGirls Mar 22, 2025
b8252ef
Corrected buttonbindings and removed outdated intake commands from la…
philip-olinger Mar 22, 2025
ae07d63
Shifted all Joystick buttons to GetRawButtonPressed
GadgetGirls Mar 22, 2025
5d8125c
Phil: Added dashboard put for effective x,y,rot; Moved dashboard put …
philip-olinger Mar 22, 2025
af8bd43
Merge branch 'main' into leds
philip-olinger Mar 22, 2025
ec95938
Phil: Fix new Dashboard puts, restore fixes that came unfixed.
philip-olinger Mar 22, 2025
a4e3f00
Merge branch 'main' into leds
philip-olinger Mar 22, 2025
bf84c2e
Will, Phil - controllerMode to switch between toggle and push to acti…
GadgetGirls Mar 29, 2025
d518035
Merge branch 'leds' of https://github.com/GadgetGirls/2024_4816_Swerv…
GadgetGirls Mar 29, 2025
a4f36c3
Phil: Change auto elevator raise to timer-based.
GadgetGirls Mar 29, 2025
d6e1741
Phil: Move autonomous raise into elevator subsys. Change to drive fir…
GadgetGirls Mar 29, 2025
c200d7a
Josephine & Will: changed elevator raise time to 1.25; added elevator…
GadgetGirls Apr 9, 2025
d8fca6f
Jose: runs the LED pattern
GadgetGirls Jun 28, 2025
a7094f2
Merge branch 'main' into jems
follow-the-fireflies Jul 19, 2025
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
9 changes: 8 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,12 @@
"**/.factorypath": true,
"**/*~": true
},
"C_Cpp.default.configurationProvider": "vscode-wpilib"
"C_Cpp.default.configurationProvider": "vscode-wpilib",
"files.associations": {
"any": "cpp",
"optional": "cpp",
"variant": "cpp",
"*.inc": "cpp"
},
"C_Cpp.errorSquiggles": "disabled"
}
2 changes: 1 addition & 1 deletion .wpilib/wpilib_preferences.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"enableCppIntellisense": true,
"currentLanguage": "cpp",
"projectYear": "2025",
"teamNumber": 2714
"teamNumber": 4816
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1"
id "edu.wpi.first.GradleRIO" version "2025.2.1"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand Down
Binary file added src/main.tgz
Binary file not shown.
24 changes: 12 additions & 12 deletions src/main/cpp/Constants.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.

#include "Constants.h"

namespace AutoConstants {

const frc::TrapezoidProfile<units::radians>::Constraints
kThetaControllerConstraints{kMaxAngularSpeed, kMaxAngularAcceleration};

} // namespace AutoConstants
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
#include "Constants.h"
namespace AutoConstants {
const frc::TrapezoidProfile<units::radians>::Constraints
kThetaControllerConstraints{kMaxAngularSpeed, kMaxAngularAcceleration};
} // namespace AutoConstants
139 changes: 71 additions & 68 deletions src/main/cpp/Robot.cpp
Original file line number Diff line number Diff line change
@@ -1,68 +1,71 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.

#include "Robot.h"

#include <frc/smartdashboard/SmartDashboard.h>
#include <frc2/command/CommandScheduler.h>

void Robot::RobotInit() {}

/**
* This function is called every 20 ms, no matter the mode. Use
* this for items like diagnostics that you want to run during disabled,
* autonomous, teleoperated and test.
*
* <p> This runs after the mode specific periodic functions, but before
* LiveWindow and SmartDashboard integrated updating.
*/
void Robot::RobotPeriodic() { frc2::CommandScheduler::GetInstance().Run(); }

/**
* This function is called once each time the robot enters Disabled mode. You
* can use it to reset any subsystem information you want to clear when the
* robot is disabled.
*/
void Robot::DisabledInit() {}

void Robot::DisabledPeriodic() {}

/**
* This autonomous runs the autonomous command selected by your {@link
* RobotContainer} class.
*/
void Robot::AutonomousInit() {
m_autonomousCommand = m_container.GetAutonomousCommand();

if (m_autonomousCommand != nullptr) {
m_autonomousCommand->Schedule();
}
}

void Robot::AutonomousPeriodic() {}

void Robot::TeleopInit() {
// This makes sure that the autonomous stops running when
// teleop starts running. If you want the autonomous to
// continue until interrupted by another command, remove
// this line or comment it out.
if (m_autonomousCommand != nullptr) {
m_autonomousCommand->Cancel();
m_autonomousCommand = nullptr;
}
}

/**
* This function is called periodically during operator control.
*/
void Robot::TeleopPeriodic() {}

/**
* This function is called periodically during test mode.
*/
void Robot::TestPeriodic() {}

#ifndef RUNNING_FRC_TESTS
int main() { return frc::StartRobot<Robot>(); }
#endif
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.

#include "Robot.h"

#include <frc/smartdashboard/SmartDashboard.h>
#include <frc2/command/CommandScheduler.h>

void Robot::RobotInit() {}

/**
* This function is called every 20 ms, no matter the mode. Use
* this for items like diagnostics that you want to run during disabled,
* autonomous, teleoperated and test.
*
* <p> This runs after the mode specific periodic functions, but before
* LiveWindow and SmartDashboard integrated updating.
*/
void Robot::RobotPeriodic() { frc2::CommandScheduler::GetInstance().Run(); }

/**
* This function is called once each time the robot enters Disabled mode. You
* can use it to reset any subsystem information you want to clear when the
* robot is disabled.
*/
void Robot::DisabledInit() {}

void Robot::DisabledPeriodic() {}

/**
* This autonomous runs the autonomous command selected by your {@link
* RobotContainer} class.
*/
void Robot::AutonomousInit() {
//m_chooser.AddOption(kAutoNameDefault, kAutoNameDefault);
//m_chooser.SetDefaultOption(kAutoNameCenter, kAutoNameCenter);
//frc::SmartDashboard::PutData("Auto Modes", &m_chooser);
m_autonomousCommand = m_container.GetAutonomousCommand();

if (m_autonomousCommand != nullptr) {
m_autonomousCommand->Schedule();
}
}

void Robot::AutonomousPeriodic() {}

void Robot::TeleopInit() {
// This makes sure that the autonomous stops running when
// teleop starts running. If you want the autonomous to
// continue until interrupted by another command, remove
// this line or comment it out.
if (m_autonomousCommand != nullptr) {
m_autonomousCommand->Cancel();
m_autonomousCommand = nullptr;
}
}

/**
* This function is called periodically during operator control.
*/
void Robot::TeleopPeriodic() {}

/**
* This function is called periodically during test mode.
*/
void Robot::TestPeriodic() {}

#ifndef RUNNING_FRC_TESTS
int main() { return frc::StartRobot<Robot>(); }
#endif
Loading