Skip to content

Commit

Permalink
Merge pull request #7 from njustchenhao/Test
Browse files Browse the repository at this point in the history
最新控制系统,更新前面“增加滤波Simulink模型,更新MAIN”处错误
  • Loading branch information
Jacky_Chen authored Apr 13, 2017
2 parents 8215fea + 320084b commit 7f347ff
Show file tree
Hide file tree
Showing 111 changed files with 13 additions and 47,379 deletions.
26 changes: 13 additions & 13 deletions TCProject - Hexapod_Robot_Control_Test.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "TCProject - Hexapod_Robot_Control_Test", "TCProject - Hexapod_Robot_Control_Test.tsproj", "{3E19FE30-C61B-4B45-9518-50B797ACFC55}"
Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "TCProject - Hexapod_Robot_Control_Test", "TCProject - Robot_Control\TCProject - Hexapod_Robot_Control_Test.tsproj", "{42D221E9-C7AE-471C-9237-66BAA34BA7A8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -15,18 +15,18 @@ Global
Release|TwinCAT RT (x86) = Release|TwinCAT RT (x86)
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
{3E19FE30-C61B-4B45-9518-50B797ACFC55}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
{42D221E9-C7AE-471C-9237-66BAA34BA7A8}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
{41DF21BC-5DAD-41C5-B304-5BCA5D02C90E}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
{41DF21BC-5DAD-41C5-B304-5BCA5D02C90E}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
{41DF21BC-5DAD-41C5-B304-5BCA5D02C90E}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 7f347ff

Please sign in to comment.