diff --git a/.gitmodules b/.gitmodules index bda3fc0..2445b0c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "Controller"] path = Controller - url = git@github.com:SummerSchool2023-RED/306-controller_interface.git + url = git@git.kb28.ch:Klagarge/SummerSchool2-Controller.git [submodule "interface-epos"] path = interface-epos url = git@github.com:SummerSchool2023-RED/307-drive-interface.git diff --git a/EPOS/EPOS4 SS2_2023_Propulsion_V1.pjm b/EPOS/EPOS4 SS2_2023_Propulsion_V1.pjm index cded4f8..fa29c41 100644 --- a/EPOS/EPOS4 SS2_2023_Propulsion_V1.pjm +++ b/EPOS/EPOS4 SS2_2023_Propulsion_V1.pjm @@ -34,15 +34,39 @@ - Cyclic Sync Torque Mode - EPOS4 CAN [Node 1] + Homing Mode - EPOS4 CAN [Node 1] 537B707D-8114-4e6d-BA72-1296EF36A841 - 67108864 - E31F10B9-06E5-4505-975D-257852138F39 + 100663296 + F775D338-292D-4ef9-A66B-5C9EE24AEEE4 -8 -31 1666 - 788 + 796 + + + + Profile Position Mode - EPOS4 CAN [Node 1] + 537B707D-8114-4e6d-BA72-1296EF36A841 + 117440512 + 01D678BA-C2CA-47aa-B66C-3515ACA04586 + + 52 + 52 + 1416 + 523 + + + + Data Recorder - EPOS4 CAN [Node 1] + 537B707D-8114-4e6d-BA72-1296EF36A841 + 50331648 + 4128F312-F681-4c60-83F5-4787455D6815 + + 130 + 130 + 1416 + 523 @@ -80,7 +104,6 @@ All All Standard - 1000000 1 @@ -104,7 +127,7 @@ 1 - CAN + @@ -245,8 +268,18 @@ - E31F10B9-06E5-4505-975D-257852138F39 - 67108864 + F775D338-292D-4ef9-A66B-5C9EE24AEEE4 + 100663296 + + + + 01D678BA-C2CA-47aa-B66C-3515ACA04586 + 117440512 + + + + 4128F312-F681-4c60-83F5-4787455D6815 + 50331648