diff --git a/android-example/app/build.gradle b/android-example/app/build.gradle index d0cd6e9..548f71a 100644 --- a/android-example/app/build.gradle +++ b/android-example/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "net.irext.ircontrol" minSdkVersion 19 targetSdkVersion 25 - versionCode 3 - versionName '0.1.4' + versionCode 4 + versionName '0.1.5' } buildTypes { release { diff --git a/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so b/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so index 6bdeaf5..29a92be 100644 Binary files a/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so and b/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so b/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so index d0ce7d6..dff32fb 100644 Binary files a/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so and b/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/armeabi/libirdecode.so b/android-example/app/src/main/jniLibs/armeabi/libirdecode.so index 986b02e..1cfbe60 100644 Binary files a/android-example/app/src/main/jniLibs/armeabi/libirdecode.so and b/android-example/app/src/main/jniLibs/armeabi/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/mips/libirdecode.so b/android-example/app/src/main/jniLibs/mips/libirdecode.so index eb7ae1c..9242397 100644 Binary files a/android-example/app/src/main/jniLibs/mips/libirdecode.so and b/android-example/app/src/main/jniLibs/mips/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/mips64/libirdecode.so b/android-example/app/src/main/jniLibs/mips64/libirdecode.so index 8d1df59..93799cd 100644 Binary files a/android-example/app/src/main/jniLibs/mips64/libirdecode.so and b/android-example/app/src/main/jniLibs/mips64/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/x86/libirdecode.so b/android-example/app/src/main/jniLibs/x86/libirdecode.so index 9f84ea6..44d6c05 100644 Binary files a/android-example/app/src/main/jniLibs/x86/libirdecode.so and b/android-example/app/src/main/jniLibs/x86/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/x86_64/libirdecode.so b/android-example/app/src/main/jniLibs/x86_64/libirdecode.so index 76856b7..a3636be 100644 Binary files a/android-example/app/src/main/jniLibs/x86_64/libirdecode.so and b/android-example/app/src/main/jniLibs/x86_64/libirdecode.so differ diff --git a/android-example/decodesdk/irextdecode/src/ir_ac_binary_parse.c b/android-example/decodesdk/irextdecode/src/ir_ac_binary_parse.c index b3360a4..d154f54 100644 --- a/android-example/decodesdk/irextdecode/src/ir_ac_binary_parse.c +++ b/android-example/decodesdk/irextdecode/src/ir_ac_binary_parse.c @@ -33,7 +33,11 @@ const UINT16 tag_index[TAG_COUNT_FOR_PROTOCOL] = INT8 binary_parse_offset() { int i = 0; - UINT16 *phead = (UINT16 *) &p_ir_buffer->data[1]; +#if defined BOARD_ESP8266 + UINT8 *phead = (UINT8 *)&p_ir_buffer->data[1]; +#else + UINT16 *phead = (UINT16 *)&p_ir_buffer->data[1]; +#endif // BOARD_ESP8266 tag_count = p_ir_buffer->data[0]; if (TAG_COUNT_FOR_PROTOCOL != tag_count) @@ -59,6 +63,10 @@ INT8 binary_parse_offset() #if defined BOARD_STM8 && defined COMPILER_IAR UINT16 offset = *(phead + i); tags[i].offset = (offset >> 8) | (offset << 8); +#elif defined BOARD_ESP8266 + UINT16 tmp_a = *(phead + i * 2); + UINT16 tmp_b = *(phead + i * 2 + 1); + tags[i].offset = tmp_b << 8 | tmp_a; #else tags[i].offset = *(phead + i); #endif diff --git a/android-example/decodesdk/irextdecode/src/ir_decode.c b/android-example/decodesdk/irextdecode/src/ir_decode.c index 5391b2b..367e874 100644 --- a/android-example/decodesdk/irextdecode/src/ir_decode.c +++ b/android-example/decodesdk/irextdecode/src/ir_decode.c @@ -267,7 +267,7 @@ static UINT16 ir_ac_lib_control(t_remote_ac_status ac_status, UINT16 *user_data, UINT16 time_length = 0; #if defined BOARD_PC - UINT8 i = 0; + UINT16 i = 0; #endif if (0 == context->default_code.len)