irext/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 2016-11-03 b2

Browse Source 
1. changed macro naming scheme
2. resolved some comments
This commit is contained in:
strawmanbobi
2016-11-03 23:04:54 +08:00
parent 8a4294381e
commit e9267b42fc
19 changed files with 197 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

280
src/ir_decoder/.idea/workspace.xml generated
View File

@@ -32,15 +32,13 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="irda_decode.c" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/irda_decode.c">
<file leaf-file-name="irda_apply.c" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/irda_apply.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5184">
<caret line="1550" column="0" selection-start-line="1550" selection-start-column="0" selection-end-line="1550" selection-end-column="0" />
<state relative-caret-position="193">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="e#423#441#0" expanded="true" />
<element signature="e#512#534#0" expanded="true" />
<element signature="e#582#601#0" expanded="true" />
<element signature="e#446#469#0" expanded="true" />
</folding>
</state>
</provider>
@@ -49,97 +47,23 @@
<file leaf-file-name="irda_decode.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/irda_decode.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
<state relative-caret-position="369">
<caret line="386" column="27" selection-start-line="386" selection-start-column="27" selection-end-line="386" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="irda_lib.c" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/irda_lib.c">
<file leaf-file-name="Android.mk" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Android.mk">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2015">
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding>
<element signature="e#726#744#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="irda_lib.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/irda_lib.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="249" column="0" selection-start-line="249" selection-start-column="0" selection-end-line="249" selection-end-column="0" />
<state relative-caret-position="64">
<caret line="4" column="21" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="irda_parse_forbidden_info.c" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/irda_parse_forbidden_info.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="irda_parse_forbidden_info.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/irda_parse_forbidden_info.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="irda_parse_frame_parameter.c" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/irda_parse_frame_parameter.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="irda_parse_frame_parameter.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/irda_parse_frame_parameter.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="irda_utils.c" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/irda_utils.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="52" selection-start-line="5" selection-start-column="52" selection-end-line="5" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="irda_utils.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/irda_utils.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="68" selection-start-line="5" selection-start-column="68" selection-end-line="5" selection-end-column="68" />
<folding>
<element signature="e#417#439#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="IdeDocumentHistory">
@@ -156,25 +80,25 @@
<option value="$PROJECT_DIR$/ucon_decode.h" />
<option value="$PROJECT_DIR$/ucon_decode_jni.c" />
<option value="$PROJECT_DIR$/ucon_decode.c" />
<option value="$PROJECT_DIR$/Android.mk" />
<option value="$PROJECT_DIR$/irda_apply.c" />
<option value="$PROJECT_DIR$/irda_apply.h" />
<option value="$PROJECT_DIR$/irda_decode_jni.c" />
<option value="$PROJECT_DIR$/irda_defs.h" />
<option value="$PROJECT_DIR$/irda_irframe.c" />
<option value="$PROJECT_DIR$/irda_irframe.h" />
<option value="$PROJECT_DIR$/irda_parse_ac_parameter.c" />
<option value="$PROJECT_DIR$/irda_parse_ac_parameter.h" />
<option value="$PROJECT_DIR$/irda_parse_forbidden_info.c" />
<option value="$PROJECT_DIR$/irda_parse_forbidden_info.h" />
<option value="$PROJECT_DIR$/irda_parse_frame_parameter.c" />
<option value="$PROJECT_DIR$/irda_parse_frame_parameter.h" />
<option value="$PROJECT_DIR$/irda_utils.c" />
<option value="$PROJECT_DIR$/irda_utils.h" />
<option value="$PROJECT_DIR$/irda_decode.h" />
<option value="$PROJECT_DIR$/irda_decode.c" />
<option value="$PROJECT_DIR$/irda_irframe.c" />
<option value="$PROJECT_DIR$/irda_lib.c" />
<option value="$PROJECT_DIR$/irda_lib.h" />
<option value="$PROJECT_DIR$/irda_decode.c" />
<option value="$PROJECT_DIR$/irda_parse_ac_parameter.c" />
<option value="$PROJECT_DIR$/irda_parse_frame_parameter.c" />
<option value="$PROJECT_DIR$/irda_apply.c" />
<option value="$PROJECT_DIR$/irda_decode.h" />
<option value="$PROJECT_DIR$/Android.mk" />
</list>
</option>
</component>
@@ -474,22 +398,23 @@
<workItem from="1470792404312" duration="7000" />
<workItem from="1478095215915" duration="826000" />
<workItem from="1478182519665" duration="2121000" />
<workItem from="1478184890676" duration="595000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="20165000" />
<option name="totallyTimeSpent" value="20760000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1065" extended-state="6" />
<editor active="true" />
<editor active="false" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12697576" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1332982" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26077348" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26077348" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27403316" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37900552" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2198895" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32928178" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -717,20 +642,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/irda_ac_decode.c" />
<entry file="file://$PROJECT_DIR$/irda_ac_decode.h" />
<entry file="file://$PROJECT_DIR$/bc_parse_parameter.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="509">
<caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bc_parse_parameter.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="560">
<caret line="40" column="58" selection-start-line="40" selection-start-column="58" selection-end-line="40" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bc_parse_parameter.h" />
<entry file="file://$PROJECT_DIR$/bc_parse_parameter.c" />
<entry file="file://D:/cygwin64/usr/include/stdio.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="219">
@@ -745,13 +658,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/include/irda_decode_jni.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="421">
<caret line="130" column="54" selection-start-line="130" selection-start-column="54" selection-end-line="130" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
@@ -760,22 +666,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Android.mk">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_apply.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_apply.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
@@ -797,21 +687,13 @@
<state relative-caret-position="80">
<caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
<folding>
<element signature="e#555#613#0" expanded="true" />
<element signature="e#915#1230#0" expanded="true" />
<element signature="e#1258#1566#0" expanded="true" />
<element signature="e#562#620#0" expanded="true" />
<element signature="e#924#1241#0" expanded="false" />
<element signature="e#1273#1585#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_irframe.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="64" selection-start-line="5" selection-start-column="64" selection-end-line="5" selection-end-column="64" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_irframe.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
@@ -820,14 +702,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_parse_ac_parameter.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_parse_ac_parameter.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
@@ -852,14 +726,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_parse_frame_parameter.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_parse_frame_parameter.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
@@ -868,14 +734,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_utils.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="52" selection-start-line="5" selection-start-column="52" selection-end-line="5" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_utils.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
@@ -886,43 +744,97 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_decode.h">
<entry file="file://$PROJECT_DIR$/include/irda_decode_jni.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
<state relative-caret-position="16">
<caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_lib.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2015">
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<state relative-caret-position="161">
<caret line="240" column="55" selection-start-line="240" selection-start-column="55" selection-end-line="240" selection-end-column="55" />
<folding>
<element signature="e#726#744#0" expanded="true" />
<element signature="e#690#708#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_utils.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_parse_ac_parameter.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
<caret line="742" column="6" selection-start-line="742" selection-start-column="6" selection-end-line="742" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_lib.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="249" column="0" selection-start-line="249" selection-start-column="0" selection-end-line="249" selection-end-column="0" />
<state relative-caret-position="160">
<caret line="10" column="37" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_irframe.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="88" column="35" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_decode.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5184">
<caret line="1550" column="0" selection-start-line="1550" selection-start-column="0" selection-end-line="1550" selection-end-column="0" />
<state relative-caret-position="353">
<caret line="344" column="5" selection-start-line="344" selection-start-column="5" selection-end-line="344" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_parse_frame_parameter.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="273" column="1" selection-start-line="273" selection-start-column="1" selection-end-line="273" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_apply.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="e#423#441#0" expanded="true" />
<element signature="e#512#534#0" expanded="true" />
<element signature="e#582#601#0" expanded="true" />
<element signature="e#446#469#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/irda_decode.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="369">
<caret line="386" column="27" selection-start-line="386" selection-start-column="27" selection-end-line="386" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Android.mk">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="4" column="21" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</component>
</project>

