diff --git a/pmac_motorhome/snippets/power/jog_if_on_limit.pmc.jinja b/pmac_motorhome/snippets/power/jog_if_on_limit.pmc.jinja index 16beb48..bdea832 100644 --- a/pmac_motorhome/snippets/power/jog_if_on_limit.pmc.jinja +++ b/pmac_motorhome/snippets/power/jog_if_on_limit.pmc.jinja @@ -13,7 +13,7 @@ // Wait for the move to complete CALL DelayTimer.msec(20) Sys.CdTimer[{{plc.plc_num}}]={{ plc.timeout}} // Now start checking the conditions - while (({{ group.in_pos(operator="&& ", relOperator="==", value=0) }}) && ({{ group.following_err(relOperator="==", value=0) }}) && ({{ group.limits(relOperator="==", value=0) }}) && (Sys.CdTimer[{{plc.plc_num}}] > 0) && (PLC{{plc.plc_num}}_HomingStatus == PLC{{plc.plc_num}}_StatusHoming || PLC{{plc.plc_num}}_HomingStatus == PLC{{plc.plc_num}}_StatusDebugHoming)){ + while (({{ group.in_pos(operator="&& ", relOperator="==", value=0) }}) && ({{ group.following_err(relOperator="==", value=0) }}) && ({{ group.limits(relOperator="==", value=0) }}) && (Sys.CdTimer[{{plc.plc_num}}] > 0) && (PLC{{plc.plc_num}}_HomingStatus == PLC{{plc.plc_num}}_StatusHoming || PLC{{plc.plc_num}}_HomingStatus == PLC{{plc.plc_num}}_StatusDebugHoming)){ } // Check why we left the while loop if ({{ group.following_err(relOperator="!=", value=0) }}){ // Following error check failed diff --git a/pmac_motorhome/snippets/power/plc.pmc.jinja b/pmac_motorhome/snippets/power/plc.pmc.jinja index f4bcb5b..603a916 100644 --- a/pmac_motorhome/snippets/power/plc.pmc.jinja +++ b/pmac_motorhome/snippets/power/plc.pmc.jinja @@ -56,7 +56,7 @@ PLC{{plc.plc_num}}_HomingGroup = 0 #define PLC{{plc.plc_num}}_HomingBackupGroup P{{plc.plc_num}}03 PLC{{plc.plc_num}}_HomingBackupGroup = 0 -open plc {{ plc.plc_num }} +open plc {{ plc.plc_num }} if (PLC{{plc.plc_num}}_HomingStatus != PLC{{plc.plc_num}}_StatusHoming && PLC{{plc.plc_num}}_HomingStatus != PLC{{plc.plc_num}}_StatusDebugHoming){ PLC{{plc.plc_num}}_HomingStatus = PLC{{plc.plc_num}}_StatusHoming