diff --git a/win32-example/DecodeTestWin.sln b/win32-example/DecodeTestWin.sln deleted file mode 100644 index cdbfe4c..0000000 --- a/win32-example/DecodeTestWin.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DecodeTestWin", "DecodeTestWin\DecodeTestWin.vcxproj", "{66988DFB-7EA1-4A04-B72A-D51C4A061E57}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {66988DFB-7EA1-4A04-B72A-D51C4A061E57}.Debug|x64.ActiveCfg = Debug|x64 - {66988DFB-7EA1-4A04-B72A-D51C4A061E57}.Debug|x64.Build.0 = Debug|x64 - {66988DFB-7EA1-4A04-B72A-D51C4A061E57}.Debug|x86.ActiveCfg = Debug|Win32 - {66988DFB-7EA1-4A04-B72A-D51C4A061E57}.Debug|x86.Build.0 = Debug|Win32 - {66988DFB-7EA1-4A04-B72A-D51C4A061E57}.Release|x64.ActiveCfg = Release|x64 - {66988DFB-7EA1-4A04-B72A-D51C4A061E57}.Release|x64.Build.0 = Release|x64 - {66988DFB-7EA1-4A04-B72A-D51C4A061E57}.Release|x86.ActiveCfg = Release|Win32 - {66988DFB-7EA1-4A04-B72A-D51C4A061E57}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32-example/DecodeTestWin/DecodeTestWin.h b/win32-example/DecodeTestWin/DecodeTestWin.h deleted file mode 100644 index d00d47e..0000000 --- a/win32-example/DecodeTestWin/DecodeTestWin.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "resource.h" diff --git a/win32-example/DecodeTestWin/DecodeTestWin.rc b/win32-example/DecodeTestWin/DecodeTestWin.rc deleted file mode 100644 index 741488f..0000000 Binary files a/win32-example/DecodeTestWin/DecodeTestWin.rc and /dev/null differ diff --git a/win32-example/DecodeTestWin/Resource.h b/win32-example/DecodeTestWin/Resource.h deleted file mode 100644 index 109571d..0000000 --- a/win32-example/DecodeTestWin/Resource.h +++ /dev/null @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by DecodeTestWin.rc -// - -#define IDS_APP_TITLE 103 - - -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/win32-example/DecodeTestWin/stdafx.cpp b/win32-example/DecodeTestWin/stdafx.cpp deleted file mode 100644 index fd4f341..0000000 --- a/win32-example/DecodeTestWin/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" diff --git a/win32-example/DecodeTestWin/stdafx.h b/win32-example/DecodeTestWin/stdafx.h deleted file mode 100644 index 5fbc9de..0000000 --- a/win32-example/DecodeTestWin/stdafx.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "targetver.h" - -#include -#include -#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS -#define _AFX_NO_MFC_CONTROLS_IN_DIALOGS - -#ifndef VC_EXTRALEAN -#define VC_EXTRALEAN -#endif - -#include -#include -#include -#ifndef _AFX_NO_OLE_SUPPORT -#include -#endif -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include -#endif // _AFX_NO_AFXCMN_SUPPORT - -#include diff --git a/win32-example/DecodeTestWin/targetver.h b/win32-example/DecodeTestWin/targetver.h deleted file mode 100644 index 14f63fa..0000000 --- a/win32-example/DecodeTestWin/targetver.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - - -#include diff --git a/win32-example/DecodeTestWin/DecodeTestWin.cpp b/win32-example/IRextWin32Example/DecodeTestWin.cpp similarity index 83% rename from win32-example/DecodeTestWin/DecodeTestWin.cpp rename to win32-example/IRextWin32Example/DecodeTestWin.cpp index 23add19..745a26b 100644 --- a/win32-example/DecodeTestWin/DecodeTestWin.cpp +++ b/win32-example/IRextWin32Example/DecodeTestWin.cpp @@ -1,7 +1,6 @@ -#include "stdafx.h" -#include "DecodeTestWin.h" #include "ir_decoder\include\ir_decode.h" +#include using namespace std; #ifdef _DEBUG @@ -12,8 +11,6 @@ using namespace std; long binary_length = 0; UINT8 *binary_content = NULL; -CWinApp theApp; - t_remote_ac_status ac_status; UINT16 user_data[USER_DATA_SIZE] = { 0 }; @@ -204,52 +201,34 @@ int main(int argc, char *argv[]) { int nRetCode = 0; - HMODULE hModule = ::GetModuleHandle(nullptr); + char function = '0'; + UINT8 irda_hex_encode = 0; - if (hModule != nullptr) + if (4 != argc) { - if (!AfxWinInit(hModule, nullptr, ::GetCommandLine(), 0)) - { - wprintf(L"error: MFC failed to initialize\n"); - nRetCode = 1; - } - else - { - char function = '0'; - UINT8 irda_hex_encode = 0; - - if (4 != argc) - { - ir_printf("number of args error !\n"); - return -1; - } - - function = argv[1][0]; - irda_hex_encode = (UINT8)(argv[3][0] - '0'); - ir_printf("decode functionality = %c\n", function); - - switch (function) - { - case '0': - ir_printf("decode binary file as AC\n"); - decode_as_ac(argv[2]); - break; - - case '1': - ir_printf("decode binary file as TV : %d\n", irda_hex_encode); - decode_as_tv(argv[2], irda_hex_encode); - break; - - default: - ir_printf("decode functionality error !\n"); - break; - } - } + ir_printf("number of args error !\n"); + return -1; } - else + + function = argv[1][0]; + irda_hex_encode = (UINT8)(argv[3][0] - '0'); + ir_printf("decode functionality = %c\n", function); + + switch (function) { - wprintf(L"error: GetModuleHandle failed\n"); - nRetCode = 1; + case '0': + ir_printf("decode binary file as AC\n"); + decode_as_ac(argv[2]); + break; + + case '1': + ir_printf("decode binary file as TV : %d\n", irda_hex_encode); + decode_as_tv(argv[2], irda_hex_encode); + break; + + default: + ir_printf("decode functionality error !\n"); + break; } system("pause"); diff --git a/win32-example/IRextWin32Example/IRextWin32Example.sln b/win32-example/IRextWin32Example/IRextWin32Example.sln new file mode 100644 index 0000000..e265d22 --- /dev/null +++ b/win32-example/IRextWin32Example/IRextWin32Example.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29806.167 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IRextWin32Example", "IRextWin32Example.vcxproj", "{F4139B9B-37FF-436C-BE1E-B552940BA753}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F4139B9B-37FF-436C-BE1E-B552940BA753}.Debug|x64.ActiveCfg = Debug|x64 + {F4139B9B-37FF-436C-BE1E-B552940BA753}.Debug|x64.Build.0 = Debug|x64 + {F4139B9B-37FF-436C-BE1E-B552940BA753}.Debug|x86.ActiveCfg = Debug|Win32 + {F4139B9B-37FF-436C-BE1E-B552940BA753}.Debug|x86.Build.0 = Debug|Win32 + {F4139B9B-37FF-436C-BE1E-B552940BA753}.Release|x64.ActiveCfg = Release|x64 + {F4139B9B-37FF-436C-BE1E-B552940BA753}.Release|x64.Build.0 = Release|x64 + {F4139B9B-37FF-436C-BE1E-B552940BA753}.Release|x86.ActiveCfg = Release|Win32 + {F4139B9B-37FF-436C-BE1E-B552940BA753}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {FC58755A-C52F-4D0E-A51D-72E41C984F61} + EndGlobalSection +EndGlobal diff --git a/win32-example/IRextWin32Example/IRextWin32Example.vcxproj b/win32-example/IRextWin32Example/IRextWin32Example.vcxproj new file mode 100644 index 0000000..65c4895 --- /dev/null +++ b/win32-example/IRextWin32Example/IRextWin32Example.vcxproj @@ -0,0 +1,178 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + {F4139B9B-37FF-436C-BE1E-B552940BA753} + Win32Proj + IRextWin32Example + 10.0 + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;BOARD_PC;DEBUG;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win32-example/IRextWin32Example/IRextWin32Example.vcxproj.filters b/win32-example/IRextWin32Example/IRextWin32Example.vcxproj.filters new file mode 100644 index 0000000..d326df2 --- /dev/null +++ b/win32-example/IRextWin32Example/IRextWin32Example.vcxproj.filters @@ -0,0 +1,87 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + \ No newline at end of file diff --git a/win32-example/DecodeTestWin/ReadMe.txt b/win32-example/IRextWin32Example/ReadMe.txt similarity index 100% rename from win32-example/DecodeTestWin/ReadMe.txt rename to win32-example/IRextWin32Example/ReadMe.txt diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_ac_apply.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_ac_apply.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_ac_apply.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_ac_apply.h diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_ac_binary_parse.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_ac_binary_parse.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_ac_binary_parse.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_ac_binary_parse.h diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_ac_build_frame.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_ac_build_frame.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_ac_build_frame.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_ac_build_frame.h diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_ac_control.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_ac_control.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_ac_control.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_ac_control.h diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_ac_parse_forbidden_info.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_ac_parse_forbidden_info.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_ac_parse_forbidden_info.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_ac_parse_forbidden_info.h diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_ac_parse_frame_info.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_ac_parse_frame_info.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_ac_parse_frame_info.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_ac_parse_frame_info.h diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_ac_parse_parameter.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_ac_parse_parameter.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_ac_parse_parameter.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_ac_parse_parameter.h diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_decode.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_decode.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_decode.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_decode.h diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_defs.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_defs.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_defs.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_defs.h diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_tv_control.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_tv_control.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_tv_control.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_tv_control.h diff --git a/win32-example/DecodeTestWin/ir_decoder/include/ir_utils.h b/win32-example/IRextWin32Example/ir_decoder/include/ir_utils.h similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/include/ir_utils.h rename to win32-example/IRextWin32Example/ir_decoder/include/ir_utils.h diff --git a/win32-example/DecodeTestWin/ir_decoder/src/ir_ac_apply.c b/win32-example/IRextWin32Example/ir_decoder/src/ir_ac_apply.c similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/src/ir_ac_apply.c rename to win32-example/IRextWin32Example/ir_decoder/src/ir_ac_apply.c diff --git a/win32-example/DecodeTestWin/ir_decoder/src/ir_ac_binary_parse.c b/win32-example/IRextWin32Example/ir_decoder/src/ir_ac_binary_parse.c similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/src/ir_ac_binary_parse.c rename to win32-example/IRextWin32Example/ir_decoder/src/ir_ac_binary_parse.c diff --git a/win32-example/DecodeTestWin/ir_decoder/src/ir_ac_build_frame.c b/win32-example/IRextWin32Example/ir_decoder/src/ir_ac_build_frame.c similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/src/ir_ac_build_frame.c rename to win32-example/IRextWin32Example/ir_decoder/src/ir_ac_build_frame.c diff --git a/win32-example/DecodeTestWin/ir_decoder/src/ir_ac_control.c b/win32-example/IRextWin32Example/ir_decoder/src/ir_ac_control.c similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/src/ir_ac_control.c rename to win32-example/IRextWin32Example/ir_decoder/src/ir_ac_control.c diff --git a/win32-example/DecodeTestWin/ir_decoder/src/ir_ac_parse_forbidden_info.c b/win32-example/IRextWin32Example/ir_decoder/src/ir_ac_parse_forbidden_info.c similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/src/ir_ac_parse_forbidden_info.c rename to win32-example/IRextWin32Example/ir_decoder/src/ir_ac_parse_forbidden_info.c diff --git a/win32-example/DecodeTestWin/ir_decoder/src/ir_ac_parse_frame_info.c b/win32-example/IRextWin32Example/ir_decoder/src/ir_ac_parse_frame_info.c similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/src/ir_ac_parse_frame_info.c rename to win32-example/IRextWin32Example/ir_decoder/src/ir_ac_parse_frame_info.c diff --git a/win32-example/DecodeTestWin/ir_decoder/src/ir_ac_parse_parameter.c b/win32-example/IRextWin32Example/ir_decoder/src/ir_ac_parse_parameter.c similarity index 99% rename from win32-example/DecodeTestWin/ir_decoder/src/ir_ac_parse_parameter.c rename to win32-example/IRextWin32Example/ir_decoder/src/ir_ac_parse_parameter.c index 77cc351..5d20342 100644 --- a/win32-example/DecodeTestWin/ir_decoder/src/ir_ac_parse_parameter.c +++ b/win32-example/IRextWin32Example/ir_decoder/src/ir_ac_parse_parameter.c @@ -1137,6 +1137,7 @@ INT8 parse_swing_info(struct tag_head *tag, t_swing_info *si) // count how many swing types are there si->type = SWING_TYPE_NORMAL; si->mode_count = 1; + int i = 0; for (i = 0; i < tag->len; i++) { if (tag->p_data[i] == ',') diff --git a/win32-example/DecodeTestWin/ir_decoder/src/ir_decode.c b/win32-example/IRextWin32Example/ir_decoder/src/ir_decode.c similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/src/ir_decode.c rename to win32-example/IRextWin32Example/ir_decoder/src/ir_decode.c diff --git a/win32-example/DecodeTestWin/ir_decoder/src/ir_tv_control.c b/win32-example/IRextWin32Example/ir_decoder/src/ir_tv_control.c similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/src/ir_tv_control.c rename to win32-example/IRextWin32Example/ir_decoder/src/ir_tv_control.c diff --git a/win32-example/DecodeTestWin/ir_decoder/src/ir_utils.c b/win32-example/IRextWin32Example/ir_decoder/src/ir_utils.c similarity index 100% rename from win32-example/DecodeTestWin/ir_decoder/src/ir_utils.c rename to win32-example/IRextWin32Example/ir_decoder/src/ir_utils.c