Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prepends all HAL functions with HAL_ (#146)

Browse Source
This commit is contained in:
Thad House
2016-07-09 00:24:26 -07:00
committed by Peter Johnson
parent 5ad28d58ec
commit b637b9ee4c
162 changed files with 2855 additions and 2747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibj/src/athena/cpp/lib/JNIWrapper.cpp
View File

@@ -26,7 +26,7 @@ Java_edu_wpi_first_wpilibj_hal_JNIWrapper_getPortWithModule(
// FILE_LOG(logDEBUG) << "Calling JNIWrapper getPortWithModlue";
// FILE_LOG(logDEBUG) << "Module = " << (jint)module;
// FILE_LOG(logDEBUG) << "Pin = " << (jint)pin;
HalPortHandle port = getPortWithModule(module, pin);
HAL_PortHandle port = HAL_GetPortWithModule(module, pin);
// FILE_LOG(logDEBUG) << "Port Handle = " << port;
return (jint)port;
}
@@ -41,7 +41,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_wpilibj_hal_JNIWrapper_getPort(
// FILE_LOG(logDEBUG) << "Calling JNIWrapper getPortWithModlue";
// FILE_LOG(logDEBUG) << "Module = " << (jint)module;
// FILE_LOG(logDEBUG) << "Pin = " << (jint)pin;
HalPortHandle port = getPort(pin);
HAL_PortHandle port = HAL_GetPort(pin);
// FILE_LOG(logDEBUG) << "Port Handle = " << port;
return (jint)port;
}