michi/KD_FC_Batteriewanne
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tried to Fix Raytools

Browse Source
This commit is contained in:
Michael Rest
2021-04-14 17:40:16 +02:00
parent 17408440ce
commit 71325c74bb
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Logical/Communication/RayTools/Raytools/Cyclic.st
View File

@@ -8,10 +8,10 @@ PROGRAM _CYCLIC
gRTLaserInterface.In.bHeadCalibrated := bInCalibrated;
//Interface an Raytools Kopf
bOuFollowPos := gRTLaserInterface.Out.bFollowPos AND NOT TOF_Error.Q AND bInReady;
bOuFollowPos := gRTLaserInterface.Out.bFollowPos AND NOT TOF_Error.Q AND bInReady AND NOT bInPosLimits;
bOuMidpos := gRTLaserInterface.Out.bMidPos AND NOT bInMidPosArrived AND NOT TOF_FollowPos.Q AND NOT TOF_Error.Q AND bInReady;
//AND NOT TON_MidPosTimeout.Q AND NOT TOF_MidPosTimeouterror.Q;
bOuCalibrate := gRTLaserInterface.Out.bCalibrateLaser;
bOuCalibrate := gRTLaserInterface.Out.bCalibrateLaser AND NOT bInPosLimits;
bOuReset := gMP7121.Button OR (NOT bDebug AND NOT bOuFollowPos AND bInAlarm AND TOF_FollowPosAutoErrorReset.Q);

6
Logical/MachCtrl/GlobalTool.typ
View File

@@ -2,8 +2,10 @@
TYPE
gtyp_Recipe : STRUCT (*Prozessgrenzwerte*)
strCaption : STRING[15] := 'Default'; (*Bezeichnung Bauteil*)
usParts : USINT := 0; (*Anzahl der Bauteile*)
usRobotPrg : USINT := 0; (*Programmnummer Roboter*)
strCNCPrg : STRING[80] := ''; (*CNCProgramm - Aufruf*)
usToolID : USINT := 0; (*Werkzeug ID*)
uiLaserPowerMin : UINT; (*Minimale Laserleistung*)
uiLaserPower : UINT; (*Minimale Laserleistung*)
END_STRUCT;
gTyp_Tool : STRUCT (*Werkzeugdaten*)
Status : gTyp_ToolState; (*Stati*)

2
Logical/MachCtrl/MachCtrl/Action_Manual.st
View File

@@ -910,7 +910,7 @@ ACTION DoManualCNC:
END_IF
END_IF
ELSIF EDGEPOS (gMP7121.Stop) OR NOT States.bSafetyCNCAxisOk THEN
IF MpFUB.MpCNC5Axis.MoveActive THEN
IF MpFUB.MpCNC5Axis.MoveActive AND NOT MpFUB.MpCNC5Axis.Interrupt THEN
MpFUB.MpCNC5Axis.Interrupt := TRUE;
ELSE
MpFUB.MpCNC5Axis.MoveProgram := FALSE;

2
Logical/MachCtrl/MachCtrl/Types.typ
View File

@@ -319,7 +319,7 @@ TYPE
usDtropDownCncPrg : USINT; (*CncProgramm ausw<73>hlen*)
usStatJogDestPos : USINT;
usStatJogDestPosDeg : USINT;
rOverride : REAL; (*Vorschub f. CNC (0-100%)*)
rOverride : REAL := 100; (*Vorschub f. CNC (0-100%)*)
lrJogDestPos : LREAL; (*Zielposition f Tippbetrieb [mm]*)
lrJogDestPosSh1 : LREAL; (*Zielposition f Tippbetrieb Shuttle 1[mm]*)
lrJogDestPosSh2 : LREAL; (*Zielposition f Tippbetrieb Shuttle 2[mm]*)