Klagarge/eKart
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

update EPOS and change gitmodule

Browse Source
This commit is contained in:
Rémi Heredero 2023-11-11 13:23:23 +01:00
parent d14390a3e1
commit 81a46d51fd
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "Controller"] [submodule "Controller"]
path = 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"] [submodule "interface-epos"]
path = interface-epos path = interface-epos
url = git@github.com:SummerSchool2023-RED/307-drive-interface.git url = git@github.com:SummerSchool2023-RED/307-drive-interface.git

49
EPOS/EPOS4 SS2_2023_Propulsion_V1.pjm
View File

@ -34,15 +34,39 @@
</NetworkTopology> </NetworkTopology>
<WindowInformation> <WindowInformation>
<ControlWindow> <ControlWindow>
<Name>Cyclic Sync Torque Mode - EPOS4 CAN [Node 1]</Name> <Name>Homing Mode - EPOS4 CAN [Node 1]</Name>
<SystemTag>537B707D-8114-4e6d-BA72-1296EF36A841</SystemTag> <SystemTag>537B707D-8114-4e6d-BA72-1296EF36A841</SystemTag>
<FunctionId>67108864</FunctionId> <FunctionId>100663296</FunctionId>
<InvokeId>E31F10B9-06E5-4505-975D-257852138F39</InvokeId> <InvokeId>F775D338-292D-4ef9-A66B-5C9EE24AEEE4</InvokeId>
<Position> <Position>
<XPosition>-8</XPosition> <XPosition>-8</XPosition>
<YPosition>-31</YPosition> <YPosition>-31</YPosition>
<Width>1666</Width> <Width>1666</Width>
<Height>788</Height> <Height>796</Height>
</Position>
</ControlWindow>
<ControlWindow>
<Name>Profile Position Mode - EPOS4 CAN [Node 1]</Name>
<SystemTag>537B707D-8114-4e6d-BA72-1296EF36A841</SystemTag>
<FunctionId>117440512</FunctionId>
<InvokeId>01D678BA-C2CA-47aa-B66C-3515ACA04586</InvokeId>
<Position>
<XPosition>52</XPosition>
<YPosition>52</YPosition>
<Width>1416</Width>
<Height>523</Height>
</Position>
</ControlWindow>
<ControlWindow>
<Name>Data Recorder - EPOS4 CAN [Node 1]</Name>
<SystemTag>537B707D-8114-4e6d-BA72-1296EF36A841</SystemTag>
<FunctionId>50331648</FunctionId>
<InvokeId>4128F312-F681-4c60-83F5-4787455D6815</InvokeId>
<Position>
<XPosition>130</XPosition>
<YPosition>130</YPosition>
<Width>1416</Width>
<Height>523</Height>
</Position> </Position>
</ControlWindow> </ControlWindow>
</WindowInformation> </WindowInformation>
@ -80,7 +104,6 @@
<Interface>All</Interface> <Interface>All</Interface>
<Port>All</Port> <Port>All</Port>
<TransferRateDetection>Standard</TransferRateDetection> <TransferRateDetection>Standard</TransferRateDetection>
<TransferRate>1000000</TransferRate>
<NumberOfDevicesInNetwork>1</NumberOfDevicesInNetwork> <NumberOfDevicesInNetwork>1</NumberOfDevicesInNetwork>
</ScanningSetting> </ScanningSetting>
</NetworkScanning> </NetworkScanning>
@ -104,7 +127,7 @@
<FieldbusMode> <FieldbusMode>
<ActiveMode> <ActiveMode>
<ModeId>1</ModeId> <ModeId>1</ModeId>
<CommunicationTypeLabel>CAN</CommunicationTypeLabel> <CommunicationTypeLabel/>
</ActiveMode> </ActiveMode>
</FieldbusMode> </FieldbusMode>
<ControllerType> <ControllerType>
@ -245,8 +268,18 @@
</DeviceTypeSettings> </DeviceTypeSettings>
<Controls> <Controls>
<Control> <Control>
<InvokeId>E31F10B9-06E5-4505-975D-257852138F39</InvokeId> <InvokeId>F775D338-292D-4ef9-A66B-5C9EE24AEEE4</InvokeId>
<FunctionId>67108864</FunctionId> <FunctionId>100663296</FunctionId>
<Configuration/>
</Control>
<Control>
<InvokeId>01D678BA-C2CA-47aa-B66C-3515ACA04586</InvokeId>
<FunctionId>117440512</FunctionId>
<Configuration/>
</Control>
<Control>
<InvokeId>4128F312-F681-4c60-83F5-4787455D6815</InvokeId>
<FunctionId>50331648</FunctionId>
<Configuration/> <Configuration/>
</Control> </Control>
</Controls> </Controls>