Merge pull request #14 from njustchenhao/Test

增加六足机器人非稳定性控制版本三控制项目以及控制模型
jacky-ch93 · Apr 3, 2018 · 81bcd4c · 81bcd4c
2 parents 7771deb + e48a968
commit 81bcd4c
Show file tree

Hide file tree

Showing 94 changed files with 109,028 additions and 1,173 deletions.
diff --git a/Simulink_Modules/Filter_Current_Hexapod_Robot/Filter_Current_Hexapod_Robot.tmc b/Simulink_Modules/Filter_Current_Hexapod_Robot/Filter_Current_Hexapod_Robot.tmc
diff --git a/Simulink_Modules/Filter_Current_Hexapod_Robot/Filter_Current_Hexapod_Robot_ModuleInfo.xml b/Simulink_Modules/Filter_Current_Hexapod_Robot/Filter_Current_Hexapod_Robot_ModuleInfo.xml
diff --git a/Simulink_Modules/Filter_Current_Hexapod_Robot/Filter_Current_Hexapod_Robot_PlcOpenPOUs.xml b/Simulink_Modules/Filter_Current_Hexapod_Robot/Filter_Current_Hexapod_Robot_PlcOpenPOUs.xml
diff --git a/...nk_Modules/Filter_Current_Hexapod_Robot/TwinCAT RT (x64)/Filter_Current_Hexapod_Robot.sys b/...nk_Modules/Filter_Current_Hexapod_Robot/TwinCAT RT (x64)/Filter_Current_Hexapod_Robot.sys
diff --git a/...nk_Modules/Filter_Current_Hexapod_Robot/TwinCAT RT (x86)/Filter_Current_Hexapod_Robot.sys b/...nk_Modules/Filter_Current_Hexapod_Robot/TwinCAT RT (x86)/Filter_Current_Hexapod_Robot.sys
diff --git a/Simulink_Modules/RobotWalking_OnEvenTerrain/RobotWalking_OnEvenTerrain.tmc b/Simulink_Modules/RobotWalking_OnEvenTerrain/RobotWalking_OnEvenTerrain.tmc
diff --git a/Simulink_Modules/RobotWalking_OnEvenTerrain/RobotWalking_OnEvenTerrain_ModuleInfo.xml b/Simulink_Modules/RobotWalking_OnEvenTerrain/RobotWalking_OnEvenTerrain_ModuleInfo.xml
diff --git a/Simulink_Modules/RobotWalking_OnEvenTerrain/RobotWalking_OnEvenTerrain_PlcOpenPOUs.xml b/Simulink_Modules/RobotWalking_OnEvenTerrain/RobotWalking_OnEvenTerrain_PlcOpenPOUs.xml
diff --git a/Simulink_Modules/RobotWalking_OnEvenTerrain/TwinCAT RT (x64)/RobotWalking_OnEvenTerrain.sys b/Simulink_Modules/RobotWalking_OnEvenTerrain/TwinCAT RT (x64)/RobotWalking_OnEvenTerrain.sys
diff --git a/Simulink_Modules/RobotWalking_OnEvenTerrain/TwinCAT RT (x86)/RobotWalking_OnEvenTerrain.sys b/Simulink_Modules/RobotWalking_OnEvenTerrain/TwinCAT RT (x86)/RobotWalking_OnEvenTerrain.sys
diff --git a/Simulink_Modules/Tough_Signal_Detection_Simple/Tough_Signal_Detection_Simple.tmc b/Simulink_Modules/Tough_Signal_Detection_Simple/Tough_Signal_Detection_Simple.tmc
diff --git a/Simulink_Modules/Tough_Signal_Detection_Simple/Tough_Signal_Detection_Simple_ModuleInfo.xml b/Simulink_Modules/Tough_Signal_Detection_Simple/Tough_Signal_Detection_Simple_ModuleInfo.xml
diff --git a/Simulink_Modules/Tough_Signal_Detection_Simple/Tough_Signal_Detection_Simple_PlcOpenPOUs.xml b/Simulink_Modules/Tough_Signal_Detection_Simple/Tough_Signal_Detection_Simple_PlcOpenPOUs.xml
diff --git a/..._Modules/Tough_Signal_Detection_Simple/TwinCAT RT (x64)/Tough_Signal_Detection_Simple.sys b/..._Modules/Tough_Signal_Detection_Simple/TwinCAT RT (x64)/Tough_Signal_Detection_Simple.sys
diff --git a/..._Modules/Tough_Signal_Detection_Simple/TwinCAT RT (x86)/Tough_Signal_Detection_Simple.sys b/..._Modules/Tough_Signal_Detection_Simple/TwinCAT RT (x86)/Tough_Signal_Detection_Simple.sys
diff --git a/..._Modules/WeldingArm6AxisMotion_Control/TwinCAT RT (x64)/WeldingArm6AxisMotion_Control.sys b/..._Modules/WeldingArm6AxisMotion_Control/TwinCAT RT (x64)/WeldingArm6AxisMotion_Control.sys
diff --git a/..._Modules/WeldingArm6AxisMotion_Control/TwinCAT RT (x86)/WeldingArm6AxisMotion_Control.sys b/..._Modules/WeldingArm6AxisMotion_Control/TwinCAT RT (x86)/WeldingArm6AxisMotion_Control.sys
diff --git a/Simulink_Modules/WeldingArm6AxisMotion_Control/WeldingArm6AxisMotion_Control.tmc b/Simulink_Modules/WeldingArm6AxisMotion_Control/WeldingArm6AxisMotion_Control.tmc
diff --git a/Simulink_Modules/WeldingArm6AxisMotion_Control/WeldingArm6AxisMotion_Control_ModuleInfo.xml b/Simulink_Modules/WeldingArm6AxisMotion_Control/WeldingArm6AxisMotion_Control_ModuleInfo.xml
diff --git a/Simulink_Modules/WeldingArm6AxisMotion_Control/WeldingArm6AxisMotion_Control_PlcOpenPOUs.xml b/Simulink_Modules/WeldingArm6AxisMotion_Control/WeldingArm6AxisMotion_Control_PlcOpenPOUs.xml
diff --git a/Simulink_Modules/Welding_Control_Circle_86s/TwinCAT RT (x64)/Welding_Control_Circle_86s.sys b/Simulink_Modules/Welding_Control_Circle_86s/TwinCAT RT (x64)/Welding_Control_Circle_86s.sys
diff --git a/Simulink_Modules/Welding_Control_Circle_86s/TwinCAT RT (x86)/Welding_Control_Circle_86s.sys b/Simulink_Modules/Welding_Control_Circle_86s/TwinCAT RT (x86)/Welding_Control_Circle_86s.sys
diff --git a/Simulink_Modules/Welding_Control_Circle_86s/Welding_Control_Circle_86s.tmc b/Simulink_Modules/Welding_Control_Circle_86s/Welding_Control_Circle_86s.tmc
diff --git a/Simulink_Modules/Welding_Control_Circle_86s/Welding_Control_Circle_86s_ModuleInfo.xml b/Simulink_Modules/Welding_Control_Circle_86s/Welding_Control_Circle_86s_ModuleInfo.xml
diff --git a/Simulink_Modules/Welding_Control_Circle_86s/Welding_Control_Circle_86s_PlcOpenPOUs.xml b/Simulink_Modules/Welding_Control_Circle_86s/Welding_Control_Circle_86s_PlcOpenPOUs.xml
diff --git a/TC_Robot_Contro_System.sln b/TC_Robot_Contro_System.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "TC_Robot_Contro_System_Test", "TC_Robot_Contro_System_Test.tsproj", "{7A1DD643-067E-477F-A245-66F5366C4220}"
 EndProject
+Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "TCProject - Robot_Moving_Simulink_Test", "TC_Walking_Robot_Control_System\TCProject - Robot_Moving_Simulink_Test.tsproj", "{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|TwinCAT CE7 (ARMV7) = Debug|TwinCAT CE7 (ARMV7)
@@ -39,6 +41,30 @@ Global
 		{41DF21BC-5DAD-41C5-B304-5BCA5D02C90E}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
 		{41DF21BC-5DAD-41C5-B304-5BCA5D02C90E}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
 		{41DF21BC-5DAD-41C5-B304-5BCA5D02C90E}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
+		{C1E20BA6-2F9D-42B5-9EB6-0E4A8CC401A5}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
+		{569C09A5-D00C-46BA-8E08-C13E8747A5DE}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE