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

Collapse boolean/double/enum properties into just integer.

Browse Source
This commit is contained in:
Peter Johnson
2016-09-20 22:17:12 -07:00
parent 8fbc23b1fa
commit d5e5755ff4
13 changed files with 123 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
java/lib/CameraServerJNI.cpp
View File

@@ -106,64 +106,37 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyN
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: getBooleanProperty
* Signature: (I)Z
* Method: getProperty
* Signature: (I)I
*/
JNIEXPORT jboolean JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getBooleanProperty
JNIEXPORT jint JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getProperty
(JNIEnv *env, jclass, jint property)
{
CS_Status status;
auto val = cs::GetBooleanProperty(property, &status);
auto val = cs::GetProperty(property, &status);
CheckStatus(env, status);
return val;
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: setBooleanProperty
* Signature: (IZ)V
* Method: setProperty
* Signature: (II)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_setBooleanProperty
(JNIEnv *env, jclass, jint property, jboolean value)
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_setProperty
(JNIEnv *env, jclass, jint property, jint value)
{
CS_Status status;
cs::SetBooleanProperty(property, value, &status);
CheckStatus(env, status);
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: getDoubleProperty
* Signature: (I)D
*/
JNIEXPORT jdouble JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getDoubleProperty
(JNIEnv *env, jclass, jint property)
{
CS_Status status;
auto val = cs::GetDoubleProperty(property, &status);
CheckStatus(env, status);
return val;
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: setDoubleProperty
* Signature: (ID)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_setDoubleProperty
(JNIEnv *env, jclass, jint property, jdouble value)
{
CS_Status status;
cs::SetDoubleProperty(property, value, &status);
cs::SetProperty(property, value, &status);
CheckStatus(env, status);
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: getPropertyMin
* Signature: (I)D
* Signature: (I)I
*/
JNIEXPORT jdouble JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyMin
JNIEXPORT jint JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyMin
(JNIEnv *env, jclass, jint property)
{
CS_Status status;
@@ -175,9 +148,9 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyM
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: getPropertyMax
* Signature: (I)D
* Signature: (I)I
*/
JNIEXPORT jdouble JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyMax
JNIEXPORT jint JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyMax
(JNIEnv *env, jclass, jint property)
{
CS_Status status;
@@ -189,9 +162,9 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyM
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: getPropertyStep
* Signature: (I)D
* Signature: (I)I
*/
JNIEXPORT jdouble JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyStep
JNIEXPORT jint JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyStep
(JNIEnv *env, jclass, jint property)
{
CS_Status status;
@@ -203,9 +176,9 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyS
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: getPropertyDefault
* Signature: (I)D
* Signature: (I)I
*/
JNIEXPORT jdouble JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyDefault
JNIEXPORT jint JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getPropertyDefault
(JNIEnv *env, jclass, jint property)
{
CS_Status status;
@@ -242,33 +215,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_setStringProper
CheckStatus(env, status);
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: getEnumProperty
* Signature: (I)I
*/
JNIEXPORT jint JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_getEnumProperty
(JNIEnv *env, jclass, jint property)
{
CS_Status status;
auto val = cs::GetEnumProperty(property, &status);
CheckStatus(env, status);
return val;
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: setEnumProperty
* Signature: (II)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_setEnumProperty
(JNIEnv *env, jclass, jint property, jint value)
{
CS_Status status;
cs::SetEnumProperty(property, value, &status);
CheckStatus(env, status);
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: getEnumPropertyChoices