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

Updates CANJNI.cpp so that it compiles properly (CAN NOT WORKING)

Browse Source 
Change-Id: I26d841fcd5a6bb33352e32d2d3ad4836c2a0a21e
This commit is contained in:
Jonathan Leitschuh
2014-06-16 12:27:54 -04:00
parent 85dff7d2ec
commit 974362bd89
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wpilibj/wpilibJavaJNI/lib/CANJNI.cpp
View File

@@ -5,7 +5,7 @@
#include "edu_wpi_first_wpilibj_can_CANJNI.h"
#include "HAL/CAN.hpp"
#include "NetworkCommunication/JaguarCANDriver.h"
#include "NetworkCommunication/CANSessionMux.h"
// set the logging level
TLogLevel canJNILogLevel = logWARNING;
@@ -22,7 +22,7 @@ TLogLevel canJNILogLevel = logWARNING;
JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetworkCommunicationJaguarCANDriverSendMessage
(JNIEnv *env, jclass, jint messageID, jobject data, jobject status)
{
CANJNI_LOG(logDEBUG) << "Calling CANJNI JaguarCANDriverSendMessage";
CANJNI_LOG(logDEBUG) << "Calling CANJNI CANSessionMuxSendMessage";
CANJNI_LOG(logDEBUG) << "MessageID = " << std::hex << messageID;
jbyte * dataPtr = NULL;
jlong dataCapacity = 0;
@@ -47,7 +47,7 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetworkCommunica
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
//CANJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
FRC_NetworkCommunication_JaguarCANDriver_sendMessage((uint32_t) messageID, (const uint8_t*)dataPtr, (uint8_t)dataCapacity, statusPtr);
FRC_NetworkCommunication_CANSessionMux_sendMessage((uint32_t) messageID, (const uint8_t*)dataPtr, 0, (uint8_t)dataCapacity, statusPtr);
CANJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
}
@@ -59,7 +59,7 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetworkCommunica
JNIEXPORT jobject JNICALL Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetworkCommunicationJaguarCANDriverReceiveMessage
(JNIEnv * env, jclass, jobject messageID, jint timeout, jobject status)
{
CANJNI_LOG(logDEBUG) << "Calling CANJNI JaguarCANDriverReceiveMessage";
CANJNI_LOG(logDEBUG) << "Calling CANJNI CANSessionMuxReceiveMessage";
jint * messageIDPtr = (jint*)env->GetDirectBufferAddress(messageID);
CANJNI_LOG(logDEBUG) << "MessageID In = " << std::hex << *messageIDPtr;
CANJNI_LOG(logDEBUG) << "Timeout = " << timeout;
@@ -69,7 +69,7 @@ JNIEXPORT jobject JNICALL Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetworkCommun
jbyte* dataPtr = new jbyte[8];
//CANJNI_LOG(logDEBUG) << "Original MessageSize = " << (jint)dataSize;
//CANJNI_LOG(logDEBUG) << "Original MessagePtr = " << (jint*)dataPtr;
FRC_NetworkCommunication_JaguarCANDriver_receiveMessage((uint32_t*)messageIDPtr, (uint8_t*)dataPtr, &dataSize, timeout, statusPtr);
//FRC_NetworkCommunication_CANSessionMux_receiveMessage((uint32_t*)messageIDPtr, 0x1fffffff,(uint8_t*)dataPtr, &dataSize, timeout, statusPtr);
//CANJNI_LOG(logDEBUG) << "MessageID Out = " << std::hex << *messageIDPtr;
CANJNI_LOG(logDEBUG) << "MessageSize = " << (jint)dataSize;