From 779908362d4f302c4acb5845568ba37a2bfdd264 Mon Sep 17 00:00:00 2001 From: strawmanbobi Date: Tue, 25 Apr 2017 12:46:49 +0800 Subject: [PATCH] updated irext-core 1. initialized reverser project (occupier only) 2. fixed jni path for decoder --- src/ir_decoder/jni/ir_decode_jni.c | 22 ++--- src/ir_decoder/jni/ir_decode_jni.h | 124 ++++++++++++++--------------- src/ir_reverser/empty | 0 3 files changed, 73 insertions(+), 73 deletions(-) create mode 100644 src/ir_reverser/empty diff --git a/src/ir_decoder/jni/ir_decode_jni.c b/src/ir_decoder/jni/ir_decode_jni.c index 555be1d..c5de10e 100644 --- a/src/ir_decoder/jni/ir_decode_jni.c +++ b/src/ir_decoder/jni/ir_decode_jni.c @@ -20,7 +20,7 @@ Revision log: extern size_t binary_length; extern UINT8 *binary_content; -JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACLibOpen +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACLibOpen (JNIEnv *env, jobject this_obj, jstring file_name) { const char *n_file_name = (*env)->GetStringUTFChars(env, file_name, 0); @@ -42,7 +42,7 @@ JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACLibOpen return IR_DECODE_SUCCEEDED; } -JNIEXPORT jintArray JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACControl +JNIEXPORT jintArray JNICALL Java_net_irext_decodesdk_IRDecode_irACControl (JNIEnv *env, jobject this_obj, jobject jni_ac_status, jint function_code, jint change_wind_direction) { UINT16 user_data[USER_DATA_SIZE]; @@ -104,13 +104,13 @@ JNIEXPORT jintArray JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACControl return result; } -JNIEXPORT void JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACLibClose +JNIEXPORT void JNICALL Java_net_irext_decodesdk_IRDecode_irACLibClose (JNIEnv *env, jobject this_obj) { ir_ac_lib_close(); } -JNIEXPORT jobject JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACGetTemperatureRange +JNIEXPORT jobject JNICALL Java_net_irext_decodesdk_IRDecode_irACGetTemperatureRange (JNIEnv *env, jobject this_obj, jint ac_mode) { int tempMin = 0; @@ -132,7 +132,7 @@ JNIEXPORT jobject JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACGetTemperatu return temperature_range; } -JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACGetSupportedMode +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedMode (JNIEnv *env, jobject this_obj) { int supported_mode = 0; @@ -140,7 +140,7 @@ JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACGetSupportedMod return supported_mode; } -JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACGetSupportedWindSpeed +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedWindSpeed (JNIEnv *env, jobject this_obj, jint ac_mode) { int supported_wind_speed = 0; @@ -148,7 +148,7 @@ JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACGetSupportedWin return supported_wind_speed; } -JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACGetSupportedSwing +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedSwing (JNIEnv *env, jobject this_obj, jint ac_mode) { int supported_swing = 0; @@ -156,7 +156,7 @@ JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACGetSupportedSwi return supported_swing; } -JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACGetSupportedWindDirection +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedWindDirection (JNIEnv *env, jobject this_obj) { int supported_wind_direction = 0; @@ -164,7 +164,7 @@ JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irACGetSupportedWin return supported_wind_direction; } -JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irTVLibOpen +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irTVLibOpen (JNIEnv *env, jobject this_obj, jstring file_name, jint j_ir_hex_encode) { const char *n_file_name = (*env)->GetStringUTFChars(env, file_name, 0); @@ -185,7 +185,7 @@ JNIEXPORT jint JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irTVLibOpen return IR_DECODE_SUCCEEDED; } -JNIEXPORT jintArray JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irTVControl +JNIEXPORT jintArray JNICALL Java_net_irext_decodesdk_IRDecode_irTVControl (JNIEnv *env, jobject this_obj, jint key_number) { UINT16 user_data[USER_DATA_SIZE]; @@ -209,7 +209,7 @@ JNIEXPORT jintArray JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irTVControl return result; } -JNIEXPORT void JNICALL Java_net_irext_sdk_decodeapi_IRDecode_irTVLibClose +JNIEXPORT void JNICALL Java_net_irext_decodesdk_IRDecode_irTVLibClose (JNIEnv *env, jobject this_obj) { // do nothing diff --git a/src/ir_decoder/jni/ir_decode_jni.h b/src/ir_decoder/jni/ir_decode_jni.h index 9c63f8e..9d9a076 100644 --- a/src/ir_decoder/jni/ir_decode_jni.h +++ b/src/ir_decoder/jni/ir_decode_jni.h @@ -7,60 +7,60 @@ #ifdef __cplusplus extern "C" { #endif -#undef net_irext_remote_service_DecodeService_BIND_ABOVE_CLIENT -#define net_irext_remote_service_DecodeService_BIND_ABOVE_CLIENT 8L -#undef net_irext_remote_service_DecodeService_BIND_ADJUST_WITH_ACTIVITY -#define net_irext_remote_service_DecodeService_BIND_ADJUST_WITH_ACTIVITY 128L -#undef net_irext_remote_service_DecodeService_BIND_ALLOW_OOM_MANAGEMENT -#define net_irext_remote_service_DecodeService_BIND_ALLOW_OOM_MANAGEMENT 16L -#undef net_irext_remote_service_DecodeService_BIND_AUTO_CREATE -#define net_irext_remote_service_DecodeService_BIND_AUTO_CREATE 1L -#undef net_irext_remote_service_DecodeService_BIND_DEBUG_UNBIND -#define net_irext_remote_service_DecodeService_BIND_DEBUG_UNBIND 2L -#undef net_irext_remote_service_DecodeService_BIND_IMPORTANT -#define net_irext_remote_service_DecodeService_BIND_IMPORTANT 64L -#undef net_irext_remote_service_DecodeService_BIND_NOT_FOREGROUND -#define net_irext_remote_service_DecodeService_BIND_NOT_FOREGROUND 4L -#undef net_irext_remote_service_DecodeService_BIND_WAIVE_PRIORITY -#define net_irext_remote_service_DecodeService_BIND_WAIVE_PRIORITY 32L -#undef net_irext_remote_service_DecodeService_CONTEXT_IGNORE_SECURITY -#define net_irext_remote_service_DecodeService_CONTEXT_IGNORE_SECURITY 2L -#undef net_irext_remote_service_DecodeService_CONTEXT_INCLUDE_CODE -#define net_irext_remote_service_DecodeService_CONTEXT_INCLUDE_CODE 1L -#undef net_irext_remote_service_DecodeService_CONTEXT_RESTRICTED -#define net_irext_remote_service_DecodeService_CONTEXT_RESTRICTED 4L -#undef net_irext_remote_service_DecodeService_MODE_APPEND -#define net_irext_remote_service_DecodeService_MODE_APPEND 32768L -#undef net_irext_remote_service_DecodeService_MODE_ENABLE_WRITE_AHEAD_LOGGING -#define net_irext_remote_service_DecodeService_MODE_ENABLE_WRITE_AHEAD_LOGGING 8L -#undef net_irext_remote_service_DecodeService_MODE_MULTI_PROCESS -#define net_irext_remote_service_DecodeService_MODE_MULTI_PROCESS 4L -#undef net_irext_remote_service_DecodeService_MODE_PRIVATE -#define net_irext_remote_service_DecodeService_MODE_PRIVATE 0L -#undef net_irext_remote_service_DecodeService_MODE_WORLD_READABLE -#define net_irext_remote_service_DecodeService_MODE_WORLD_READABLE 1L -#undef net_irext_remote_service_DecodeService_MODE_WORLD_WRITEABLE -#define net_irext_remote_service_DecodeService_MODE_WORLD_WRITEABLE 2L -#undef net_irext_remote_service_DecodeService_START_CONTINUATION_MASK -#define net_irext_remote_service_DecodeService_START_CONTINUATION_MASK 15L -#undef net_irext_remote_service_DecodeService_START_FLAG_REDELIVERY -#define net_irext_remote_service_DecodeService_START_FLAG_REDELIVERY 1L -#undef net_irext_remote_service_DecodeService_START_FLAG_RETRY -#define net_irext_remote_service_DecodeService_START_FLAG_RETRY 2L -#undef net_irext_remote_service_DecodeService_START_NOT_STICKY -#define net_irext_remote_service_DecodeService_START_NOT_STICKY 2L -#undef net_irext_remote_service_DecodeService_START_REDELIVER_INTENT -#define net_irext_remote_service_DecodeService_START_REDELIVER_INTENT 3L -#undef net_irext_remote_service_DecodeService_START_STICKY -#define net_irext_remote_service_DecodeService_START_STICKY 1L -#undef net_irext_remote_service_DecodeService_START_STICKY_COMPATIBILITY -#define net_irext_remote_service_DecodeService_START_STICKY_COMPATIBILITY 0L +#undef net_irext_decodesdk_IRDecode_BIND_ABOVE_CLIENT +#define net_irext_decodesdk_IRDecode_BIND_ABOVE_CLIENT 8L +#undef net_irext_decodesdk_IRDecode_BIND_ADJUST_WITH_ACTIVITY +#define net_irext_decodesdk_IRDecode_BIND_ADJUST_WITH_ACTIVITY 128L +#undef net_irext_decodesdk_IRDecode_BIND_ALLOW_OOM_MANAGEMENT +#define net_irext_decodesdk_IRDecode_BIND_ALLOW_OOM_MANAGEMENT 16L +#undef net_irext_decodesdk_IRDecode_BIND_AUTO_CREATE +#define net_irext_decodesdk_IRDecode_BIND_AUTO_CREATE 1L +#undef net_irext_decodesdk_IRDecode_BIND_DEBUG_UNBIND +#define net_irext_decodesdk_IRDecode_BIND_DEBUG_UNBIND 2L +#undef net_irext_decodesdk_IRDecode_BIND_IMPORTANT +#define net_irext_decodesdk_IRDecode_BIND_IMPORTANT 64L +#undef net_irext_decodesdk_IRDecode_BIND_NOT_FOREGROUND +#define net_irext_decodesdk_IRDecode_BIND_NOT_FOREGROUND 4L +#undef net_irext_decodesdk_IRDecode_BIND_WAIVE_PRIORITY +#define net_irext_decodesdk_IRDecode_BIND_WAIVE_PRIORITY 32L +#undef net_irext_decodesdk_IRDecode_CONTEXT_IGNORE_SECURITY +#define net_irext_decodesdk_IRDecode_CONTEXT_IGNORE_SECURITY 2L +#undef net_irext_decodesdk_IRDecode_CONTEXT_INCLUDE_CODE +#define net_irext_decodesdk_IRDecode_CONTEXT_INCLUDE_CODE 1L +#undef net_irext_decodesdk_IRDecode_CONTEXT_RESTRICTED +#define net_irext_decodesdk_IRDecode_CONTEXT_RESTRICTED 4L +#undef net_irext_decodesdk_IRDecode_MODE_APPEND +#define net_irext_decodesdk_IRDecode_MODE_APPEND 32768L +#undef net_irext_decodesdk_IRDecode_MODE_ENABLE_WRITE_AHEAD_LOGGING +#define net_irext_decodesdk_IRDecode_MODE_ENABLE_WRITE_AHEAD_LOGGING 8L +#undef net_irext_decodesdk_IRDecode_MODE_MULTI_PROCESS +#define net_irext_decodesdk_IRDecode_MODE_MULTI_PROCESS 4L +#undef net_irext_decodesdk_IRDecode_MODE_PRIVATE +#define net_irext_decodesdk_IRDecode_MODE_PRIVATE 0L +#undef net_irext_decodesdk_IRDecode_MODE_WORLD_READABLE +#define net_irext_decodesdk_IRDecode_MODE_WORLD_READABLE 1L +#undef net_irext_decodesdk_IRDecode_MODE_WORLD_WRITEABLE +#define net_irext_decodesdk_IRDecode_MODE_WORLD_WRITEABLE 2L +#undef net_irext_decodesdk_IRDecode_START_CONTINUATION_MASK +#define net_irext_decodesdk_IRDecode_START_CONTINUATION_MASK 15L +#undef net_irext_decodesdk_IRDecode_START_FLAG_REDELIVERY +#define net_irext_decodesdk_IRDecode_START_FLAG_REDELIVERY 1L +#undef net_irext_decodesdk_IRDecode_START_FLAG_RETRY +#define net_irext_decodesdk_IRDecode_START_FLAG_RETRY 2L +#undef net_irext_decodesdk_IRDecode_START_NOT_STICKY +#define net_irext_decodesdk_IRDecode_START_NOT_STICKY 2L +#undef net_irext_decodesdk_IRDecode_START_REDELIVER_INTENT +#define net_irext_decodesdk_IRDecode_START_REDELIVER_INTENT 3L +#undef net_irext_decodesdk_IRDecode_START_STICKY +#define net_irext_decodesdk_IRDecode_START_STICKY 1L +#undef net_irext_decodesdk_IRDecode_START_STICKY_COMPATIBILITY +#define net_irext_decodesdk_IRDecode_START_STICKY_COMPATIBILITY 0L /* * Class: net_irext_remote_service_DecodeService * Method: irACLibOpen * Signature: (Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irACLibOpen +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACLibOpen (JNIEnv *, jobject, jstring); /* @@ -68,7 +68,7 @@ JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irACLibOpen * Method: irACControl * Signature: (Lcom/irext/remote/bean/jnibean/JNIACStatus;II)[I */ -JNIEXPORT jintArray JNICALL Java_net_irext_remote_service_DecodeService_irACControl +JNIEXPORT jintArray JNICALL Java_net_irext_decodesdk_IRDecode_irACControl (JNIEnv *, jobject, jobject, jint, jint); /* @@ -76,7 +76,7 @@ JNIEXPORT jintArray JNICALL Java_net_irext_remote_service_DecodeService_irACCont * Method: irACLibClose * Signature: ()V */ -JNIEXPORT void JNICALL Java_net_irext_remote_service_DecodeService_irACLibClose +JNIEXPORT void JNICALL Java_net_irext_decodesdk_IRDecode_irACLibClose (JNIEnv *, jobject); /* @@ -84,7 +84,7 @@ JNIEXPORT void JNICALL Java_net_irext_remote_service_DecodeService_irACLibClose * Method: irACGetTemperatureRange * Signature: (I)Lcom/irext/remote/bean/jnibean/JNITemperatureRange; */ -JNIEXPORT jobject JNICALL Java_net_irext_remote_service_DecodeService_irACGetTemperatureRange +JNIEXPORT jobject JNICALL Java_net_irext_decodesdk_IRDecode_irACGetTemperatureRange (JNIEnv *, jobject, jint); /* @@ -92,7 +92,7 @@ JNIEXPORT jobject JNICALL Java_net_irext_remote_service_DecodeService_irACGetTem * Method: irACGetSupportedMode * Signature: ()I */ -JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irACGetSupportedMode +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedMode (JNIEnv *, jobject); /* @@ -100,7 +100,7 @@ JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irACGetSuppor * Method: irACGetSupportedWindSpeed * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irACGetSupportedWindSpeed +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedWindSpeed (JNIEnv *, jobject, jint); /* @@ -108,7 +108,7 @@ JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irACGetSuppor * Method: irACGetSupportedSwing * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irACGetSupportedSwing +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedSwing (JNIEnv *, jobject, jint); /* @@ -116,7 +116,7 @@ JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irACGetSuppor * Method: irACGetSupportedWindDirection * Signature: ()I */ -JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irACGetSupportedWindDirection +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedWindDirection (JNIEnv *, jobject); /* @@ -124,7 +124,7 @@ JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irACGetSuppor * Method: irTVLibOpen * Signature: (Ljava/lang/String;I)I */ -JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irTVLibOpen +JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irTVLibOpen (JNIEnv *, jobject, jstring, jint); /* @@ -132,7 +132,7 @@ JNIEXPORT jint JNICALL Java_net_irext_remote_service_DecodeService_irTVLibOpen * Method: irTVControl * Signature: (I)[I */ -JNIEXPORT jintArray JNICALL Java_net_irext_remote_service_DecodeService_irTVControl +JNIEXPORT jintArray JNICALL Java_net_irext_decodesdk_IRDecode_irTVControl (JNIEnv *, jobject, jint); /* @@ -140,17 +140,17 @@ JNIEXPORT jintArray JNICALL Java_net_irext_remote_service_DecodeService_irTVCont * Method: irTVLibClose * Signature: ()V */ -JNIEXPORT void JNICALL Java_net_irext_remote_service_DecodeService_irTVLibClose +JNIEXPORT void JNICALL Java_net_irext_decodesdk_IRDecode_irTVLibClose (JNIEnv *, jobject); #ifdef __cplusplus } #endif #endif -/* Header for class net_irext_remote_service_DecodeService_LocalBinder */ +/* Header for class net_irext_decodesdk_IRDecode_LocalBinder */ -#ifndef _Included_net_irext_remote_service_DecodeService_LocalBinder -#define _Included_net_irext_remote_service_DecodeService_LocalBinder +#ifndef _Included_net_irext_decodesdk_IRDecode_LocalBinder +#define _Included_net_irext_decodesdk_IRDecode_LocalBinder #ifdef __cplusplus extern "C" { #endif diff --git a/src/ir_reverser/empty b/src/ir_reverser/empty new file mode 100644 index 0000000..e69de29