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

Merge remote-tracking branch 'origin/MBP-198_OOP' into MBP-221-add-restore-position-bias

Browse Source 
# Conflicts:
#	solution/tc_project_app/tc_mca_std_lib
This commit is contained in:
Federico Rojas
2022-10-14 15:55:30 +02:00
parent 3c0a37a0e7 c8a3bd3619
commit 0350afac73
10 changed files with 226 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solution/_Config/NC/NC.xti
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.11" ClassName="CNcSafTaskDef" SubType="0">
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.32" ClassName="CNcSafTaskDef" SubType="0">
<NC>
<SafTask Priority="4" CycleTime="20000" AmsPort="501" IoAtBegin="true">
<Name>NC-Task 1 SAF</Name>