Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "HAL: Add support for multiple Notifiers."

Browse Source
This commit is contained in:
Brad Miller (WPI)
2015-12-09 06:50:00 -08:00
committed by Gerrit Code Review
parent 8b0f19a0fb 03c43a46d7
commit 530ce310a6
4 changed files with 129 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ static jmethodID mid_global;
// The arguments are unused by the HAL Notifier; they just satisfy a particular
// function signature.
void notifierHandler(uint32_t mask, void* param) {
void notifierHandler(uint32_t currentTimeInt, void* param) {
jobject handler_obj = func_global;
jmethodID mid = mid_global;
@@ -82,7 +82,7 @@ JNIEXPORT jlong JNICALL Java_edu_wpi_first_wpilibj_hal_NotifierJNI_initializeNot
mid_global = mid;
int32_t status = 0;
void *notifierPtr = initializeNotifier(notifierHandler, &status);
void *notifierPtr = initializeNotifier(notifierHandler, nullptr, &status);
NOTIFIERJNI_LOG(logDEBUG) << "Notifier Ptr = " << notifierPtr;
NOTIFIERJNI_LOG(logDEBUG) << "Status = " << status;