Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
5a7fe5b
FB_SlitPair updated with improvements (soft limits update, operationa…
rubenmess Sep 12, 2025
e20b14c
formating fix
rubenmess Sep 12, 2025
21c4fc3
FB_Axis update, take away multiaxes 3 and 4 to avoid issue coupling …
rubenmess Sep 12, 2025
379e450
enable and reset out of the inputs var
rubenmess Sep 19, 2025
8cbfe3e
error report to virtual axis
rubenmess Sep 29, 2025
7db5edc
multimaster index 3&4 not used, gear out if axes disabled
rubenmess Oct 10, 2025
94ae53e
SOFT LIMITS FUNCTION UPDATE
rubenmess Nov 24, 2025
b979f03
Fix formatting and spelling
mac-kan Dec 12, 2025
fcbe8e7
MBP-369: Restore multimaster gearing in FB_Axis
szilard-ess Mar 4, 2026
e839284
MBP-369: Fix blades homing sequence not starting
szilard-ess Mar 4, 2026
9c8796d
MBP-369: Rework automatic error reset
szilard-ess Mar 4, 2026
e7f23f3
MBP-369: Update multimaster config
szilard-ess Mar 4, 2026
5b19c03
MBP-369: Fix calculation for virtual soft limits
szilard-ess Mar 4, 2026
71886aa
MBP-369: Add a small delta gap between limits
szilard-ess Mar 4, 2026
0dc6502
MBP-369: Fix issue with homing of virtual master
szilard-ess Mar 4, 2026
65be88e
MBP-369: Fix issue with auto collision detection
szilard-ess Mar 4, 2026
1d96a43
MBP-369: Cleanup comments and identations
szilard-ess Mar 4, 2026
b8491eb
MBP-369: Move notes above FB declaration
szilard-ess Mar 4, 2026
f499ce4
MBP-369: Fix indentations
szilard-ess Mar 4, 2026
623ee7b
MBP-369: Fix naming to match coding standard
szilard-ess Mar 4, 2026
83d27e2
MBP-369: Update enum names to coding standard
szilard-ess Mar 4, 2026
0098aea
MBP-369: Update anticollision to check slits homed
szilard-ess Mar 4, 2026
dc4ede2
MBP-369: Add plc task cylce time to inputs
szilard-ess Mar 4, 2026
8ccbb8d
MBP-369: Fix calculation using the wrong indexes
szilard-ess Mar 4, 2026
164e2cc
MBP-369: Fix whitespaces
szilard-ess Mar 4, 2026
c91dd58
MBP-369: Update anticollision enable/disable
szilard-ess Mar 5, 2026
3600fdc
MBP-369: Remove unused variable
szilard-ess Mar 5, 2026
b4938d2
MBP-369: Remove usage of global variables
szilard-ess Mar 5, 2026
1fafa5c
MBP-369: Fix typo
szilard-ess Mar 6, 2026
77bf7ad
MBP-369: Add virtual axis parameter validation
szilard-ess Mar 6, 2026
3056b08
MBP-369: Add option to home without bAutoHome
szilard-ess Mar 10, 2026
784bb1d
MBP-369: Fix whitespaces
szilard-ess Mar 10, 2026
4355909
MBP-369: Change bAutoHome initial value to FALSE
szilard-ess Mar 11, 2026
3de2556
MBP-369: Fix homing request did not work properly
szilard-ess Mar 11, 2026
8be5cc9
MBP-369: Add stop/halt homing through virtual axis
szilard-ess Mar 11, 2026
0199fe6
MPB-369: Update comments
szilard-ess Mar 11, 2026
566d3b6
MBP-369: Rework anticollision logic
szilard-ess Mar 13, 2026
bfc78cc
MPB-369: Change error propogation
szilard-ess Mar 13, 2026
f91dd46
MBP-369: Add warn/info messages to param check
szilard-ess Mar 24, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions DUTs/Axis_Structures/ST_AxisParamSpec.TcDUT
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_AxisParamSpec" Id="{786e4eb1-46f0-0178-3b79-82a7fdcac1a2}">
<Declaration><![CDATA[TYPE ST_AxisParamSpec :
STRUCT
eParam: E_AxisParameters;
fValue: LREAL;
END_STRUCT
END_TYPE
]]></Declaration>
</DUT>
</TcPlcObject>
20 changes: 20 additions & 0 deletions DUTs/E_AxisParamCheckState.TcDUT
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="E_AxisParamCheckState" Id="{1344f39b-70f2-0dc2-3c34-7a926795d442}">
<Declaration><![CDATA[{attribute 'qualified_only'}
{attribute 'strict'}
TYPE E_AxisParamCheckState :
(
eInit,
eSelectParam,
eWaitRead,
eCheck,
eParamValid,
eParamInvalid,
eNext,
eFinish
);
END_TYPE
]]></Declaration>
</DUT>
</TcPlcObject>
1 change: 1 addition & 0 deletions DUTs/E_AxisParameters.TcTLEO
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<EnumerationTextList Name="E_AxisParameters" Id="{9199cc42-106a-4663-aaa5-d49855d9aa9f}">
<Declaration><![CDATA[{attribute 'qualified_only'}
{attribute 'strict'}
{attribute 'to_string'}
TYPE E_AxisParameters :
(
//PLCopen specific parameters Index-Group 0x4000 + ID
Expand Down
39 changes: 20 additions & 19 deletions DUTs/E_SlitPairStates.TcDUT
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,26 @@
{attribute 'strict'}
TYPE E_SlitPairStates :
(
INIT := 0,
INIT_CLEAR_GEARING,
INIT_GEAROUT_CHECK,
CHECK_HOME_STATUS,
HOME_BLADES,
CHECK_BLADE_HOME_COMPLETE,
HOME_GAP,
CHECK_GAP_HOME_COMPLETE,
GEARIN_SLITS,
CHECK_GEARIN_SLITS_COMPLETE,
SLITS_OPERATIONAL,
GEAROUT_BLADES,
CHECK_GEAROUT_COMPLETE,
CLEAR_GAP_CALIBRATION,
ERROR,
ERROR_GEAROUT,
ERROR_GEAROUT_CHECK,
ERROR_RESET_AXES,
ERROR_RESET_CHECK
eStartup := 0,
eInit,
eInitClearGearing,
eInitGearOutCheck,
eCheckHomeStatus,
eHomeBlades,
eCheckBladeHomeComplete,
eHomeGap,
eCheckGapHomeComplete,
eGearInSlits,
eCheckGearInSlitsComplete,
eSlitsOperational,
eGearOutBlades,
eCheckGearOutComplete,
eResetCalibration,
eError,
eErrorGearOut,
eErrorGearOutCheck,
eErrorResetAxes,
eErrorResetCheck
);
END_TYPE
]]></Declaration>
Expand Down
17 changes: 17 additions & 0 deletions DUTs/E_SlitSoftLimits.TcDUT
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="E_SlitSoftLimits" Id="{5a8c53db-c513-01b1-1e81-1ca22261b4f2}">
<Declaration><![CDATA[{attribute 'qualified_only'}
{attribute 'strict'}
TYPE E_SlitSoftLimits :
(
eStart := 0,
eWriteGapCentreFwd,
eWriteGapCentreBwd,
eWriteGapSizeFwd,
eFinish
);
END_TYPE
]]></Declaration>
</DUT>
</TcPlcObject>
Loading
Loading