Team4388/2022NoWayHome
1
0
Fork 0
mirror of https://github.com/Team4388/2022NoWayHome.git synced 2026-06-09 00:38:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Resolved merging error

Browse Source
This commit is contained in:
nathanrsxtn
2022-01-11 11:49:45 -07:00
parent 9578b4e184
commit df23971218
2 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
+2 -1
View File
@@ -25,5 +25,6 @@
} }
}, },
], ],
"java.test.defaultConfig": "WPIlibUnitTests" "java.test.defaultConfig": "WPIlibUnitTests",
"java.dependency.packagePresentation": "flat"
} }
src/main/java/frc4388/robot/Constants.java
+24 -33
View File
@@ -8,11 +8,16 @@ import frc4388.utility.Gains;
import frc4388.utility.LEDPatterns; import frc4388.utility.LEDPatterns;
/** /**
* The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean * The Constants class provides a convenient place for teams to hold robot-wide
* constants. This class should not be used for any other purpose. All constants should be * numerical or boolean
* declared globally (i.e. public static). Do not put anything functional in this class. * constants. This class should not be used for any other purpose. All constants
* should be
* declared globally (i.e. public static). Do not put anything functional in
* this class.
* *
* <p>It is advised to statically import this class (or one of its inner classes) wherever the * <p>
* It is advised to statically import this class (or one of its inner classes)
* wherever the
* constants are needed, to reduce verbosity. * constants are needed, to reduce verbosity.
*/ */
public final class Constants { public final class Constants {
@@ -36,10 +41,10 @@ public final class Constants {
public static final int RIGHT_FRONT_STEER_CAN_ENCODER_ID = 11; public static final int RIGHT_FRONT_STEER_CAN_ENCODER_ID = 11;
public static final int LEFT_BACK_STEER_CAN_ENCODER_ID = 12; public static final int LEFT_BACK_STEER_CAN_ENCODER_ID = 12;
public static final int RIGHT_BACK_STEER_CAN_ENCODER_ID = 13; public static final int RIGHT_BACK_STEER_CAN_ENCODER_ID = 13;
//ofsets are in degrees // ofsets are in degrees
public static final float LEFT_FRONT_ENCODER_OFFSET = 0; public static final float LEFT_FRONT_ENCODER_OFFSET = 0;
public static final float RIGHT_FRONT_ENCODER_OFFSET = 0; public static final float RIGHT_FRONT_ENCODER_OFFSET = 0;
public static final float LEFT_BACK_ENCODER_OFFSET = 0; public static final float LEFT_BACK_ENCODER_OFFSET = 0;
public static final float RIGHT_BACK_ENCODER_OFFSET = 0; public static final float RIGHT_BACK_ENCODER_OFFSET = 0;
// swerve PID constants // swerve PID constants
@@ -52,36 +57,22 @@ public final class Constants {
public static final double NEUTRAL_DEADBAND = 0.04; public static final double NEUTRAL_DEADBAND = 0.04;
public static final double OPEN_LOOP_RAMP_RATE = 0.2; public static final double OPEN_LOOP_RAMP_RATE = 0.2;
public static final int REMOTE_0 = 0; public static final int REMOTE_0 = 0;
// misc
public static final int SMARTDASHBOARD_UPDATE_FRAME = 2;
} }
public static final class LEDConstants { public static final class LEDConstants {
public static final int LED_SPARK_ID = 0; public static final int LED_SPARK_ID = 0;
public static final LEDPatterns DEFAULT_PATTERN = LEDPatterns.FOREST_WAVES; public static final LEDPatterns DEFAULT_PATTERN = LEDPatterns.FOREST_WAVES;
} }
// swerve configuration /**
public static final double NEUTRAL_DEADBAND = 0.04; * The OIConstants class contains the ID for the XBox controllers
public static final double OPEN_LOOP_RAMP_RATE = 0.2; */
public static final int REMOTE_0 = 0; public static final class OIConstants {
public static final int XBOX_DRIVER_ID = 0;
//misc public static final int XBOX_OPERATOR_ID = 1;
public static final int SMARTDASHBOARD_UPDATE_FRAME = 2; }
}
/**
* The LEDConstants class contains the ID and the patterns for the LED Subsystem
*/
public static final class LEDConstants {
public static final int LED_SPARK_ID = 0;
public static final LEDPatterns DEFAULT_PATTERN = LEDPatterns.FOREST_WAVES;
}
/**
* The OIConstants class contains the ID for the XBox controllers
*/
public static final class OIConstants {
public static final int XBOX_DRIVER_ID = 0;
public static final int XBOX_OPERATOR_ID = 1;
}
} }