From 4896b94dc006e06f80734c4f75efeadd1724b4d2 Mon Sep 17 00:00:00 2001
From: Nicolas Trimborn <ge37vez@mytum.de>
Date: Thu, 19 Aug 2021 13:56:16 +0200
Subject: [PATCH] commit tc project

---
 Twincat/MotorData/.vs/MotorData/v15/.suo     | Bin 42496 -> 39936 bytes
 Twincat/MotorData/MotorData/MotorData.tsproj | 176 +++++++++++++------
 2 files changed, 118 insertions(+), 58 deletions(-)

diff --git a/Twincat/MotorData/.vs/MotorData/v15/.suo b/Twincat/MotorData/.vs/MotorData/v15/.suo
index da3d74bea3144b28d1f3a27186113d1f244e4cf4..9d9a1a7197edd42cccc8f48e54eaacd011a741f4 100644
GIT binary patch
delta 1540
zcmcIjO-vI}5Z<>GD0N#(!B%4nlme|HT2!iN3EQ+$1DHa<pMx<rAs!U1nr$LT!UiM(
zS`>Epxq+$iuHB0V4^=pLz=$VLp1gQ5QB#Z|L7izRl&HjmO!8%Zciy-2=E;k^{EQ#>
zvZAMrg*>YUJ71<ZhQF45nS948ITYyOTOc5~*#lVS2iZ9E<lNQY$3z}wQFOpGj)oGn
zOo#%+kDnVNpif>t>K%w(h@A*Cq7YFGzJkLruAMZtqL=y3g7!rFqQbW_U7FIvrf*wQ
z>dvN=X_Jd>R?#6sdbBgdh`Iqmbwrpnkt1ScQ=MkbHm+$RtVI+fCfeP9rL1#7iOC3}
zPNRytB%8RbQ4D@Pqa$es)E?eCE7=%C4E-zy%Z3gu%T7cgQWzAdj%Jmq&%23Evj$eG
zn$x+etQ<(yLGTN8kV@-Dke#yf2Od^G_;cz&JgR{^))qaZ-qqQCk{%6wx3+2N;@1v#
zfr!CA+bKFg=)=Seu|-jYd6>81p~8}o8CHfZr1Zi6_Rs2yrI)c<i0qCkhXPyueW$hp
ziLH~6oH4~Lv1<@9_p__8Yz_*vSet7sa=`%%exQ9&SM4X6o-0Swj@W4AXcLMsuqP|1
zrfS-lpu@;NO$)@>C^V0FlrbB;A9dtkctf9Z@Oq>H<gvY0?g&@Mg}5tREq9FbaP^!U
zEjO2*H4H^h7=!g8?mYkU(_`<ehJfBR1WQr3VtOLbt`ZJXx96sh<(WV?2CgG+Ai@ZW
z-$D%w#oo<h>44KY`$4kE!ulkzPMJ-zTzE0t5AvL>#Kc6!0{d+Wkg6#KQ)wc7EA+(H
zXO=4M)Y`HGQdvxK;RfQKN-o?ED<&OT1!~GAFc7DcAkK;L88o+HV%yR*;hD5Cr#jV?
z%OG*w4p!e;F#6me`}Udf4oReoXTnnWb|55$$bzI#gqlGye$Mnr?A69Enc@S2Dh_nz
gLD#UAUK0oRhP{aqH&Z`P8ToCYt%{>brc8^!07N_|7XSbN

