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

[hal] Clean up HAL ports (#8101)

Browse Source 
Remove references to PWM/Digital/relay Headers.
Fix analog cnd digital hannels
Set SPI and relay channels to 0.
Fix typos and roboRIO references.
This commit is contained in:
sciencewhiz
2025-07-20 22:17:19 -07:00
committed by GitHub
parent b445d48033
commit 5905a3ba27
7 changed files with 11 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
hal/src/main/native/cpp/jni/PortsJNI.cpp
View File

@@ -52,32 +52,6 @@ Java_edu_wpi_first_hal_PortsJNI_getNumCounters
return value;
}
/*
* Class: edu_wpi_first_hal_PortsJNI
* Method: getNumDigitalHeaders
* Signature: ()I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_PortsJNI_getNumDigitalHeaders
(JNIEnv* env, jclass)
{
jint value = HAL_GetNumDigitalHeaders();
return value;
}
/*
* Class: edu_wpi_first_hal_PortsJNI
* Method: getNumPWMHeaders
* Signature: ()I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_PortsJNI_getNumPWMHeaders
(JNIEnv* env, jclass)
{
jint value = HAL_GetNumPWMHeaders();
return value;
}
/*
* Class: edu_wpi_first_hal_PortsJNI
* Method: getNumDigitalChannels

14
hal/src/main/native/include/hal/Ports.h
View File

@@ -37,20 +37,6 @@ int32_t HAL_GetNumAnalogInputs(void);
*/
int32_t HAL_GetNumCounters(void);
/**
* Gets the number of digital headers in the current system.
*
* @return the number of digital headers
*/
int32_t HAL_GetNumDigitalHeaders(void);
/**
* Gets the number of PWM headers in the current system.
*
* @return the number of PWM headers
*/
int32_t HAL_GetNumPWMHeaders(void);
/**
* Gets the number of digital channels in the current system.
*

6
hal/src/main/native/systemcore/Ports.cpp
View File

@@ -22,12 +22,6 @@ int32_t HAL_GetNumAnalogInputs(void) {
int32_t HAL_GetNumCounters(void) {
return kNumCounters;
}
int32_t HAL_GetNumDigitalHeaders(void) {
return kNumDigitalHeaders;
}
int32_t HAL_GetNumPWMHeaders(void) {
return kNumPWMHeaders;
}
int32_t HAL_GetNumDigitalChannels(void) {
return kNumDigitalChannels;
}

15
hal/src/main/native/systemcore/PortsInternal.h
View File

@@ -12,21 +12,16 @@ constexpr int32_t kNumCanBuses = 5;
constexpr int32_t kNumSmartIo = 6;
constexpr int32_t kNumI2cBuses = 2;
constexpr int32_t kNumAccumulators = 0;
constexpr int32_t kNumAnalogInputs = 8;
constexpr int32_t kNumAnalogInputs = kNumSmartIo;
constexpr int32_t kNumAnalogOutputs = 0;
constexpr int32_t kNumCounters = 0;
constexpr int32_t kNumDigitalHeaders = 10;
constexpr int32_t kNumDigitalMXPChannels = 16;
constexpr int32_t kNumDigitalSPIPortChannels = 5;
constexpr int32_t kNumPWMHeaders = 0;
constexpr int32_t kNumDigitalChannels =
kNumDigitalHeaders + kNumDigitalMXPChannels + kNumDigitalSPIPortChannels;
constexpr int32_t kNumPWMChannels = 0 + kNumPWMHeaders;
constexpr int32_t kNumDigitalSPIPortChannels = 0;
constexpr int32_t kNumDigitalChannels = kNumSmartIo;
constexpr int32_t kNumPWMChannels = kNumSmartIo;
constexpr int32_t kNumDigitalPWMOutputs = 0;
constexpr int32_t kNumEncoders = 0;
constexpr int32_t kNumInterrupts = 0;
constexpr int32_t kNumRelayChannels = 8;
constexpr int32_t kNumRelayHeaders = kNumRelayChannels / 2;
constexpr int32_t kNumRelayChannels = 0;
constexpr int32_t kNumCTREPCMModules = 63;
constexpr int32_t kNumCTRESolenoidChannels = 8;
constexpr int32_t kNumCTREPDPModules = 63;