Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] Remove automatic PD type from module type enum (#3732)

Browse Source 
Using automatic type doesn't work with any module number, so the API was confusing.
This commit is contained in:
Thad House
2021-11-23 23:03:45 -08:00
committed by GitHub
parent da90c1cd2c
commit 4b1defc8d8
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistribution.java
View File

@@ -22,7 +22,6 @@ public class PowerDistribution implements Sendable, AutoCloseable {
public static final int kDefaultModule = PowerDistributionJNI.DEFAULT_MODULE;
public enum ModuleType {
kAutomatic(PowerDistributionJNI.AUTOMATIC_TYPE),
kCTRE(PowerDistributionJNI.CTRE_TYPE),
kRev(PowerDistributionJNI.REV_TYPE);
@@ -37,7 +36,7 @@ public class PowerDistribution implements Sendable, AutoCloseable {
* Constructs a PowerDistribution.
*
* @param module The CAN ID of the PDP.
* @param moduleType Module type (automatic, CTRE, or REV).
* @param moduleType Module type (CTRE or REV).
*/
public PowerDistribution(int module, ModuleType moduleType) {
m_handle = PowerDistributionJNI.initialize(module, moduleType.value);
@@ -50,10 +49,14 @@ public class PowerDistribution implements Sendable, AutoCloseable {
/**
* Constructs a PowerDistribution.
*
* <p>Uses the default CAN ID.
* <p>Uses the default CAN ID (0 for CTRE and 1 for REV).
*/
public PowerDistribution() {
this(kDefaultModule, ModuleType.kAutomatic);
m_handle = PowerDistributionJNI.initialize(kDefaultModule, PowerDistributionJNI.AUTOMATIC_TYPE);
m_module = PowerDistributionJNI.getModuleNumber(m_handle);
HAL.report(tResourceType.kResourceType_PDP, m_module + 1);
SendableRegistry.addLW(this, "PowerDistribution", m_module);
}
@Override