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

Move HAL classes to their own base package (#1317)

Browse Source 
Needed for modularization.
This commit is contained in:
Thad House
2018-09-20 21:59:46 -07:00
committed by Peter Johnson
parent 0068b6aea3
commit e210073044
194 changed files with 1027 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hal/src/main/native/cpp/jni/CANJNI.cpp
View File

@@ -14,7 +14,7 @@
#include <wpi/raw_ostream.h>
#include "HALUtil.h"
#include "edu_wpi_first_wpilibj_can_CANJNI.h"
#include "edu_wpi_first_hal_can_CANJNI.h"
#include "hal/CAN.h"
#include "hal/cpp/Log.h"
@@ -34,12 +34,12 @@ TLogLevel canJNILogLevel = logERROR;
extern "C" {
/*
* Class: edu_wpi_first_wpilibj_can_CANJNI
* Class: edu_wpi_first_hal_can_CANJNI
* Method: FRCNetCommCANSessionMuxSendMessage
* Signature: (I[BI)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxSendMessage
Java_edu_wpi_first_hal_can_CANJNI_FRCNetCommCANSessionMuxSendMessage
(JNIEnv* env, jclass, jint messageID, jbyteArray data, jint periodMs)
{
CANJNI_LOG(logDEBUG) << "Calling CANJNI FRCNetCommCANSessionMuxSendMessage";
@@ -77,12 +77,12 @@ Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxSendMessage
}
/*
* Class: edu_wpi_first_wpilibj_can_CANJNI
* Class: edu_wpi_first_hal_can_CANJNI
* Method: FRCNetCommCANSessionMuxReceiveMessage
* Signature: (Ljava/lang/Object;ILjava/lang/Object;)[B
*/
JNIEXPORT jbyteArray JNICALL
Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage
Java_edu_wpi_first_hal_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage
(JNIEnv* env, jclass, jobject messageID, jint messageIDMask,
jobject timeStamp)
{
@@ -130,12 +130,12 @@ Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage
}
/*
* Class: edu_wpi_first_wpilibj_can_CANJNI
* Class: edu_wpi_first_hal_can_CANJNI
* Method: GetCANStatus
* Signature: (Ljava/lang/Object;)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_wpilibj_can_CANJNI_GetCANStatus
Java_edu_wpi_first_hal_can_CANJNI_GetCANStatus
(JNIEnv* env, jclass, jobject canStatus)
{
CANJNI_LOG(logDEBUG) << "Calling CANJNI HAL_CAN_GetCANStatus";