fixed irext core code for windows

This commit is contained in:
strawmanbobi
2018-09-09 21:15:48 +08:00
parent 8d95581a8e
commit 703cceb557
7 changed files with 136 additions and 50 deletions

View File

@@ -1,9 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2027
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ir_decoder", "ir_decoder.vcxproj", "{8ACC347D-023C-4939-B371-C193EEA210F8}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ir_decoder", "ir_decoder.vcxproj", "{2198F1AF-3683-4197-9C6C-82651745A397}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,16 +13,19 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8ACC347D-023C-4939-B371-C193EEA210F8}.Debug|x64.ActiveCfg = Debug|x64
{8ACC347D-023C-4939-B371-C193EEA210F8}.Debug|x64.Build.0 = Debug|x64
{8ACC347D-023C-4939-B371-C193EEA210F8}.Debug|x86.ActiveCfg = Debug|Win32
{8ACC347D-023C-4939-B371-C193EEA210F8}.Debug|x86.Build.0 = Debug|Win32
{8ACC347D-023C-4939-B371-C193EEA210F8}.Release|x64.ActiveCfg = Release|x64
{8ACC347D-023C-4939-B371-C193EEA210F8}.Release|x64.Build.0 = Release|x64
{8ACC347D-023C-4939-B371-C193EEA210F8}.Release|x86.ActiveCfg = Release|Win32
{8ACC347D-023C-4939-B371-C193EEA210F8}.Release|x86.Build.0 = Release|Win32
{2198F1AF-3683-4197-9C6C-82651745A397}.Debug|x64.ActiveCfg = Debug|x64
{2198F1AF-3683-4197-9C6C-82651745A397}.Debug|x64.Build.0 = Debug|x64
{2198F1AF-3683-4197-9C6C-82651745A397}.Debug|x86.ActiveCfg = Debug|Win32
{2198F1AF-3683-4197-9C6C-82651745A397}.Debug|x86.Build.0 = Debug|Win32
{2198F1AF-3683-4197-9C6C-82651745A397}.Release|x64.ActiveCfg = Release|x64
{2198F1AF-3683-4197-9C6C-82651745A397}.Release|x64.Build.0 = Release|x64
{2198F1AF-3683-4197-9C6C-82651745A397}.Release|x86.ActiveCfg = Release|Win32
{2198F1AF-3683-4197-9C6C-82651745A397}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {82870200-233C-476D-B5A8-B17FB4FECE50}
EndGlobalSection
EndGlobal

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -19,16 +19,17 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{8ACC347D-023C-4939-B371-C193EEA210F8}</ProjectGuid>
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{2198F1AF-3683-4197-9C6C-82651745A397}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ir_decoder</RootNamespace>
<RootNamespace>irdecoder</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141_xp</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -41,13 +42,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140_xp</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
@@ -83,16 +84,16 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IR_DECODER_EXPORTS;BOARD_PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;IRDECODER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>.\ir_decode.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -100,8 +101,9 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;IR_DECODER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;IRDECODER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -110,42 +112,40 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IR_DECODER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;IRDECODER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ModuleDefinitionFile>.\ir_decode.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;IR_DECODER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;IRDECODER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\ir_ac_apply.h" />
<ClInclude Include="include\ir_ac_binary_parse.h" />
@@ -162,20 +162,6 @@
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.c">
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader>
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</PrecompiledHeader>
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</PrecompiledHeader>
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\ir_ac_apply.c" />
<ClCompile Include="src\ir_ac_binary_parse.c" />
<ClCompile Include="src\ir_ac_build_frame.c" />
@@ -184,7 +170,6 @@
<ClCompile Include="src\ir_ac_parse_frame_info.c" />
<ClCompile Include="src\ir_ac_parse_parameter.c" />
<ClCompile Include="src\ir_decode.c" />
<ClCompile Include="src\ir_test_main.c" />
<ClCompile Include="src\ir_tv_control.c" />
<ClCompile Include="src\ir_utils.c" />
<ClCompile Include="stdafx.c">

View File

@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="源文件">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="头文件">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="资源文件">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="targetver.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_ac_apply.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_ac_binary_parse.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_ac_build_frame.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_ac_control.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_ac_parse_forbidden_info.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_ac_parse_frame_info.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_ac_parse_parameter.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_decode.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_defs.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_tv_control.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="include\ir_utils.h">
<Filter>头文件</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\ir_ac_apply.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="src\ir_ac_binary_parse.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="src\ir_ac_build_frame.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="src\ir_ac_control.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="src\ir_ac_parse_forbidden_info.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="src\ir_ac_parse_frame_info.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="src\ir_ac_parse_parameter.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="src\ir_decode.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="src\ir_tv_control.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="src\ir_utils.c">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="stdafx.c">
<Filter>源文件</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="ir_decode.def">
<Filter>源文件</Filter>
</None>
</ItemGroup>
</Project>

View File

@@ -64,9 +64,9 @@ INT8 binary_parse_offset()
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;
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

Binary file not shown.

Binary file not shown.

Binary file not shown.