delta 1413
zcmb_bOKTHR6wbYwrZLVmiAnl?Bz9V&rfmXRTTL;Lijr2Rr3Fz?a8pogt&l8Q1BtJV
zty<><-O8YQZ8jENRFj2>dw+lkZo~=+lz@+O(it2?DwSUN=6v_ubI<FZ$-dy(_k1bJ
z?9YdsoXHRf`9)WK?bqA~)@-p@Vlc-?L>sbN#7|t{mSnaBWqy-=gE{Lp={_Ei0WA@j
z(0QQ&8JW^@o4Db^YtrpN-iT;I)FXc29UsaTL@S~V(T?aqL=geRZbT>IAVg{u?*Otv
z#396C1bKip*<X{uje;f~-$`VYjIoZA*@N+d%15bW-XX26e_ElMWjy(J&8N*Z8&0VQ
z-*H3nUC12>Iumrc6J?FgccJv?yiS*NPr`KLuq5OHBf9nk%5lV)z9)~P$T9twsw2o2
zz%6_71CAn7y#<JS&w}6gL}VswdN3&Y6e#cry9X&T!|p;^oPguj5L<+lq==LvJpwr=
zbMY!}5~RiTM-=&)*n?Wiw%X}e@@M}=lj1V+8N?ODtgeS*S9G)VgsP|YmNc7&RBMJ^
zf^zqSou1jq2$F4CTOTSu*5xY=^NjUEs%b&3k8hzW+eTISN=Jf0k%uA71&H+vkoFvd
zf;VDIqyI+?D*N7vG`5mCekn9*r+NIHP|qTGWf!>Q$N$%m<-J8F(iqdI8*aDM38+X3
zu^Vr9nLI$UPJy^J0;T3jyD@{+8Av)8)!w+oC>H%zModWd;tl7J*2mPw67xg3F|*O%
zW&iN@bn36QLaAwNd(&U;&$Z=qN2VRxIfpiH*Jj(b8+Pp>*X{`Tg_&DZFcmz*1b7|H
sz-l-Ku{~Lra^Sq>6o2#OY4q*juoS!v*PZwaI`?miFqhQe>Na`$1wpI|00000

diff --git a/Twincat/MotorData/MotorData/MotorData.tsproj b/Twincat/MotorData/MotorData/MotorData.tsproj
index 65ff858..9ecb1a2 100644
--- a/Twincat/MotorData/MotorData/MotorData.tsproj
+++ b/Twincat/MotorData/MotorData/MotorData.tsproj
@@ -13,7 +13,7 @@
 		</System>
 		<Plc>
 			<Project GUID="{4AE346CD-C7CE-4990-9940-2D1E689DC225}" Name="Motordata_PLC" PrjFilePath="Motordata_PLC\Motordata_PLC.plcproj" TmcFilePath="Motordata_PLC\Motordata_PLC.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="Motordata_PLC\Motordata_PLC.tmc">
 					<Name>Motordata_PLC Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="1">
@@ -134,12 +134,12 @@
 				<Image Id="1" AddrType="9" ImageType="3">
 					<Name>Image</Name>
 				</Image>
-				<Box Id="1" BoxType="9099">
-					<Name>Box 1 (LAN9252-2_motor_Master)</Name>
+				<Box Id="2" BoxType="9099">
+					<Name>Box 2 (LAN9252-2_motor_Master)</Name>
 					<ImageId>1000</ImageId>
-					<EtherCAT SlaveType="1" PdiType="#x3180" CycleMBoxPollingTime="0" VendorId="#x000004d8" ProductCode="#x00000002" RevisionNo="#x00000005" PortPhys="17" IdentificationAdo="18" MaxSlotCount="256" MaxSlotGroupCount="1" SlotPdoIncrement="1" SlotIndexIncrement="16" Type="MSRM 2_motor_Master Ethercat Slave" Desc="LAN9252-2_motor_Master" PortABoxInfo="#x00ffffff">
-						<SyncMan>001140000400010003000000000000000000001104010000</SyncMan>
-						<SyncMan>001878000000010004000000000000000000001800010000</SyncMan>
+					<EtherCAT SlaveType="1" PdiType="#x3180" CycleMBoxPollingTime="0" VendorId="#x000004d8" ProductCode="#x00000002" RevisionNo="#x00000006" PortPhys="17" IdentificationAdo="18" MaxSlotCount="256" MaxSlotGroupCount="1" SlotPdoIncrement="1" SlotIndexIncrement="16" Type="MSRM 2_motor_Master Ethercat Slave" Desc="LAN9252-2_motor_Master" PortABoxInfo="#x00ffffff">
+						<SyncMan>001160000400010003000000000000000000001104010000</SyncMan>
+						<SyncMan>001880000000010004000000000000000000001800010000</SyncMan>
 						<Fmmu>0000000000000000001100020100000001000000000000000000000000000000</Fmmu>
 						<Fmmu>0000000000000000001800010100000002000000000000000000000000000000</Fmmu>
 						<Pdo Name="MCU2ECAT" Index="#x1600" Flags="#x0010" SyncMan="1">
@@ -233,106 +233,118 @@
 							<Entry Name="EMG__CH8" Index="#x301e" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__status" Index="#x301f" Sub="#x01">
+							<Entry Name="SPARE__1_TX" Index="#x301f" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__2_TX" Index="#x3020" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__3_TX" Index="#x3021" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__4_TX" Index="#x3022" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="M3__status" Index="#x3023" Sub="#x01">
 								<Type>BYTE</Type>
 							</Entry>
-							<Entry Name="M3__mode" Index="#x3020" Sub="#x01">
+							<Entry Name="M3__mode" Index="#x3024" Sub="#x01">
 								<Type>BYTE</Type>
 							</Entry>
-							<Entry Name="M3__Joint__rel_position" Index="#x3021" Sub="#x01">
+							<Entry Name="M3__Joint__rel_position" Index="#x3025" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Joint_abs_position" Index="#x3022" Sub="#x01">
+							<Entry Name="M3__Joint_abs_position" Index="#x3026" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Motor_speed" Index="#x3023" Sub="#x01">
+							<Entry Name="M3__Motor_speed" Index="#x3027" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Motor_current_bus" Index="#x3024" Sub="#x01">
+							<Entry Name="M3__Motor_current_bus" Index="#x3028" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Motor_currentPhA" Index="#x3025" Sub="#x01">
+							<Entry Name="M3__Motor_currentPhA" Index="#x3029" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Motor_currentPhB" Index="#x3026" Sub="#x01">
+							<Entry Name="M3__Motor_currentPhB" Index="#x302a" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Motor_currentPhC" Index="#x3027" Sub="#x01">
+							<Entry Name="M3__Motor_currentPhC" Index="#x302b" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Motor_hallState" Index="#x3028" Sub="#x01">
+							<Entry Name="M3__Motor_hallState" Index="#x302c" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Motor_dutyCycle" Index="#x3029" Sub="#x01">
+							<Entry Name="M3__Motor_dutyCycle" Index="#x302d" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__status" Index="#x302a" Sub="#x01">
+							<Entry Name="M4__status" Index="#x302e" Sub="#x01">
 								<Type>BYTE</Type>
 							</Entry>
-							<Entry Name="M4__mode" Index="#x302b" Sub="#x01">
+							<Entry Name="M4__mode" Index="#x302f" Sub="#x01">
 								<Type>BYTE</Type>
 							</Entry>
-							<Entry Name="M4__Joint__rel_position" Index="#x302c" Sub="#x01">
+							<Entry Name="M4__Joint__rel_position" Index="#x3030" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Joint_abs_position" Index="#x302d" Sub="#x01">
+							<Entry Name="M4__Joint_abs_position" Index="#x3031" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Motor_speed" Index="#x302e" Sub="#x01">
+							<Entry Name="M4__Motor_speed" Index="#x3032" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Motor_current_bus" Index="#x302f" Sub="#x01">
+							<Entry Name="M4__Motor_current_bus" Index="#x3033" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Motor_currentPhA" Index="#x3030" Sub="#x01">
+							<Entry Name="M4__Motor_currentPhA" Index="#x3034" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Motor_currentPhB" Index="#x3031" Sub="#x01">
+							<Entry Name="M4__Motor_currentPhB" Index="#x3035" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Motor_currentPhC" Index="#x3032" Sub="#x01">
+							<Entry Name="M4__Motor_currentPhC" Index="#x3036" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Motor_hallState" Index="#x3033" Sub="#x01">
+							<Entry Name="M4__Motor_hallState" Index="#x3037" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Motor_dutyCycle" Index="#x3034" Sub="#x01">
+							<Entry Name="M4__Motor_dutyCycle" Index="#x3038" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="IMU__q_x0" Index="#x3035" Sub="#x01">
+							<Entry Name="IMU__q_x0" Index="#x3039" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="IMU__q_y0" Index="#x3036" Sub="#x01">
+							<Entry Name="IMU__q_y0" Index="#x303a" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="IMU__q_z0" Index="#x3037" Sub="#x01">
+							<Entry Name="IMU__q_z0" Index="#x303b" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="IMU__q_w0" Index="#x3038" Sub="#x01">
+							<Entry Name="IMU__q_w0" Index="#x303c" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="FSR__CH1" Index="#x3039" Sub="#x01">
+							<Entry Name="FSR__CH1" Index="#x303d" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="FSR__CH2" Index="#x303a" Sub="#x01">
+							<Entry Name="FSR__CH2" Index="#x303e" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="FSR__CH3" Index="#x303b" Sub="#x01">
+							<Entry Name="FSR__CH3" Index="#x303f" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="FSR__CH4" Index="#x303c" Sub="#x01">
+							<Entry Name="FSR__CH4" Index="#x3040" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="FSR__CH5" Index="#x303d" Sub="#x01">
+							<Entry Name="FSR__CH5" Index="#x3041" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="Pressure__CH1" Index="#x303e" Sub="#x01">
+							<Entry Name="Pressure__CH1" Index="#x3042" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="Pressure__CH2" Index="#x303f" Sub="#x01">
+							<Entry Name="Pressure__CH2" Index="#x3043" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="Pressure__CH3" Index="#x3040" Sub="#x01">
+							<Entry Name="Pressure__CH3" Index="#x3044" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
 						</Pdo>
@@ -391,58 +403,106 @@
 							<Entry Name="M2__Spare" Index="#x3112" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__control_mode" Index="#x3113" Sub="#x01">
+							<Entry Name="SPARE__1_RX" Index="#x3113" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__2_RX" Index="#x3114" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__3_RX" Index="#x3115" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__4_RX" Index="#x3116" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__5_RX" Index="#x3117" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__6_RX" Index="#x3118" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__7_RX" Index="#x3119" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__8_RX" Index="#x311a" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__9_RX" Index="#x311b" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__10_RX" Index="#x311c" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__11_RX" Index="#x311d" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__12_RX" Index="#x311e" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__13_RX" Index="#x311f" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__14_RX" Index="#x3120" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__15_RX" Index="#x3121" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="SPARE__16_RX" Index="#x3122" Sub="#x01">
+								<Type>INT</Type>
+							</Entry>
+							<Entry Name="M3__control_mode" Index="#x3123" Sub="#x01">
 								<Type>BYTE</Type>
 							</Entry>
-							<Entry Name="M3__control_set" Index="#x3114" Sub="#x01">
+							<Entry Name="M3__control_set" Index="#x3124" Sub="#x01">
 								<Type>BYTE</Type>
 							</Entry>
-							<Entry Name="M3__desired_position" Index="#x3115" Sub="#x01">
+							<Entry Name="M3__desired_position" Index="#x3125" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__desired_speed" Index="#x3116" Sub="#x01">
+							<Entry Name="M3__desired_speed" Index="#x3126" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__desired__current" Index="#x3117" Sub="#x01">
+							<Entry Name="M3__desired__current" Index="#x3127" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Max_Pos" Index="#x3118" Sub="#x01">
+							<Entry Name="M3__Max_Pos" Index="#x3128" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Max_velocity" Index="#x3119" Sub="#x01">
+							<Entry Name="M3__Max_velocity" Index="#x3129" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Max_current" Index="#x311a" Sub="#x01">
+							<Entry Name="M3__Max_current" Index="#x312a" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M3__Spare" Index="#x311b" Sub="#x01">
+							<Entry Name="M3__Spare" Index="#x312b" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__control_mode" Index="#x311c" Sub="#x01">
+							<Entry Name="M4__control_mode" Index="#x312c" Sub="#x01">
 								<Type>BYTE</Type>
 							</Entry>
-							<Entry Name="M4__control_set" Index="#x311d" Sub="#x01">
+							<Entry Name="M4__control_set" Index="#x312d" Sub="#x01">
 								<Type>BYTE</Type>
 							</Entry>
-							<Entry Name="M4__desired_position" Index="#x311e" Sub="#x01">
+							<Entry Name="M4__desired_position" Index="#x312e" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__desired_speed" Index="#x311f" Sub="#x01">
+							<Entry Name="M4__desired_speed" Index="#x312f" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__desired__current" Index="#x3120" Sub="#x01">
+							<Entry Name="M4__desired__current" Index="#x3130" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Max_Pos" Index="#x3121" Sub="#x01">
+							<Entry Name="M4__Max_Pos" Index="#x3131" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Max_velocity" Index="#x3122" Sub="#x01">
+							<Entry Name="M4__Max_velocity" Index="#x3132" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Max_current" Index="#x3123" Sub="#x01">
+							<Entry Name="M4__Max_current" Index="#x3133" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
-							<Entry Name="M4__Spare" Index="#x3124" Sub="#x01">
+							<Entry Name="M4__Spare" Index="#x3134" Sub="#x01">
 								<Type>INT</Type>
 							</Entry>
 						</Pdo>