berti_r/Motion_test
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 'origin/master' into MBP-202_NewSlitCode

Browse Source 
Conflicts:
	solution.sln
	solution/tc_project_app/tc_project_app.plcproj
This commit is contained in:
Federico Rojas
2022-08-19 15:30:17 +02:00
parent 4685872bc1 baa181d99a
commit d1c156f502
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solution.sln
+1 -1
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# TcXaeShell Solution File, Format Version 11.00
VisualStudioVersion = 15.0.28010.2050
VisualStudioVersion = 15.0.28307.1300
MinimumVisualStudioVersion = 10.0.40219.1
Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "solution", "solution\solution.tsproj", "{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}"
EndProject
solution/tc_project_app/tc_project_app.plcproj
+3 -3
View File
@@ -95,6 +95,9 @@
<Compile Include="tc_mca_std_lib\DUTs\E_SlitPairStates.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\ST_MonitoringAlarm.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisConfig.TcDUT">
<SubType>Code</SubType>
</Compile>
@@ -125,9 +128,6 @@
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisStruct.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\ST_MonitoringAlarm.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\GVLs\GVL.TcGVL">
<SubType>Code</SubType>
</Compile>