Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(logging): add fork of yagsl as submodule and symlink to it from java project #51

Merged
merged 5 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4
with:
# Recurse submodules so Actions can find YAGSL
submodules: recursive

# Declares the repository safe and not under dubious ownership.
- name: Add repository to git safe directories
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/vendordeps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ jobs:
./gradlew vendordep --url=https://SleipnirGroup.github.io/ChoreoLib/dep/ChoreoLib.json
./gradlew vendordep --url=https://dev.studica.com/releases/2024/NavX.json
./gradlew vendordep --url=https://software-metadata.revrobotics.com/REVLib-2024.json
./gradlew vendordep --url=https://broncbotz3481.github.io/YAGSL-Lib/yagsl/yagsl.json
./gradlew vendordep --url=https://3015rangerrobotics.github.io/pathplannerlib/PathplannerLib.json
./gradlew vendordep --url=https://maven.ctr-electronics.com/release/com/ctre/phoenix/Phoenix5-frc2024-latest.json
./gradlew vendordep --url=https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-frc2024-latest.json
./gradlew vendordep --url=https://frcsdk.reduxrobotics.com/ReduxLib_2024.json

- name: Commit and create PR
uses: peter-evans/create-pull-request@v6
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "YAGSL"]
path = YAGSL
url = https://github.com/TheGamer1002/YAGSL
1 change: 1 addition & 0 deletions YAGSL
Submodule YAGSL added at 74ac13
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/subsystems/ArmSubsystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ private ArmSubsystem() {
// Also, you can call addChild(name, sendableChild) to associate sendables with the
// subsystem
// such as SpeedControllers, Encoders, DigitalInputs, etc.
leftMotor = new CANSparkMax(Constants.ArmMotorConstants.LEFT_ARM_MOTOR, MotorType.kBrushless);
rightMotor = new CANSparkMax(Constants.ArmMotorConstants.RIGHT_ARM_MOTOR, MotorType.kBrushless);
leftMotor = new CANSparkMax(Constants.MotorConstants.LEFT_ARM_MOTOR, MotorType.kBrushless);
rightMotor = new CANSparkMax(Constants.MotorConstants.RIGHT_ARM_MOTOR, MotorType.kBrushless);

// The right motor will mirror the leader, but it will be inverted
rightMotor.follow(leftMotor, true);
Expand Down
19 changes: 12 additions & 7 deletions src/main/java/frc/robot/subsystems/IntakeSubsystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,27 @@
import com.revrobotics.CANSparkBase.IdleMode;
import com.revrobotics.CANSparkLowLevel.MotorType;
import com.revrobotics.CANSparkMax;

import edu.wpi.first.wpilibj.DigitalInput;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.util.Constants;

public class IntakeSubsystem extends SubsystemBase {
/** A limit switch to determine whether the intake has a note or not. */
DigitalInput limitSwitch = new DigitalInput(0);
public CANSparkMax intakeMotor;

private static final IntakeSubsystem INSTANCE = new IntakeSubsystem();
/**
* A limit switch to determine whether the intake has a note or not.
*/
// DigitalInput limitSwitch = new DigitalInput(0);
public CANSparkMax intakeMotor, cerealizerMotor;

private IntakeSubsystem() {
intakeMotor = new CANSparkMax(8, MotorType.kBrushless);
intakeMotor = new CANSparkMax(Constants.MotorConstants.INTAKE_MOTOR, MotorType.kBrushless);
intakeMotor.setIdleMode(IdleMode.kBrake);
intakeMotor.setSmartCurrentLimit(20);
intakeMotor.burnFlash();

cerealizerMotor = new CANSparkMax(Constants.MotorConstants.CEREALIZER_MOTOR, MotorType.kBrushless);
cerealizerMotor.setIdleMode(IdleMode.kBrake);
cerealizerMotor.setSmartCurrentLimit(20);
cerealizerMotor.burnFlash();
}

@SuppressWarnings("WeakerAccess")
Expand Down
1 change: 1 addition & 0 deletions src/main/java/swervelib
151 changes: 151 additions & 0 deletions vendordeps/Phoenix5-frc2024-latest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
{
"fileName": "Phoenix5.json",
"name": "CTRE-Phoenix (v5)",
"version": "5.33.0",
"frcYear": 2024,
"uuid": "ab676553-b602-441f-a38d-f1296eff6537",
"mavenUrls": [
"https://maven.ctr-electronics.com/release/"
],
"jsonUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix/Phoenix5-frc2024-latest.json",
"requires": [
{
"uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
"errorMessage": "Phoenix 5 requires low-level libraries from Phoenix 6. Please add the Phoenix 6 vendordep before adding Phoenix 5.",
"offlineFileName": "Phoenix6.json",
"onlineUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-frc2024-latest.json"
}
],
"javaDependencies": [
{
"groupId": "com.ctre.phoenix",
"artifactId": "api-java",
"version": "5.33.0"
},
{
"groupId": "com.ctre.phoenix",
"artifactId": "wpiapi-java",
"version": "5.33.0"
}
],
"jniDependencies": [
{
"groupId": "com.ctre.phoenix",
"artifactId": "cci",
"version": "5.33.0",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
"windowsx86-64",
"linuxx86-64",
"linuxathena"
],
"simMode": "hwsim"
},
{
"groupId": "com.ctre.phoenix.sim",
"artifactId": "cci-sim",
"version": "5.33.0",
"isJar": false,
"skipInvalidPlatforms": true,
"validPlatforms": [
"windowsx86-64",
"linuxx86-64",
"osxuniversal"
],
"simMode": "swsim"
}
],
"cppDependencies": [
{
"groupId": "com.ctre.phoenix",
"artifactId": "wpiapi-cpp",
"version": "5.33.0",
"libName": "CTRE_Phoenix_WPI",
"headerClassifier": "headers",
"sharedLibrary": true,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"windowsx86-64",
"linuxx86-64",
"linuxathena"
],
"simMode": "hwsim"
},
{
"groupId": "com.ctre.phoenix",
"artifactId": "api-cpp",
"version": "5.33.0",
"libName": "CTRE_Phoenix",
"headerClassifier": "headers",
"sharedLibrary": true,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"windowsx86-64",
"linuxx86-64",
"linuxathena"
],
"simMode": "hwsim"
},
{
"groupId": "com.ctre.phoenix",
"artifactId": "cci",
"version": "5.33.0",
"libName": "CTRE_PhoenixCCI",
"headerClassifier": "headers",
"sharedLibrary": true,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"windowsx86-64",
"linuxx86-64",
"linuxathena"
],
"simMode": "hwsim"
},
{
"groupId": "com.ctre.phoenix.sim",
"artifactId": "wpiapi-cpp-sim",
"version": "5.33.0",
"libName": "CTRE_Phoenix_WPISim",
"headerClassifier": "headers",
"sharedLibrary": true,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"windowsx86-64",
"linuxx86-64",
"osxuniversal"
],
"simMode": "swsim"
},
{
"groupId": "com.ctre.phoenix.sim",
"artifactId": "api-cpp-sim",
"version": "5.33.0",
"libName": "CTRE_PhoenixSim",
"headerClassifier": "headers",
"sharedLibrary": true,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"windowsx86-64",
"linuxx86-64",
"osxuniversal"
],
"simMode": "swsim"
},
{
"groupId": "com.ctre.phoenix.sim",
"artifactId": "cci-sim",
"version": "5.33.0",
"libName": "CTRE_PhoenixCCISim",
"headerClassifier": "headers",
"sharedLibrary": true,
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"windowsx86-64",
"linuxx86-64",
"osxuniversal"
],
"simMode": "swsim"
}
]
}
Loading
Loading