2
src/ir_decoder/Android.mk
View File

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_CFLAGS := -DBOARD_MT6580
LOCAL_CFLAGS := -DBOARD_ANDROID
LOCAL_MODULE := libirdecode
LOCAL_SRC_FILES := irda_decode_jni.c \
irda_decode.c \

55
src/ir_decoder/irda_apply.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_apply.c
Revised: Date: 2015-08-12
Revised: Date: 2016-10-12
Revision: Revision: 1.0
Description: This file provides methods for AC IR applying functionalities
@@ -8,7 +8,7 @@ Description: This file provides methods for AC IR applying functionalities
Revision log:
* 2015-08-12: created by strawmanbobi
* 2016-10-12: created by strawmanbobi
**************************************************************************************************/
/*
*inclusion
@@ -17,9 +17,6 @@ Revision log:
#include "irda_utils.h"
#include "irda_decode.h"
#include "irda_apply.h"
#if defined BOARD_CC254X
#include "npi.h"
#endif
/*
* global vars
@@ -401,7 +398,6 @@ INT8 apply_ac_function(struct ac_protocol *protocol, UINT8 function)
return IR_DECODE_SUCCEEDED;
}
/* modified by xiangjiang 2015-11-20 - begin - */
INT8 apply_checksum_byte(UINT8 *ac_code, tag_checksum_data cs, BOOL inverse)
{
UINT16 i = 0;
@@ -427,7 +423,7 @@ INT8 apply_checksum_byte(UINT8 *ac_code, tag_checksum_data cs, BOOL inverse)
// apply checksum
ac_code[cs.checksum_byte_pos] = checksum;
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
IR_PRINTF("checksum value = %02X\n", checksum);
IR_PRINTF("checksum byte pos = %d\n", cs.checksum_byte_pos);
IR_PRINTF("\n");
@@ -461,7 +457,7 @@ INT8 apply_checksum_halfbyte(UINT8 *ac_code, tag_checksum_data cs, BOOL inverse)
// apply checksum
ac_code[cs.checksum_byte_pos] = checksum;
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
IR_PRINTF("checksum value = %02X\n", checksum & 0x0F);
IR_PRINTF("checksum byte pos = %d\n", cs.checksum_byte_pos);
IR_PRINTF("\n");
@@ -518,7 +514,7 @@ INT8 apply_checksum_spec_byte(UINT8 *ac_code, tag_checksum_data cs, BOOL inverse
ac_code[apply_byte_pos] = (ac_code[apply_byte_pos] & 0xF0) | (checksum & 0x0F);
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
IR_PRINTF("checksum value = %02X\n", checksum & 0x0F);
IR_PRINTF("checksum byte pos = %d\n", apply_byte_pos);
#endif
@@ -565,48 +561,16 @@ INT8 apply_checksum_spec_byte_onebyte(UINT8 *ac_code, tag_checksum_data cs, BOOL
apply_byte_pos = cs.checksum_byte_pos >> 1;
ac_code[apply_byte_pos] = checksum;
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
IR_PRINTF("checksum value = %02X\n", checksum);
IR_PRINTF("checksum byte pos = %d\n", apply_byte_pos);
#endif
return IR_DECODE_SUCCEEDED;
}
/* modified by xiangjiang 2015-11-20 - end - */
INT8 apply_checksum(struct ac_protocol *protocol)
{
/* modified by xiangjiang 2015-11-20 - begin - */
#if 0
if (0 == protocol->checksum.len)
{
return IR_DECODE_SUCCEEDED;
}
switch (protocol->checksum.type)
{
case CHECKSUM_TYPE_BYTE:
apply_checksum_byte(ir_hex_code, protocol->checksum, FALSE);
break;
case CHECKSUM_TYPE_BYTE_INVERSE:
apply_checksum_byte(ir_hex_code, protocol->checksum, TRUE);
break;
case CHECKSUM_TYPE_HALF_BYTE:
apply_checksum_halfbyte(ir_hex_code, protocol->checksum, FALSE);
break;
case CHECKSUM_TYPE_HALF_BYTE_INVERSE:
apply_checksum_halfbyte(ir_hex_code, protocol->checksum, TRUE);
break;
case CHECKSUM_TYPE_SPEC_HALF_BYTE:
apply_checksum_spec_byte(ir_hex_code, protocol->checksum, FALSE);
break;
case CHECKSUM_TYPE_SPEC_HALF_BYTE_INVERSE:
apply_checksum_spec_byte(ir_hex_code, protocol->checksum, TRUE);
break;
default:
break;
}
#else
UINT8 i = 0;
if (0 == protocol->checksum.len)
@@ -614,7 +578,7 @@ INT8 apply_checksum(struct ac_protocol *protocol)
return IR_DECODE_SUCCEEDED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
// have some debug
IR_PRINTF("\napply checksum :\n");
IR_PRINTF("checksum num = %d\n", protocol->checksum.count);
@@ -622,7 +586,7 @@ INT8 apply_checksum(struct ac_protocol *protocol)
for(i = 0; i < protocol->checksum.count; i++)
{
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
// have some debug
IR_PRINTF("num : %d\n", i + 1);
IR_PRINTF("checksum type = %02X\n", protocol->checksum.checksum_data[i].type);
@@ -659,9 +623,6 @@ INT8 apply_checksum(struct ac_protocol *protocol)
}
}
#endif
/* modified by xiangjiang 2015-11-20 - end - */
return IR_DECODE_SUCCEEDED;
}

4
src/ir_decoder/irda_apply.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_apply.h
Revised: Date: 2015-08-12
Revised: Date: 2016-10-12
Revision: Revision: 1.0
Description: This file provides methods for AC IR applying functionalities
@@ -8,7 +8,7 @@ Description: This file provides methods for AC IR applying functionalities
Revision log:
* 2015-08-12: created by strawmanbobi
* 2016-10-12: created by strawmanbobi
**************************************************************************************************/
/*

46
src/ir_decoder/irda_decode.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_decode.c
Revised: Date: 2015-08-01
Revised: Date: 2016-10-01
Revision: Revision: 1.0
Description: This file provides algorithms for IR decode (status type)
@@ -8,12 +8,12 @@ Description: This file provides algorithms for IR decode (status type)
Revision log:
* 2015-08-01: created by strawmanbobi
* 2016-10-01: created by strawmanbobi
**************************************************************************************************/
#include <stdio.h>
#include <stdlib.h>
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
#include <sys/types.h>
#include <unistd.h>
#include <errno.h>
@@ -44,7 +44,7 @@ UINT16 tag_head_offset = 0;
UINT16 global_mem_consume = 0;
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
UINT8 byteArray[PROTOCOL_SIZE] = {0};
UINT16 user_data[USER_DATA_SIZE] = {0};
UINT8 tv_bin[EXPECTED_MEM_SIZE] = {0};
@@ -52,7 +52,7 @@ UINT16 tv_bin_length = 0;
remote_ac_status_t ac_status;
#endif
// 2015-09-06 protocol version minor change: parse TAG 1009 instead of TAG 304
// 2016-10-06 protocol version minor change: parse TAG 1009 instead of TAG 304
const UINT16 tag_index[TAG_COUNT_FOR_PROTOCOL] =
{
300, 301, 302, 303, 305, 306, 307, 1001, 1002,
@@ -67,7 +67,7 @@ const UINT16 bc_tag_index[TAG_COUNT_FOR_BC_PROTOCOL] =
206, 207, 208, 209, 210, 211, 212, 213, 214, 300
};
// 2015-09-09 updated by strawmanbobi, change global data context to array pointer
// 2016-10-09 updated by strawmanbobi, change global data context to array pointer
protocol *context = (protocol *) byteArray;
// BLE decode structure, share with a same byteArray to save memory
@@ -94,7 +94,7 @@ lp_apply_ac_parameter apply_table[AC_APPLY_MAX] =
///////////////////////////////////////////////// Air Conditioner Begin /////////////////////////////////////////////////
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
INT8 binary_open(const char *file)
{
FILE *stream = fopen(file, "rb");
@@ -181,7 +181,7 @@ INT8 binary_parse_len()
return IR_DECODE_SUCCEEDED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
void binary_tags_info()
{
UINT16 i = 0;
@@ -328,14 +328,6 @@ INT8 free_ac_context()
context->swing2.comp_data = NULL;
}
/* modified by xiangjiang 2015-11-20 - begin - */
#if 0
if(context->checksum.spec_pos != NULL)
{
irda_free(context->checksum.spec_pos);
context->checksum.spec_pos = NULL;
}
#else
for(i = 0; i < context->checksum.count; i++)
{
if(context->checksum.checksum_data != NULL &&
@@ -351,13 +343,11 @@ INT8 free_ac_context()
irda_free(context->checksum.checksum_data);
context->checksum.checksum_data = NULL;
}
#endif
/* modified by xiangjiang 2015-11-20 - end - */
return IR_DECODE_SUCCEEDED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
INT8 irda_ac_lib_open(const char *file_name)
{
IR_PRINTF("\nirda_ac_lib_open: %s\n", file_name);
@@ -384,7 +374,7 @@ INT8 irda_ac_lib_parse()
{
UINT16 i = 0;
// suggest not to call init function here for de-couple purpose
#if defined BOARD_CC254X
#if defined BOARD_EMBEDDED
irda_context_init();
#endif
if (IR_DECODE_FAILED == binary_parse_offset())
@@ -402,7 +392,7 @@ INT8 irda_ac_lib_parse()
return IR_DECODE_FAILED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
binary_tags_info();
#endif
context->endian = 0;
@@ -940,7 +930,7 @@ UINT16 irda_ac_lib_control(remote_ac_status_t ac_status, UINT16 *user_data, UINT
UINT8 change_wind_direction)
{
UINT16 time_length = 0;
#if (defined BOARD_PC)|| (defined BOARD_MT6580)
#if (defined BOARD_PC)|| (defined BOARD_ANDROID)
UINT8 i = 0;
#endif
@@ -1048,7 +1038,7 @@ UINT16 irda_ac_lib_control(remote_ac_status_t ac_status, UINT16 *user_data, UINT
apply_checksum(context);
// have some debug
#if (defined BOARD_PC)|| (defined BOARD_MT6580)
#if (defined BOARD_PC)|| (defined BOARD_ANDROID)
IR_PRINTF("==============================\n");
for(i = 0; i < ir_hex_len; i++)
{
@@ -1056,7 +1046,7 @@ UINT16 irda_ac_lib_control(remote_ac_status_t ac_status, UINT16 *user_data, UINT
}
IR_PRINTF("\n");
#endif
#if (defined BOARD_CC254X) && (PRINT_IRDA_DATA == TRUE)
#if (defined BOARD_EMBEDDED) && (PRINT_IRDA_DATA == TRUE)
NPI_PrintString("hex:\r\n");
for (UINT16 i = 0; i < context->default_code.len; i++)
@@ -1229,7 +1219,7 @@ INT8 get_supported_wind_direction(UINT8* supported_wind_direction)
///////////////////////////////////////////////// TV Begin /////////////////////////////////////////////////
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
INT8 binary_tv_open(const char *file)
{
int print_index = 0;
@@ -1265,7 +1255,7 @@ INT8 binary_tv_open(const char *file)
}
#endif
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
INT8 irda_tv_lib_open(const char *file_name)
{
return binary_tv_open(file_name);
@@ -1278,7 +1268,7 @@ INT8 irda_tv_lib_open(UINT8 *binary_file, UINT16 binary_length)
}
#endif
#if (defined BOARD_PC)|| (defined BOARD_MT6580)
#if (defined BOARD_PC)|| (defined BOARD_ANDROID)
INT8 irda_tv_lib_parse(UINT8 irda_hex_encode)
{
if (FALSE == irda_lib_parse(irda_hex_encode))
@@ -1320,7 +1310,7 @@ UINT16 irda_tv_lib_close()
///////////////////////////////////////////////// TV End /////////////////////////////////////////////////
///////////////////////////////////////////////// Decode Test Begin /////////////////////////////////////////////////
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
UINT8 decode_as_ac(char *file_name)
{

30
src/ir_decoder/irda_decode.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_decode.h
Revised: Date: 2015-08-01
Revised: Date: 2016-10-01
Revision: Revision: 1.0
Description: This file provides algorithms for IR decode
@@ -8,7 +8,7 @@ Description: This file provides algorithms for IR decode
Revision log:
* 2015-08-01: created by strawmanbobi
* 2016-10-01: created by strawmanbobi
**************************************************************************************************/
#ifndef _IRDA_DECODE_H_
#define _IRDA_DECODE_H_
@@ -19,11 +19,11 @@ Revision log:
#define TAG_COUNT_FOR_PROTOCOL 29
#define TAG_COUNT_FOR_BC_PROTOCOL 20
#if defined BOARD_CC254X
#if defined BOARD_EMBEDDED
#define KEY_COUNT 15
#elif (defined BOARD_PC) || (defined BOARD_MT6580)
#elif (defined BOARD_PC) || (defined BOARD_ANDROID)
#define KEY_COUNT 15
@@ -33,7 +33,7 @@ Revision log:
#endif
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
#define EXPECTED_MEM_SIZE 1024
#endif
@@ -255,7 +255,6 @@ typedef struct tag_1006_horiswing_1
} hori_swing_1;
#endif
/* modified by xiangjiang 2015-11-20 - begin - */
typedef struct _tag_checksum_data
{
UINT8 len;
@@ -273,7 +272,6 @@ typedef struct tag_checksum
UINT16 count;
tag_checksum_data *checksum_data;
} tchecksum;
/* modified by xiangjiang 2015-11-20 - end - */
typedef struct tag_function_1
{
@@ -377,7 +375,7 @@ typedef struct ac_protocol
UINT8 solo_function_mark;
} protocol;
#if defined BOARD_MC200
#if defined BOARD_FREE_RTOS
#pragma pack(1)
#endif
typedef struct bc_command
@@ -386,7 +384,7 @@ typedef struct bc_command
UINT16 handle;
UINT8 command[BLE_GAP_MTU];
} t_bc_command;
#if defined BOARD_MC200
#if defined BOARD_FREE_RTOS
#pragma pack()
#endif
@@ -420,7 +418,7 @@ typedef struct tag_head
UINT8 *pdata;
} t_tag_head;
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
struct ir_bin_buffer
{
UINT8 data[EXPECTED_MEM_SIZE];
@@ -514,13 +512,13 @@ typedef INT8 (*lp_apply_ac_parameter) (remote_ac_status_t ac_status, UINT8 funct
#define TAG_BC_KEY_14_CMD 214
// definition about size
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
#define PROTOCOL_SIZE (sizeof(protocol))
#define BC_PROTOCOL_SIZE (sizeof(t_bc_protocol))
#elif defined BOARD_CC254X
#elif defined BOARD_EMBEDDED
#define PROTOCOL_SIZE 850
#define BC_PROTOCOL_SIZE (sizeof(t_bc_protocol))
#elif defined BOARD_MC200
#elif defined BOARD_FREE_RTOS
#define PROTOCOL_SIZE (sizeof(protocol)) //1168
#define BC_PROTOCOL_SIZE (sizeof(t_bc_protocol))
#else
@@ -555,7 +553,7 @@ extern INT8 irda_context_init();
*
* return: IR_DECODE_SUCCEEDED / IR_DECODE_FAILED
*/
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
extern UINT16 user_data[];
extern INT8 irda_ac_lib_open(const char *file_name);
#else
@@ -595,7 +593,7 @@ extern void irda_ac_lib_close();
///////////////////////////////////////////////// AC End /////////////////////////////////////////////////
///////////////////////////////////////////////// TV Begin /////////////////////////////////////////////////
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
/*
* function irda_tv_lib_open
*
@@ -645,7 +643,7 @@ extern INT8 bc_context_init();
*
* return: IR_DECODE_SUCCEEDED / IR_DECODE_FAILED
*/
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
extern INT8 bc_lib_open(const char *file_name);
#else
extern INT8 bc_lib_open(UINT8 *binary_file, UINT16 binary_length);

20
src/ir_decoder/irda_defs.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_defs.h
Revised: Date: 2015-08-26
Revised: Date: 2016-10-26
Revision: Revision: 1.0
Description: This file provides algorithms for IR decode
@@ -8,18 +8,18 @@ Description: This file provides algorithms for IR decode
Revision log:
* 2015-08-01: created by strawmanbobi
* 2016-10-01: created by strawmanbobi
**************************************************************************************************/
#if defined BOARD_CC254X
#if defined BOARD_EMBEDDED
#include "osal.h"
#endif
#if defined BOARD_MC200
#if defined BOARD_FREE_RTOS
#include "wmstdio.h"
#include "wm_os.h"
#endif
#if defined BOARD_MT6580
#if defined BOARD_ANDROID
#include <android/log.h>
#define LOG_TAG "irda_decode"
#endif
@@ -40,7 +40,7 @@ typedef unsigned short UINT16;
typedef signed short INT16;
typedef unsigned char BOOL;
#if defined BOARD_CC254X
#if defined BOARD_EMBEDDED
#define irda_malloc(A) osal_mem_alloc(A)
#define irda_free(A) osal_mem_free(A)
#define irda_memcpy(A, B, C) osal_memcpy(A, B, C)
@@ -48,18 +48,18 @@ typedef unsigned char BOOL;
#define irda_strlen(A) osal_strlen(A)
#define IR_PRINTF(A)
#if !defined BOARD_CC254X
#if !defined BOARD_EMBEDDED
#define USER_DATA_SIZE IRDA_USER_DATA_SIZE
#endif
#elif defined BOARD_MC200
#elif defined BOARD_FREE_RTOS
#define irda_malloc(A) os_mem_alloc(A)
#define irda_free(A) os_mem_free(A)
#define irda_memcpy(A, B, C) memcpy(A, B, C)
#define irda_memset(A, B, C) memset(A, B, C)
#define irda_strlen(A) strlen(A)
#define IR_PRINTF(A)
// temporarily define USER_DATA_SIZE as 1200 for BOARD_MC200
// temporarily define USER_DATA_SIZE as 1200 for BOARD_FREE_RTOS
#define USER_DATA_SIZE 1200
#elif defined BOARD_PC
#define irda_malloc(A) malloc(A)
@@ -70,7 +70,7 @@ typedef unsigned char BOOL;
#define IR_PRINTF printf
// temporarily define USER_DATA_SIZE as 2048 for BOARD_PC
#define USER_DATA_SIZE 2048
#elif defined BOARD_MT6580
#elif defined BOARD_ANDROID
#define irda_malloc(A) malloc(A)
#define irda_free(A) free(A)
#define irda_memcpy(A, B, C) memcpy(A, B, C)

36
src/ir_decoder/irda_irframe.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_irframe.c
Revised: Date: 2015-08-01
Revised: Date: 2016-10-01
Revision: Revision: 1.0
Description: This file provides algorithms for IR frame build
@@ -8,7 +8,7 @@ Description: This file provides algorithms for IR frame build
Revision log:
* 2015-08-01: created by strawmanbobi
* 2016-10-01: created by strawmanbobi
**************************************************************************************************/
#include <stdio.h>
@@ -48,34 +48,6 @@ UINT16 add_delaycode(UINT8 index)
UINT8 tail_delaycode = 0;
UINT16 tail_pos = 0;
/* updated by xiangjiang - 2015-08-31 - begin */
#if 0
//Handle TAG307
if ((context->lastbit == 0) && (index == (ir_hex_len - 1)))
{
context->time[context->code_cnt++] = context->one.low; //high
}
if (context->dc_cnt == 0)
return 0;
else
size = context->dc_cnt;
for (i = 0; i < size; i++)
{
if (context->dc[i].pos == index)
{
for (j = 0; j < context->dc[i].time_cnt; j++)
{
context->time[context->code_cnt++] = context->dc[i].time[j];
}
return context->dc[i].time_cnt;
}
}
return 0;
#else
if(context->dc_cnt != 0)
{
size = context->dc_cnt;
@@ -115,8 +87,6 @@ UINT16 add_delaycode(UINT8 index)
}
return context->dc[i].time_cnt;
#endif
/* updated by xiangjiang - 2015-08-31 - end */
}
UINT16 create_ir_frame()
@@ -176,7 +146,7 @@ UINT16 create_ir_frame()
}
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
for (i = 0; i < context->code_cnt; i++)
{
IR_PRINTF("%d,", context->time[i]);

4
src/ir_decoder/irda_irframe.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_utils.c
Revised: Date: 2015-08-26
Revised: Date: 2016-10-26
Revision: Revision: 1.0
Description: This file provides generic utils for IR frame build
@@ -8,7 +8,7 @@ Description: This file provides generic utils for IR frame build
Revision log:
* 2015-08-01: created by strawmanbobi
* 2016-10-01: created by strawmanbobi
**************************************************************************************************/
#include "irda_defs.h"

29
src/ir_decoder/irda_lib.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_lib.c
Revised: Date: 2016-01-21
Revised: Date: 2016-10-21
Revision: Revision: 1.0
Description: This file provides algorithms for IR decode (compressed command type)
@@ -8,8 +8,7 @@ Description: This file provides algorithms for IR decode (compressed command
Revision log:
* 2016-01-21: created by strawmanbobi
* 2016-05-06: upadted by xiangjiang
* 2016-10-21: created by strawmanbobi
**************************************************************************************************/
/**************************************************************************************************
@@ -41,7 +40,7 @@ Revision log:
/**************************************************************************************************
* LOCAL DATA TYPES
**************************************************************************************************/
#if defined BOARD_MC200
#if defined BOARD_FREE_RTOS
#pragma pack(1)
#endif
struct buffer
@@ -50,7 +49,7 @@ struct buffer
UINT16 len;
UINT16 offset;
} irda_file;
#if defined BOARD_MC200
#if defined BOARD_FREE_RTOS
#pragma pack()
#endif
@@ -227,9 +226,7 @@ static BOOL get_irda_protocol(UINT8 encode_type)
prot_items_data = (irda_data_t *) (pbuffer->data + pbuffer->offset);
pbuffer->offset += prot_items_cnt * sizeof(irda_data_t);
/* added by xiangjiang 2015-08-08 - begin - */
irda_toggle_bit = FALSE;
/* added by xiangjiang 2015-08-08 - end - */
return TRUE;
}
@@ -242,10 +239,6 @@ static BOOL get_irda_keymap(void)
if (strncmp(remote_p->magic, "ykir", 4) == 0)
{
remote_pdata = pbuffer->data + pbuffer->offset;
/* modified by xiangjiang 2015-06-03 - begin - */
//pbuffer->offset += remote_p->per_keycode_bytes * 12;
//pbuffer->offset += remote_p->per_keycode_bytes * TV_KEY_MAX;
/* modified by xiangjiang 2015-06-03 - end - */
return TRUE;
}
@@ -380,21 +373,21 @@ static void print_irda_time(irda_data_t *data, UINT8 keyindex, UINT16 *irda_time
if (irda_decode_flag == IRDA_DECODE_1_BIT)
{
#if (defined BOARD_CC254X) && (PRINT_IRDA_DATA == TRUE)
#if (defined BOARD_EMBEDDED) && (PRINT_IRDA_DATA == TRUE)
NPI_PrintString("\r\n\r\n\r\n[TV-DECODE]: decode as 1 bit");
#endif
process_decode_number(keycode, data, 1, irda_time); // '0','1'
}
else if (irda_decode_flag == IRDA_DECODE_2_BITS)
{
#if (defined BOARD_CC254X) && (PRINT_IRDA_DATA == TRUE)
#if (defined BOARD_EMBEDDED) && (PRINT_IRDA_DATA == TRUE)
NPI_PrintString("\r\n\r\n\r\n[TV-DECODE]: decode as 2 bits");
#endif
process_decode_number(keycode, data, 2, irda_time); // '0','1','2','3'
}
else if (irda_decode_flag == IRDA_DECODE_4_BITS)
{
#if (defined BOARD_CC254X) && (PRINT_IRDA_DATA == TRUE)
#if (defined BOARD_EMBEDDED) && (PRINT_IRDA_DATA == TRUE)
NPI_PrintString("\r\n\r\n\r\n[TV-DECODE]: decode as 4 bits");
#endif
process_decode_number(keycode, data, 4, irda_time); // '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F',
@@ -411,7 +404,7 @@ static void process_decode_number(UINT8 keycode, irda_data_t *data, UINT8 valid_
valid_value = (valid_bits == 1) ? 1 : (valid_bits * valid_bits - 1);
#if (defined BOARD_CC254X) && (PRINT_IRDA_DATA == TRUE)
#if (defined BOARD_EMBEDDED) && (PRINT_IRDA_DATA == TRUE)
NPI_PrintValue("\r\n keycode : 0x", keycode, 16);
NPI_PrintValue("\r\n bits : ", data->bits, 10);
NPI_PrintValue("\r\n valid bits : 0x", valid_value, 16);
@@ -419,7 +412,7 @@ static void process_decode_number(UINT8 keycode, irda_data_t *data, UINT8 valid_
if (data->lsb == IRDA_LSB)
{
#if (defined BOARD_CC254X) && (PRINT_IRDA_DATA == TRUE)
#if (defined BOARD_EMBEDDED) && (PRINT_IRDA_DATA == TRUE)
NPI_PrintString("\r\n endian : lsb");
#endif
for (i = 0; i < bit_num; i++)
@@ -430,7 +423,7 @@ static void process_decode_number(UINT8 keycode, irda_data_t *data, UINT8 valid_
}
else if (data->lsb == IRDA_MSB)
{
#if (defined BOARD_CC254X) && (PRINT_IRDA_DATA == TRUE)
#if (defined BOARD_EMBEDDED) && (PRINT_IRDA_DATA == TRUE)
NPI_PrintString("\r\n endian : msb");
#endif
for (i = 0; i < bit_num; i++)
@@ -443,7 +436,7 @@ static void process_decode_number(UINT8 keycode, irda_data_t *data, UINT8 valid_
static void convert_to_irda_time(UINT8 value, UINT16 *irda_time)
{
#if (defined BOARD_CC254X) && (PRINT_IRDA_DATA == TRUE)
#if (defined BOARD_EMBEDDED) && (PRINT_IRDA_DATA == TRUE)
NPI_PrintValue("\r\n replace value : 0x", value, 16);
#endif
switch (value)

7
src/ir_decoder/irda_lib.h
View File

@@ -8,8 +8,7 @@ Description: This file provides algorithms for IR decode (compressed command
Revision log:
* 2016-01-21: created by strawmanbobi
* 2016-05-06: upadted by xiangjiang
* 2016-10-21: created by strawmanbobi
**************************************************************************************************/
#ifndef _IRDA_H_
@@ -88,7 +87,7 @@ typedef struct irda_data
UINT8 index;
} irda_data_t;
#if (defined BOARD_PC) || (defined BOARD_MC200) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_FREE_RTOS) || (defined BOARD_ANDROID)
#pragma pack(1)
#endif
typedef struct irda_cycles
@@ -97,7 +96,7 @@ typedef struct irda_cycles
UINT16 mask;
UINT16 space;
} irda_cycles_t;
#if (defined BOARD_PC) || (defined BOARD_MC200) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_FREE_RTOS) || (defined BOARD_ANDROID)
#pragma pack()
#endif

80
src/ir_decoder/irda_parse_ac_parameter.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_parse_ac_parameter.c
Revised: Date: 2015-08-12
Revised: Date: 2016-10-12
Revision: Revision: 1.0
Description: This file provides algorithms for IR decode for AC functionality parameters
@@ -8,7 +8,7 @@ Description: This file provides algorithms for IR decode for AC functionality
Revision log:
* 2015-08-12: created by strawmanbobi
* 2016-10-12: created by strawmanbobi
**************************************************************************************************/
/*
*inclusion
@@ -90,7 +90,7 @@ INT8 parse_comp_data_type_2(UINT8 *data, UINT16 *trav_offset, tag_comp *comp)
INT8 parse_common_ac_parameter(t_tag_head *tag, tag_comp *comp_data, UINT8 with_end, UINT8 type)
{
UINT16 hex_len = 0;
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
UINT16 i = 0;
#endif
UINT16 trav_offset = 0;
@@ -129,7 +129,7 @@ INT8 parse_common_ac_parameter(t_tag_head *tag, tag_comp *comp_data, UINT8 with_
hex_data = NULL;
return IR_DECODE_FAILED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
// have some debug
IR_PRINTF("seg[%d].len = %d : \n", seg_index, comp_data[seg_index].seg_len);
for(i = 0; i < comp_data[seg_index].seg_len; i++)
@@ -155,7 +155,7 @@ INT8 parse_common_ac_parameter(t_tag_head *tag, tag_comp *comp_data, UINT8 with_
hex_data = NULL;
return IR_DECODE_FAILED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
// have some debug
IR_PRINTF("seg[%d].len = %d : \n", seg_index, comp_data[seg_index].seg_len);
for(i = 0; i < comp_data[seg_index].seg_len; i++)
@@ -192,7 +192,7 @@ INT8 parse_defaultcode_1002(struct tag_head *tag, ac_hex *default_code)
return IR_DECODE_SUCCEEDED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
INT8 parse_power_1_1001(struct tag_head *tag, power_1 *power1)
{
@@ -319,7 +319,7 @@ INT8 parse_temp_1_1003(struct tag_head *tag, temp_1 *temp1)
return IR_DECODE_FAILED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
// have some debug
IR_PRINTF("seg[%d].len = %d : \n", seg_index, temp1->comp_data[seg_index].seg_len);
for(i = 0; i < temp1->comp_data[seg_index].seg_len; i++)
@@ -341,7 +341,7 @@ INT8 parse_temp_1_1003(struct tag_head *tag, temp_1 *temp1)
return IR_DECODE_SUCCEEDED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
INT8 parse_mode_1_1004(struct tag_head *tag, mode_1 *mode1)
{
@@ -506,7 +506,6 @@ INT8 parse_swing_1_1007(struct tag_head *tag, swing_1 *swing1, UINT16 swing_coun
#endif
/* modified by xiangjiang 2015-11-20 - begin - */
INT8 parse_checksum_byte_typed(UINT8 *csdata, tag_checksum_data *checksum, UINT16 len)
{
checksum->start_byte_pos = csdata[2];
@@ -569,9 +568,7 @@ INT8 parse_checksum_spec_half_byte_typed(UINT8 *csdata, tag_checksum_data *check
return IR_DECODE_SUCCEEDED;
}
/* modified by xiangjiang 2015-11-20 - end - */
/* added by xiangjiang 2015-11-20 - begin - */
INT8 parse_checksum_1008_malloc(struct tag_head *tag, tchecksum *checksum)
{
UINT8 i = 0;
@@ -623,7 +620,7 @@ INT8 parse_checksum_1008_data(UINT8 *buf, tag_checksum_data *checksum, UINT8 len
string_to_hex_common(buf, hex_data, hex_len);
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
UINT8 i = 0;
IR_PRINTF("hex len = %d\n", hex_len);
for(i = 0; i < hex_len; i++)
@@ -684,58 +681,9 @@ INT8 parse_checksum_1008_data(UINT8 *buf, tag_checksum_data *checksum, UINT8 len
hex_data = NULL;
return IR_DECODE_SUCCEEDED;
}
/* added by xiangjiang 2015-11-20 - end - */
INT8 parse_checksum_1008(struct tag_head *tag, tchecksum *checksum)
{
/* modified by xiangjiang 2015-11-20 - begin - */
#if 0
UINT8 *hex_data = NULL;
UINT16 hex_len = 0;
hex_len = tag->len >> 1;
hex_data = (UINT8 *) irda_malloc(hex_len);
if (NULL == hex_data)
{
return IR_DECODE_FAILED;
}
string_to_hex_common(tag->pdata, hex_data, hex_len);
if (tag->len >> 1 != hex_data[0] + 1)
{
irda_free(hex_data);
hex_data = NULL;
return IR_DECODE_FAILED;
}
checksum->len = hex_data[0];
checksum->type = hex_data[1];
switch (checksum->type)
{
case CHECKSUM_TYPE_BYTE:
case CHECKSUM_TYPE_BYTE_INVERSE:
parse_checksum_byte_typed(hex_data, checksum, hex_len);
break;
case CHECKSUM_TYPE_HALF_BYTE:
case CHECKSUM_TYPE_HALF_BYTE_INVERSE:
parse_checksum_half_byte_typed(hex_data, checksum, hex_len);
break;
case CHECKSUM_TYPE_SPEC_HALF_BYTE:
case CHECKSUM_TYPE_SPEC_HALF_BYTE_INVERSE:
parse_checksum_spec_half_byte_typed(hex_data, checksum, hex_len);
break;
default:
irda_free(hex_data);
hex_data = NULL;
return IR_DECODE_FAILED;
}
irda_free(hex_data);
hex_data = NULL;
#else
UINT8 i = 0;
UINT8 num = 0;
UINT16 preindex = 0;
@@ -777,7 +725,7 @@ INT8 parse_checksum_1008(struct tag_head *tag, tchecksum *checksum)
return IR_DECODE_FAILED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
UINT8 j = 0;
for(i = 0; i < checksum->count; i++)
{
@@ -793,10 +741,6 @@ INT8 parse_checksum_1008(struct tag_head *tag, tchecksum *checksum)
IR_PRINTF("\n");
}
#endif
#endif
/* modified by xiangjiang 2015-11-20 - end - */
return IR_DECODE_SUCCEEDED;
}
@@ -979,7 +923,7 @@ INT8 parse_temp_2_1011(struct tag_head *tag, temp_2 *temp2)
temp2->comp_data[seg_index].segment[i] = hex_data[i + 1] * seg_index;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
// have some debug
IR_PRINTF("seg[%d].len = %d : \n", seg_index, temp2->comp_data[seg_index].seg_len);
for(i = 0; i < temp2->comp_data[seg_index].seg_len; i++)
@@ -1016,7 +960,7 @@ INT8 parse_temp_2_1011(struct tag_head *tag, temp_2 *temp2)
return IR_DECODE_SUCCEEDED;
}
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
INT8 parse_mode_2_1012(struct tag_head *tag, mode_2 *mode2)
{

10
src/ir_decoder/irda_parse_ac_parameter.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_parse_ac_parameter.h
Revised: Date: 2015-08-12
Revised: Date: 2016-10-12
Revision: Revision: 1.0
Description: This file provides algorithms for IR decode for AC functionality parameters
@@ -8,7 +8,7 @@ Description: This file provides algorithms for IR decode for AC functionality
Revision log:
* 2015-08-12: created by strawmanbobi
* 2016-10-12: created by strawmanbobi
**************************************************************************************************/
/*
@@ -40,7 +40,7 @@ extern INT8 parse_common_ac_parameter(t_tag_head *tag, tag_comp *comp_data, UINT
extern INT8 parse_defaultcode_1002(struct tag_head *tag, ac_hex *default_code);
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
extern INT8 parse_power_1_1001(struct tag_head *tag, power_1 *power1);
@@ -48,7 +48,7 @@ extern INT8 parse_power_1_1001(struct tag_head *tag, power_1 *power1);
extern INT8 parse_temp_1_1003(struct tag_head *tag, temp_1 *temp1);
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
extern INT8 parse_mode_1_1004(struct tag_head *tag, mode_1 *mode1);
@@ -64,7 +64,7 @@ extern INT8 parse_function_1_1010(struct tag_head *tag, function_1 *function1);
extern INT8 parse_temp_2_1011(struct tag_head *tag, temp_2 *temp2);
#if (defined BOARD_PC) || (defined BOARD_MT6580)
#if (defined BOARD_PC) || (defined BOARD_ANDROID)
extern INT8 parse_mode_2_1012(struct tag_head *tag, mode_2 *mode2);

4
src/ir_decoder/irda_parse_forbidden_info.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_parse_forbidden_info.c
Revised: Date: 2015-08-05
Revised: Date: 2016-10-05
Revision: Revision: 1.0
Description: This file provides algorithms for IR decode for TAG 150x
@@ -8,7 +8,7 @@ Description: This file provides algorithms for IR decode for TAG 150x
Revision log:
* 2015-08-05: created by strawmanbobi
* 2016-10-05: created by strawmanbobi
**************************************************************************************************/
/*

4
src/ir_decoder/irda_parse_forbidden_info.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_parse_forbidden_info.h
Revised: Date: 2015-08-05
Revised: Date: 2016-10-05
Revision: Revision: 1.0
Description: This file provides algorithms for IR decode for TAG 1002
@@ -8,7 +8,7 @@ Description: This file provides algorithms for IR decode for TAG 1002
Revision log:
* 2015-08-05: created by strawmanbobi
* 2016-10-05: created by strawmanbobi
**************************************************************************************************/
/*

16
src/ir_decoder/irda_parse_frame_parameter.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_parse_frame_parameter.c
Revised: Date: 2015-08-11
Revised: Date: 2016-10-11
Revision: Revision: 1.0
Description: This file provides algorithms for IR decode for AC frame parameters
@@ -8,7 +8,7 @@ Description: This file provides algorithms for IR decode for AC frame paramet
Revision log:
* 2015-08-11: created by strawmanbobi
* 2016-10-11: created by strawmanbobi
**************************************************************************************************/
/*
@@ -216,18 +216,6 @@ INT8 parse_delaycode_303(struct tag_head *tag)
parse_delaycode_303_pos(buf);
irda_memset(buf, 0, 64);
/* updated by xiangjiang - 2015-08-31 - begin */
#if 0
for (i = 0; i < context->dc_cnt; i++)
{
if (context->dc[i].pos == -1)
{
context->dc[i].pos = (context->default_code.len - 1);
}
}
#endif
/* updated by xiangjiang - 2015-08-31 - end */
return IR_DECODE_SUCCEEDED;
}

4
src/ir_decoder/irda_parse_frame_parameter.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_parse_frame_parameter.h
Revised: Date: 2015-08-11
Revised: Date: 2016-10-11
Revision: Revision: 1.0
Description: This file provides algorithms for IR decode for AC frame parameters
@@ -8,7 +8,7 @@ Description: This file provides algorithms for IR decode for AC frame paramet
Revision log:
* 2015-08-11: created by strawmanbobi
* 2016-10-11: created by strawmanbobi
**************************************************************************************************/
/*

4
src/ir_decoder/irda_utils.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_utils.c
Revised: Date: 2015-08-26
Revised: Date: 2016-10-26
Revision: Revision: 1.0
Description: This file provides generic utils for IRDA algorithms
@@ -8,7 +8,7 @@ Description: This file provides generic utils for IRDA algorithms
Revision log:
* 2015-08-01: created by strawmanbobi
* 2016-10-01: created by strawmanbobi
**************************************************************************************************/
#include <stdio.h>
#include <string.h>

4
src/ir_decoder/irda_utils.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************************************
Filename: irda_utils.c
Revised: Date: 2015-08-26
Revised: Date: 2016-10-26
Revision: Revision: 1.0
Description: This file provides generic utils for IRDA algorithms
@@ -8,7 +8,7 @@ Description: This file provides generic utils for IRDA algorithms
Revision log:
* 2015-08-01: created by strawmanbobi
* 2016-10-01: created by strawmanbobi
**************************************************************************************************/
#include "irda_defs.h"
#include "irda_decode.h"