Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] PowerDistribution: Add module type getter (#3948)

Browse Source
This commit is contained in:
Peter Johnson
2022-01-21 15:46:44 -08:00
committed by GitHub
parent 2f9a600de2
commit 5548a37465
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wpilibc/src/main/native/cpp/PowerDistribution.cpp
View File

@@ -124,6 +124,13 @@ int PowerDistribution::GetModule() const {
return m_module;
}
PowerDistribution::ModuleType PowerDistribution::GetType() const {
int32_t status = 0;
auto type = HAL_GetPowerDistributionType(m_handle, &status);
FRC_ReportError(status, "Module {}", m_module);
return static_cast<ModuleType>(type);
}
bool PowerDistribution::GetSwitchableChannel() const {
int32_t status = 0;
bool state = HAL_GetPowerDistributionSwitchableChannel(m_handle, &status);

5
wpilibc/src/main/native/include/frc/PowerDistribution.h
View File

@@ -100,6 +100,11 @@ class PowerDistribution : public wpi::Sendable,
*/
int GetModule() const;
/**
* Gets module type.
*/
ModuleType GetType() const;
/**
* Gets whether the PDH switchable channel is turned on or off. Returns false
* with the CTRE PDP.

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

@@ -152,6 +152,20 @@ public class PowerDistribution implements Sendable, AutoCloseable {
return m_module;
}
/**
* Gets the module type for this power distribution object.
*
* @return The module type
*/
public ModuleType getType() {
int type = PowerDistributionJNI.getType(m_handle);
if (type == PowerDistributionJNI.REV_TYPE) {
return ModuleType.kRev;
} else {
return ModuleType.kCTRE;
}
}
/**
* Gets whether the PDH switchable channel is turned on or off. Returns false with the CTRE PDP.
*