From 61cd929fe000ad63ed72bdfa89f23702a5d234ae Mon Sep 17 00:00:00 2001 From: strawmanbobi Date: Sat, 5 Nov 2016 19:16:07 +0800 Subject: [PATCH] update 2016-11-05 b1 1. sorted up header files --- .gitignore | 4 +++- {doc => docs}/empty | 0 src/ir_decoder/CMakeLists.txt | 18 +++++++++--------- src/ir_decoder/MODULE_LICENSE_MIT | 0 src/ir_decoder/NOTICE | 19 ------------------- src/ir_decoder/{ => include}/irda_apply.h | 0 src/ir_decoder/{ => include}/irda_decode.h | 0 src/ir_decoder/{ => include}/irda_defs.h | 0 src/ir_decoder/{ => include}/irda_irframe.h | 0 src/ir_decoder/{ => include}/irda_lib.h | 0 .../{ => include}/irda_parse_ac_parameter.h | 0 .../{ => include}/irda_parse_forbidden_info.h | 0 .../irda_parse_frame_parameter.h | 0 src/ir_decoder/{ => include}/irda_utils.h | 0 src/ir_decoder/irda_apply.c | 6 +++--- src/ir_decoder/irda_decode.c | 16 ++++++++-------- src/ir_decoder/irda_irframe.c | 4 ++-- src/ir_decoder/irda_lib.c | 9 +++++---- src/ir_decoder/irda_parse_ac_parameter.c | 7 ++++--- src/ir_decoder/irda_parse_forbidden_info.c | 6 +++--- src/ir_decoder/irda_parse_frame_parameter.c | 7 ++++--- src/ir_decoder/irda_utils.c | 4 ++-- 22 files changed, 43 insertions(+), 57 deletions(-) rename {doc => docs}/empty (100%) delete mode 100644 src/ir_decoder/MODULE_LICENSE_MIT delete mode 100644 src/ir_decoder/NOTICE rename src/ir_decoder/{ => include}/irda_apply.h (100%) rename src/ir_decoder/{ => include}/irda_decode.h (100%) rename src/ir_decoder/{ => include}/irda_defs.h (100%) rename src/ir_decoder/{ => include}/irda_irframe.h (100%) rename src/ir_decoder/{ => include}/irda_lib.h (100%) rename src/ir_decoder/{ => include}/irda_parse_ac_parameter.h (100%) rename src/ir_decoder/{ => include}/irda_parse_forbidden_info.h (100%) rename src/ir_decoder/{ => include}/irda_parse_frame_parameter.h (100%) rename src/ir_decoder/{ => include}/irda_utils.h (100%) diff --git a/.gitignore b/.gitignore index a1f55e9..1e8770c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ *.bin */output/ src/ir_decoder/.idea -src/ir_encoder/.idea \ No newline at end of file +src/ir_encoder/.idea +files/ +files/* \ No newline at end of file diff --git a/doc/empty b/docs/empty similarity index 100% rename from doc/empty rename to docs/empty diff --git a/src/ir_decoder/CMakeLists.txt b/src/ir_decoder/CMakeLists.txt index afbe1de..1556c0e 100644 --- a/src/ir_decoder/CMakeLists.txt +++ b/src/ir_decoder/CMakeLists.txt @@ -5,21 +5,21 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") add_definitions(-DBOARD_PC) set(SOURCE_FILES irda_decode.c - irda_decode.h + include/irda_decode.h irda_lib.c - irda_lib.h + include/irda_lib.h irda_apply.c - irda_apply.h - irda_defs.h + include/irda_apply.h + include/irda_defs.h irda_irframe.c - irda_irframe.h + include/irda_irframe.h irda_parse_ac_parameter.c - irda_parse_ac_parameter.h + include/irda_parse_ac_parameter.h irda_parse_forbidden_info.c - irda_parse_forbidden_info.h + include/irda_parse_forbidden_info.h irda_parse_frame_parameter.c - irda_parse_frame_parameter.h + include/irda_parse_frame_parameter.h irda_utils.c - irda_utils.h) + include/irda_utils.h) add_executable(irda_decoder ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/ir_decoder/MODULE_LICENSE_MIT b/src/ir_decoder/MODULE_LICENSE_MIT deleted file mode 100644 index e69de29..0000000 diff --git a/src/ir_decoder/NOTICE b/src/ir_decoder/NOTICE deleted file mode 100644 index b73fe7b..0000000 --- a/src/ir_decoder/NOTICE +++ /dev/null @@ -1,19 +0,0 @@ -The LIBIRDECODE distribution is Copyright (c) 2015 Strawmanbobi - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/src/ir_decoder/irda_apply.h b/src/ir_decoder/include/irda_apply.h similarity index 100% rename from src/ir_decoder/irda_apply.h rename to src/ir_decoder/include/irda_apply.h diff --git a/src/ir_decoder/irda_decode.h b/src/ir_decoder/include/irda_decode.h similarity index 100% rename from src/ir_decoder/irda_decode.h rename to src/ir_decoder/include/irda_decode.h diff --git a/src/ir_decoder/irda_defs.h b/src/ir_decoder/include/irda_defs.h similarity index 100% rename from src/ir_decoder/irda_defs.h rename to src/ir_decoder/include/irda_defs.h diff --git a/src/ir_decoder/irda_irframe.h b/src/ir_decoder/include/irda_irframe.h similarity index 100% rename from src/ir_decoder/irda_irframe.h rename to src/ir_decoder/include/irda_irframe.h diff --git a/src/ir_decoder/irda_lib.h b/src/ir_decoder/include/irda_lib.h similarity index 100% rename from src/ir_decoder/irda_lib.h rename to src/ir_decoder/include/irda_lib.h diff --git a/src/ir_decoder/irda_parse_ac_parameter.h b/src/ir_decoder/include/irda_parse_ac_parameter.h similarity index 100% rename from src/ir_decoder/irda_parse_ac_parameter.h rename to src/ir_decoder/include/irda_parse_ac_parameter.h diff --git a/src/ir_decoder/irda_parse_forbidden_info.h b/src/ir_decoder/include/irda_parse_forbidden_info.h similarity index 100% rename from src/ir_decoder/irda_parse_forbidden_info.h rename to src/ir_decoder/include/irda_parse_forbidden_info.h diff --git a/src/ir_decoder/irda_parse_frame_parameter.h b/src/ir_decoder/include/irda_parse_frame_parameter.h similarity index 100% rename from src/ir_decoder/irda_parse_frame_parameter.h rename to src/ir_decoder/include/irda_parse_frame_parameter.h diff --git a/src/ir_decoder/irda_utils.h b/src/ir_decoder/include/irda_utils.h similarity index 100% rename from src/ir_decoder/irda_utils.h rename to src/ir_decoder/include/irda_utils.h diff --git a/src/ir_decoder/irda_apply.c b/src/ir_decoder/irda_apply.c index 9445811..795b096 100644 --- a/src/ir_decoder/irda_apply.c +++ b/src/ir_decoder/irda_apply.c @@ -12,9 +12,9 @@ Revision log: *inclusion */ -#include "irda_utils.h" -#include "irda_decode.h" -#include "irda_apply.h" +#include "./include/irda_utils.h" +#include "./include/irda_decode.h" +#include "./include/irda_apply.h" /* * global vars diff --git a/src/ir_decoder/irda_decode.c b/src/ir_decoder/irda_decode.c index 2e19004..997850b 100644 --- a/src/ir_decoder/irda_decode.c +++ b/src/ir_decoder/irda_decode.c @@ -19,14 +19,14 @@ Revision log: #include -#include "irda_decode.h" -#include "irda_utils.h" -#include "irda_parse_frame_parameter.h" -#include "irda_parse_ac_parameter.h" -#include "irda_parse_forbidden_info.h" -#include "irda_irframe.h" -#include "irda_apply.h" -#include "irda_lib.h" +#include "./include/irda_decode.h" +#include "./include/irda_utils.h" +#include "./include/irda_parse_frame_parameter.h" +#include "./include/irda_parse_ac_parameter.h" +#include "./include/irda_parse_forbidden_info.h" +#include "./include/irda_irframe.h" +#include "./include/irda_apply.h" +#include "./include/irda_lib.h" struct ir_bin_buffer binaryfile; struct ir_bin_buffer *pirda_buffer = &binaryfile; diff --git a/src/ir_decoder/irda_irframe.c b/src/ir_decoder/irda_irframe.c index c6eaa72..ad72972 100644 --- a/src/ir_decoder/irda_irframe.c +++ b/src/ir_decoder/irda_irframe.c @@ -10,8 +10,8 @@ Revision log: **************************************************************************************************/ #include -#include "irda_irframe.h" -#include "irda_decode.h" +#include "./include/irda_irframe.h" +#include "./include/irda_decode.h" extern protocol* context; diff --git a/src/ir_decoder/irda_lib.c b/src/ir_decoder/irda_lib.c index eb4a661..7a1a1dc 100644 --- a/src/ir_decoder/irda_lib.c +++ b/src/ir_decoder/irda_lib.c @@ -13,10 +13,11 @@ Revision log: * INCLUDES **************************************************************************************************/ -#include "stdio.h" -#include "irda_defs.h" -#include "irda_lib.h" -#include "string.h" +#include +#include + +#include "./include/irda_defs.h" +#include "./include/irda_lib.h" /************************************************************************************************** diff --git a/src/ir_decoder/irda_parse_ac_parameter.c b/src/ir_decoder/irda_parse_ac_parameter.c index 72575a0..5e2dd0e 100644 --- a/src/ir_decoder/irda_parse_ac_parameter.c +++ b/src/ir_decoder/irda_parse_ac_parameter.c @@ -14,9 +14,10 @@ Revision log: #include #include #include -#include "irda_utils.h" -#include "irda_parse_ac_parameter.h" -#include "irda_decode.h" + +#include "./include/irda_utils.h" +#include "./include/irda_parse_ac_parameter.h" +#include "./include/irda_decode.h" /* * global vars diff --git a/src/ir_decoder/irda_parse_forbidden_info.c b/src/ir_decoder/irda_parse_forbidden_info.c index a28a382..f72f1bf 100644 --- a/src/ir_decoder/irda_parse_forbidden_info.c +++ b/src/ir_decoder/irda_parse_forbidden_info.c @@ -12,13 +12,13 @@ Revision log: /* *inclusion */ -#include "irda_decode.h" -#include "irda_utils.h" -#include "irda_parse_forbidden_info.h" #include #include #include +#include "./include/irda_decode.h" +#include "./include/irda_utils.h" +#include "./include/irda_parse_forbidden_info.h" /* * global vars */ diff --git a/src/ir_decoder/irda_parse_frame_parameter.c b/src/ir_decoder/irda_parse_frame_parameter.c index 64168bc..30dff5e 100644 --- a/src/ir_decoder/irda_parse_frame_parameter.c +++ b/src/ir_decoder/irda_parse_frame_parameter.c @@ -15,9 +15,10 @@ Revision log: #include #include #include -#include "irda_utils.h" -#include "irda_parse_frame_parameter.h" -#include "irda_decode.h" + +#include "./include/irda_utils.h" +#include "./include/irda_parse_frame_parameter.h" +#include "./include/irda_decode.h" /* * global vars diff --git a/src/ir_decoder/irda_utils.c b/src/ir_decoder/irda_utils.c index 9c58c17..2997409 100644 --- a/src/ir_decoder/irda_utils.c +++ b/src/ir_decoder/irda_utils.c @@ -12,8 +12,8 @@ Revision log: #include #include -#include "irda_utils.h" -#include "irda_decode.h" +#include "./include/irda_utils.h" +#include "./include/irda_decode.h" /* *0123456789abcdef/0123456789ABCDEF