diff --git a/src/abstractions/app/apax.yml b/src/abstractions/app/apax.yml index 517011354..231f2687b 100644 --- a/src/abstractions/app/apax.yml +++ b/src/abstractions/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.abb.robotics/app/apax.yml b/src/components.abb.robotics/app/apax.yml index ff35edf0e..10fe08632 100644 --- a/src/components.abb.robotics/app/apax.yml +++ b/src/components.abb.robotics/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st index 65a555095..cba9e9687 100644 --- a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st @@ -434,7 +434,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start at main running: starting program at main. IF _progress = 300 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#500, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#500, eAxoMessageCategory#Potential); Status.Error.Id := UINT#500; END_IF; @@ -469,8 +469,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10001; END_IF; Messenger.ActivateOnCondition(ULINT#10000,StartAtMainTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10001,StartAtMainTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#102,StartAtMainTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10001,StartAtMainTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#102,StartAtMainTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartAtMainTask.RestoreTriggered() AND _progress >= 300 AND _progress <= 309 THEN Status.Action.Id := UINT#102; _progress := 0; @@ -496,7 +496,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: switching to auto. IF _progress = 310 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#510, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#510, eAxoMessageCategory#Potential); Status.Error.Id := UINT#510; END_IF; @@ -508,7 +508,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: reseting error. IF _progress = 311 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#511, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#511, eAxoMessageCategory#Error); Status.Error.Id := UINT#511; END_IF; @@ -523,7 +523,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: reseting emergency stop error. IF _progress = 312 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#512, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#512, eAxoMessageCategory#Potential); Status.Error.Id := UINT#512; END_IF; @@ -538,7 +538,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: switching motors on. IF _progress = 313 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#513, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#513, eAxoMessageCategory#Potential); Status.Error.Id := UINT#513; END_IF; @@ -557,7 +557,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: starting program. IF _progress = 314 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#514, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#514, eAxoMessageCategory#Potential); Status.Error.Id := UINT#514; END_IF; @@ -576,7 +576,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: checking controller error. IF _progress = 315 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#515, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#515, eAxoMessageCategory#Error); Status.Error.Id := UINT#515; END_IF; @@ -616,8 +616,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10011; END_IF; Messenger.ActivateOnCondition(ULINT#10010,StartMotorsAndProgramTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10011,StartMotorsAndProgramTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#112,StartMotorsAndProgramTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10011,StartMotorsAndProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#112,StartMotorsAndProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartMotorsAndProgramTask.RestoreTriggered() AND _progress >= 310 AND _progress <= 319 THEN Status.Action.Id := UINT#112; _progress := 0; @@ -643,7 +643,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: switching to auto. IF _progress = 320 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#520, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#520, eAxoMessageCategory#Potential); Status.Error.Id := UINT#520; END_IF; @@ -655,7 +655,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: reseting error. IF _progress = 321 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#521, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#521, eAxoMessageCategory#Error); Status.Error.Id := UINT#521; END_IF; @@ -670,7 +670,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: reseting emergency stop error. IF _progress = 322 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#522, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#522, eAxoMessageCategory#Potential); Status.Error.Id := UINT#522; END_IF; @@ -685,7 +685,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: switching motors on. IF _progress = 323 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#523, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#523, eAxoMessageCategory#Potential); Status.Error.Id := UINT#523; END_IF; @@ -704,7 +704,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: starting program. IF _progress = 324 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#524, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#524, eAxoMessageCategory#Potential); Status.Error.Id := UINT#524; END_IF; @@ -723,7 +723,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: checking controller error. IF _progress = 325 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#525, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#525, eAxoMessageCategory#Error); Status.Error.Id := UINT#525; END_IF; @@ -743,7 +743,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: sending parameters of the movement to the controller. IF _progress = 326 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#526, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#526, eAxoMessageCategory#Potential); Status.Error.Id := UINT#526; END_IF; @@ -766,27 +766,27 @@ NAMESPACE AXOpen.Components.Abb.Robotics IF _progress = 327 THEN IF _infoTimer.output THEN IF Inputs.GlobalSpeed <> Status.CurrentMovementParameters.GlobalSpeed THEN - TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Potential); Status.Error.Id := UINT#527;//<#Waiting for Inputs.GlobalSpeed to be equal to MovementParameters.GlobalSpeed! END_IF; IF Inputs.ToolNo <> Status.CurrentMovementParameters.ToolNo THEN - TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Potential); Status.Error.Id := UINT#528;//<#Waiting for Inputs.ToolNo to be equal to MovementParameters.ToolNo! END_IF; IF Inputs.WorkobjectNo <> Status.CurrentMovementParameters.WorkobjectNo THEN - TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Potential); Status.Error.Id := UINT#529;//<#Waiting for Inputs.WorkobjectNo to be equal to MovementParameters.WorkobjectNo! END_IF; IF Inputs.PointNo <> Status.CurrentMovementParameters.PointNo THEN - TaskMessenger.Activate( UINT#530, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#530, eAxoMessageCategory#Potential); Status.Error.Id := UINT#530;//<#Waiting for Inputs.PointNo to be equal to MovementParameters.PointNo! END_IF; IF Inputs.UserSpecSpeed1 <> Status.CurrentMovementParameters.UserSpecSpeed1 THEN - TaskMessenger.Activate( UINT#531, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#531, eAxoMessageCategory#Potential); Status.Error.Id := UINT#531;//<#Waiting for Inputs.UserSpecSpeed1 to be equal to MovementParameters.UserSpecSpeed1! END_IF; IF Inputs.UserSpecSpeed2 <> Status.CurrentMovementParameters.UserSpecSpeed2 THEN - TaskMessenger.Activate( UINT#532, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#532, eAxoMessageCategory#Potential); Status.Error.Id := UINT#532;//<#Waiting for Inputs.UserSpecSpeed2 to be equal to MovementParameters.UserSpecSpeed2! END_IF; END_IF; @@ -805,7 +805,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: acknowleadging of the movement parameters. IF _progress = 333 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#533, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#533, eAxoMessageCategory#Potential); Status.Error.Id := UINT#533; END_IF; @@ -819,7 +819,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: waiting for the movement is finished. IF _progress = 334 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#534, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#534, eAxoMessageCategory#Potential); Status.Error.Id := UINT#534; END_IF; IF Status.CurrentMovementParameters.GlobalSpeed > BYTE#0 THEN @@ -835,7 +835,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: acknowleadging of the finished movement. IF _progress = 335 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#535, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#535, eAxoMessageCategory#Potential); Status.Error.Id := UINT#535; END_IF; @@ -866,8 +866,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10021; END_IF; Messenger.ActivateOnCondition(ULINT#10020,StartMotorsProgramAndMovementsTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10021,StartMotorsProgramAndMovementsTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#122,StartMotorsProgramAndMovementsTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10021,StartMotorsProgramAndMovementsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#122,StartMotorsProgramAndMovementsTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartMotorsProgramAndMovementsTask.RestoreTriggered() AND _progress >= 320 AND _progress <= 339 THEN Status.Action.Id := UINT#122; _progress := 0; @@ -893,7 +893,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors running: switching to auto. IF _progress = 340 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#540, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#540, eAxoMessageCategory#Potential); Status.Error.Id := UINT#540; END_IF; @@ -905,7 +905,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors running: reseting error. IF _progress = 341 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#541, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#541, eAxoMessageCategory#Error); Status.Error.Id := UINT#541; END_IF; @@ -920,7 +920,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors running: reseting emergency stop error. IF _progress = 342 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#542, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#542, eAxoMessageCategory#Potential); Status.Error.Id := UINT#542; END_IF; @@ -935,7 +935,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors running: switching motors on. IF _progress = 343 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#543, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#543, eAxoMessageCategory#Potential); Status.Error.Id := UINT#543; END_IF; @@ -954,7 +954,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors running: checking controller error. IF _progress = 344 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#544, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#544, eAxoMessageCategory#Error); Status.Error.Id := UINT#544; END_IF; @@ -994,8 +994,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10041; END_IF; Messenger.ActivateOnCondition(ULINT#10040,StartMotorsTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10041,StartMotorsTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#142,StartMotorsTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10041,StartMotorsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#142,StartMotorsTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartMotorsTask.RestoreTriggered() AND _progress >= 340 AND _progress <= 349 THEN Status.Action.Id := UINT#142; _progress := 0; @@ -1019,7 +1019,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: waiting for the program is running. IF _progress = 350 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#550, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#550, eAxoMessageCategory#Potential); Status.Error.Id := UINT#550; END_IF; @@ -1031,7 +1031,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: waiting for the motors are on. IF _progress = 351 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#551, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#551, eAxoMessageCategory#Potential); Status.Error.Id := UINT#551; END_IF; @@ -1043,7 +1043,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: waiting for the error is cleared. IF _progress = 352 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#552, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#552, eAxoMessageCategory#Error); Status.Error.Id := UINT#552; END_IF; @@ -1055,7 +1055,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: sending parameters of the movement to the controller. IF _progress = 353 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#553, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#553, eAxoMessageCategory#Potential); Status.Error.Id := UINT#553; END_IF; @@ -1078,27 +1078,27 @@ NAMESPACE AXOpen.Components.Abb.Robotics IF _progress = 354 THEN IF _infoTimer.output THEN IF Inputs.GlobalSpeed <> Status.CurrentMovementParameters.GlobalSpeed THEN - TaskMessenger.Activate( UINT#554, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#554, eAxoMessageCategory#Potential); Status.Error.Id := UINT#554;//<#Waiting for Inputs.GlobalSpeed to be equal to MovementParameters.GlobalSpeed! END_IF; IF Inputs.ToolNo <> Status.CurrentMovementParameters.ToolNo THEN - TaskMessenger.Activate( UINT#555, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#555, eAxoMessageCategory#Potential); Status.Error.Id := UINT#555;//<#Waiting for Inputs.ToolNo to be equal to MovementParameters.ToolNo! END_IF; IF Inputs.WorkobjectNo <> Status.CurrentMovementParameters.WorkobjectNo THEN - TaskMessenger.Activate( UINT#556, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#556, eAxoMessageCategory#Potential); Status.Error.Id := UINT#556;//<#Waiting for Inputs.WorkobjectNo to be equal to MovementParameters.WorkobjectNo! END_IF; IF Inputs.PointNo <> Status.CurrentMovementParameters.PointNo THEN - TaskMessenger.Activate( UINT#557, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#557, eAxoMessageCategory#Potential); Status.Error.Id := UINT#557;//<#Waiting for Inputs.PointNo to be equal to MovementParameters.PointNo! END_IF; IF Inputs.UserSpecSpeed1 <> Status.CurrentMovementParameters.UserSpecSpeed1 THEN - TaskMessenger.Activate( UINT#558, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#558, eAxoMessageCategory#Potential); Status.Error.Id := UINT#558;//<#Waiting for Inputs.UserSpecSpeed1 to be equal to MovementParameters.UserSpecSpeed1! END_IF; IF Inputs.UserSpecSpeed2 <> Status.CurrentMovementParameters.UserSpecSpeed2 THEN - TaskMessenger.Activate( UINT#559, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#559, eAxoMessageCategory#Potential); Status.Error.Id := UINT#559;//<#Waiting for Inputs.UserSpecSpeed2 to be equal to MovementParameters.UserSpecSpeed2! END_IF; END_IF; @@ -1117,7 +1117,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: acknowleadging of the movement parameters. IF _progress = 360 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#560, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#560, eAxoMessageCategory#Potential); Status.Error.Id := UINT#560; END_IF; @@ -1131,7 +1131,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: waiting for the movement is finished. IF _progress = 361 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#561, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#561, eAxoMessageCategory#Potential); Status.Error.Id := UINT#561; END_IF; IF Status.CurrentMovementParameters.GlobalSpeed > BYTE#0 THEN @@ -1147,7 +1147,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: acknowleadging of the finished movement. IF _progress = 362 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#562, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#562, eAxoMessageCategory#Potential); Status.Error.Id := UINT#562; END_IF; @@ -1182,8 +1182,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10051; END_IF; Messenger.ActivateOnCondition(ULINT#10050,StartMovementsTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10051,StartMovementsTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#152,StartMovementsTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10051,StartMovementsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#152,StartMovementsTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartMovementsTask.RestoreTriggered() AND _progress >= 350 AND _progress <= 369 THEN Status.Action.Id := UINT#152; _progress := 0; @@ -1209,7 +1209,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start program running: starting program. IF _progress = 370 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#570, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#570, eAxoMessageCategory#Potential); Status.Error.Id := UINT#570; END_IF; @@ -1223,7 +1223,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start program running: starting program. IF _progress = 371 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#571, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#571, eAxoMessageCategory#Potential); Status.Error.Id := UINT#571; END_IF; @@ -1258,8 +1258,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10071; END_IF; Messenger.ActivateOnCondition(ULINT#10070,StartProgramTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10071,StartProgramTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#172,StartProgramTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10071,StartProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#172,StartProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartProgramTask.RestoreTriggered() AND _progress >= 370 AND _progress <= 379 THEN Status.Action.Id := UINT#172; _progress := 0; @@ -1285,7 +1285,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop motors running: switching the motors off. IF _progress = 380 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#580, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#580, eAxoMessageCategory#Potential); Status.Error.Id := UINT#580; END_IF; @@ -1299,7 +1299,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop motors running: switching the motors off. IF _progress = 381 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#581, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#581, eAxoMessageCategory#Potential); Status.Error.Id := UINT#581; END_IF; @@ -1334,8 +1334,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10081; END_IF; Messenger.ActivateOnCondition(ULINT#10080,StopMotorsTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10081,StopMotorsTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#182,StopMotorsTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10081,StopMotorsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#182,StopMotorsTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StopMotorsTask.RestoreTriggered() AND _progress >= 380 AND _progress <= 389 THEN Status.Action.Id := UINT#182; _progress := 0; @@ -1359,7 +1359,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop movements and program running: stopping the movement. IF _progress = 390 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#590, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#590, eAxoMessageCategory#Potential); Status.Error.Id := UINT#590; END_IF; @@ -1379,7 +1379,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop movements and program running: stopping the program. IF _progress = 391 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#591, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#591, eAxoMessageCategory#Potential); Status.Error.Id := UINT#591; END_IF; @@ -1416,8 +1416,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10091; END_IF; Messenger.ActivateOnCondition(ULINT#10090,StopMovementsAndProgramTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10091,StopMovementsAndProgramTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#192,StopMovementsAndProgramTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10091,StopMovementsAndProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#192,StopMovementsAndProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StopMovementsAndProgramTask.RestoreTriggered() AND _progress >= 390 AND _progress <= 399 THEN Status.Action.Id := UINT#192; _progress := 0; @@ -1441,7 +1441,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop movements running: stopping the movement. IF _progress = 400 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#600, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#600, eAxoMessageCategory#Potential); Status.Error.Id := UINT#600; END_IF; @@ -1485,8 +1485,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10101; END_IF; Messenger.ActivateOnCondition(ULINT#10100,StopMovementsTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10101,StopMovementsTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#202,StopMovementsTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10101,StopMovementsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#202,StopMovementsTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StopMovementsTask.RestoreTriggered() AND _progress >= 400 AND _progress <= 409 THEN Status.Action.Id := UINT#202; _progress := 0; @@ -1510,7 +1510,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop program running: stopping the program. IF _progress = 410 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#610, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#610, eAxoMessageCategory#Potential); Status.Error.Id := UINT#610; END_IF; @@ -1545,8 +1545,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10111; END_IF; Messenger.ActivateOnCondition(ULINT#10110,StopProgramTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10111,StopProgramTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#212,StopProgramTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10111,StopProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#212,StopProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StopProgramTask.RestoreTriggered() AND _progress >= 410 AND _progress <= 419 THEN Status.Action.Id := UINT#212; _progress := 0; diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st index 592252ce6..52a938bf1 100644 --- a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st @@ -451,7 +451,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start at main running: starting program at main. IF _power_progress = 300 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#500, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#500, eAxoMessageCategory#Potential); Status.Error.Id := UINT#500; END_IF; @@ -466,7 +466,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start at main running: starting program at main. IF _power_progress = 301 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#501, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#501, eAxoMessageCategory#Potential); Status.Error.Id := UINT#501; END_IF; @@ -481,7 +481,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start at main running: program started. IF _power_progress = 302 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#502, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#502, eAxoMessageCategory#Potential); Status.Error.Id := UINT#502; END_IF; Outputs.ActionNo := BYTE#255; @@ -518,8 +518,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10001; END_IF; Messenger.ActivateOnCondition(ULINT#10000,StartAtMainTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10001,StartAtMainTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#102,StartAtMainTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10001,StartAtMainTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#102,StartAtMainTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartAtMainTask.RestoreTriggered() AND _power_progress >= 300 AND _power_progress <= 309 THEN Status.Action.Id := UINT#102; _power_progress := 0; @@ -545,7 +545,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: switching to auto. IF _power_progress = 310 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#510, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#510, eAxoMessageCategory#Potential); Status.Error.Id := UINT#510; END_IF; @@ -557,7 +557,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: reseting error. IF _power_progress = 311 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#511, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#511, eAxoMessageCategory#Error); Status.Error.Id := UINT#511; END_IF; @@ -572,7 +572,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: reseting emergency stop error. IF _power_progress = 312 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#512, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#512, eAxoMessageCategory#Potential); Status.Error.Id := UINT#512; END_IF; @@ -587,7 +587,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: switching motors on. IF _power_progress = 313 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#513, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#513, eAxoMessageCategory#Potential); Status.Error.Id := UINT#513; END_IF; @@ -606,7 +606,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: starting program. IF _power_progress = 314 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#514, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#514, eAxoMessageCategory#Potential); Status.Error.Id := UINT#514; END_IF; @@ -625,7 +625,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors and program running: checking controller error. IF _power_progress = 315 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#515, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#515, eAxoMessageCategory#Error); Status.Error.Id := UINT#515; END_IF; @@ -665,8 +665,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10011; END_IF; Messenger.ActivateOnCondition(ULINT#10010,StartMotorsAndProgramTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10011,StartMotorsAndProgramTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#112,StartMotorsAndProgramTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10011,StartMotorsAndProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#112,StartMotorsAndProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartMotorsAndProgramTask.RestoreTriggered() AND _power_progress >= 310 AND _power_progress <= 319 THEN Status.Action.Id := UINT#112; _power_progress := 0; @@ -692,7 +692,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: switching to auto. IF _power_progress = 320 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#520, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#520, eAxoMessageCategory#Potential); Status.Error.Id := UINT#520; END_IF; @@ -704,7 +704,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: reseting error. IF _power_progress = 321 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#521, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#521, eAxoMessageCategory#Error); Status.Error.Id := UINT#521; END_IF; @@ -719,7 +719,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: reseting emergency stop error. IF _power_progress = 322 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#522, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#522, eAxoMessageCategory#Potential); Status.Error.Id := UINT#522; END_IF; @@ -734,7 +734,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: switching motors on. IF _power_progress = 323 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#523, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#523, eAxoMessageCategory#Potential); Status.Error.Id := UINT#523; END_IF; @@ -753,7 +753,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: starting program. IF _power_progress = 324 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#524, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#524, eAxoMessageCategory#Potential); Status.Error.Id := UINT#524; END_IF; @@ -772,7 +772,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: checking controller error. IF _power_progress = 325 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#525, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#525, eAxoMessageCategory#Error); Status.Error.Id := UINT#525; END_IF; @@ -792,7 +792,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: sending parameters of the movement to the controller. IF _power_progress = 326 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#526, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#526, eAxoMessageCategory#Potential); Status.Error.Id := UINT#526; END_IF; @@ -815,27 +815,27 @@ NAMESPACE AXOpen.Components.Abb.Robotics IF _power_progress = 327 THEN IF _infoTimer.output THEN IF Inputs.GlobalSpeed <> Status.CurrentMovementParameters.GlobalSpeed THEN - TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Potential); Status.Error.Id := UINT#527;//<#Waiting for Inputs.GlobalSpeed to be equal to MovementParameters.GlobalSpeed! END_IF; IF Inputs.ToolNo <> Status.CurrentMovementParameters.ToolNo THEN - TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Potential); Status.Error.Id := UINT#528;//<#Waiting for Inputs.ToolNo to be equal to MovementParameters.ToolNo! END_IF; IF Inputs.WorkobjectNo <> Status.CurrentMovementParameters.WorkobjectNo THEN - TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Potential); Status.Error.Id := UINT#529;//<#Waiting for Inputs.WorkobjectNo to be equal to MovementParameters.WorkobjectNo! END_IF; IF Inputs.PointNo <> Status.CurrentMovementParameters.PointNo THEN - TaskMessenger.Activate( UINT#530, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#530, eAxoMessageCategory#Potential); Status.Error.Id := UINT#530;//<#Waiting for Inputs.PointNo to be equal to MovementParameters.PointNo! END_IF; IF Inputs.UserSpecSpeed1 <> Status.CurrentMovementParameters.UserSpecSpeed1 THEN - TaskMessenger.Activate( UINT#531, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#531, eAxoMessageCategory#Potential); Status.Error.Id := UINT#531;//<#Waiting for Inputs.UserSpecSpeed1 to be equal to MovementParameters.UserSpecSpeed1! END_IF; IF Inputs.UserSpecSpeed2 <> Status.CurrentMovementParameters.UserSpecSpeed2 THEN - TaskMessenger.Activate( UINT#532, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#532, eAxoMessageCategory#Potential); Status.Error.Id := UINT#532;//<#Waiting for Inputs.UserSpecSpeed2 to be equal to MovementParameters.UserSpecSpeed2! END_IF; END_IF; @@ -854,7 +854,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: acknowleadging of the movement parameters. IF _power_progress = 333 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#533, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#533, eAxoMessageCategory#Potential); Status.Error.Id := UINT#533; END_IF; @@ -868,7 +868,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: waiting for the movement is finished. IF _power_progress = 334 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#534, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#534, eAxoMessageCategory#Potential); Status.Error.Id := UINT#534; END_IF; IF Status.CurrentMovementParameters.GlobalSpeed > BYTE#0 THEN @@ -885,7 +885,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors program and movements running: acknowleadging of the finished movement. IF _power_progress = 335 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#535, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#535, eAxoMessageCategory#Potential); Status.Error.Id := UINT#535; END_IF; @@ -916,8 +916,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10021; END_IF; Messenger.ActivateOnCondition(ULINT#10020,StartMotorsProgramAndMovementsTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10021,StartMotorsProgramAndMovementsTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#122,StartMotorsProgramAndMovementsTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10021,StartMotorsProgramAndMovementsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#122,StartMotorsProgramAndMovementsTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartMotorsProgramAndMovementsTask.RestoreTriggered() AND _power_progress >= 320 AND _power_progress <= 339 THEN Status.Action.Id := UINT#122; _power_progress := 0; @@ -943,7 +943,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors running: switching to auto. IF _power_progress = 340 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#540, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#540, eAxoMessageCategory#Potential); Status.Error.Id := UINT#540; END_IF; @@ -955,7 +955,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors running: reseting error. IF _power_progress = 341 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#541, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#541, eAxoMessageCategory#Error); Status.Error.Id := UINT#541; END_IF; @@ -970,7 +970,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors running: reseting emergency stop error. IF _power_progress = 342 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#542, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#542, eAxoMessageCategory#Potential); Status.Error.Id := UINT#542; END_IF; @@ -985,7 +985,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors running: switching motors on. IF _power_progress = 343 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#543, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#543, eAxoMessageCategory#Potential); Status.Error.Id := UINT#543; END_IF; @@ -1004,7 +1004,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start motors running: checking controller error. IF _power_progress = 344 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#544, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#544, eAxoMessageCategory#Error); Status.Error.Id := UINT#544; END_IF; @@ -1044,8 +1044,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10041; END_IF; Messenger.ActivateOnCondition(ULINT#10040,StartMotorsTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10041,StartMotorsTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#142,StartMotorsTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10041,StartMotorsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#142,StartMotorsTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartMotorsTask.RestoreTriggered() AND _power_progress >= 340 AND _power_progress <= 349 THEN Status.Action.Id := UINT#142; _power_progress := 0; @@ -1069,7 +1069,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: waiting for the program is running. IF _movement_progress = 350 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#550, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#550, eAxoMessageCategory#Potential); Status.Error.Id := UINT#550; END_IF; @@ -1081,7 +1081,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: waiting for the motors are on. IF _movement_progress = 351 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#551, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#551, eAxoMessageCategory#Potential); Status.Error.Id := UINT#551; END_IF; @@ -1093,7 +1093,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: waiting for the error is cleared. IF _movement_progress = 352 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#552, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#552, eAxoMessageCategory#Error); Status.Error.Id := UINT#552; END_IF; @@ -1105,7 +1105,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: sending parameters of the movement to the controller. IF _movement_progress = 353 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#553, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#553, eAxoMessageCategory#Potential); Status.Error.Id := UINT#553; END_IF; @@ -1128,27 +1128,27 @@ NAMESPACE AXOpen.Components.Abb.Robotics IF _movement_progress = 354 THEN IF _infoTimer.output THEN IF Inputs.GlobalSpeed <> Status.CurrentMovementParameters.GlobalSpeed THEN - TaskMessenger.Activate( UINT#554, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#554, eAxoMessageCategory#Potential); Status.Error.Id := UINT#554;//<#Waiting for Inputs.GlobalSpeed to be equal to MovementParameters.GlobalSpeed! END_IF; IF Inputs.ToolNo <> Status.CurrentMovementParameters.ToolNo THEN - TaskMessenger.Activate( UINT#555, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#555, eAxoMessageCategory#Potential); Status.Error.Id := UINT#555;//<#Waiting for Inputs.ToolNo to be equal to MovementParameters.ToolNo! END_IF; IF Inputs.WorkobjectNo <> Status.CurrentMovementParameters.WorkobjectNo THEN - TaskMessenger.Activate( UINT#556, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#556, eAxoMessageCategory#Potential); Status.Error.Id := UINT#556;//<#Waiting for Inputs.WorkobjectNo to be equal to MovementParameters.WorkobjectNo! END_IF; IF Inputs.PointNo <> Status.CurrentMovementParameters.PointNo THEN - TaskMessenger.Activate( UINT#557, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#557, eAxoMessageCategory#Potential); Status.Error.Id := UINT#557;//<#Waiting for Inputs.PointNo to be equal to MovementParameters.PointNo! END_IF; IF Inputs.UserSpecSpeed1 <> Status.CurrentMovementParameters.UserSpecSpeed1 THEN - TaskMessenger.Activate( UINT#558, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#558, eAxoMessageCategory#Potential); Status.Error.Id := UINT#558;//<#Waiting for Inputs.UserSpecSpeed1 to be equal to MovementParameters.UserSpecSpeed1! END_IF; IF Inputs.UserSpecSpeed2 <> Status.CurrentMovementParameters.UserSpecSpeed2 THEN - TaskMessenger.Activate( UINT#559, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#559, eAxoMessageCategory#Potential); Status.Error.Id := UINT#559;//<#Waiting for Inputs.UserSpecSpeed2 to be equal to MovementParameters.UserSpecSpeed2! END_IF; END_IF; @@ -1167,7 +1167,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: acknowleadging of the movement parameters. IF _movement_progress = 360 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#560, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#560, eAxoMessageCategory#Potential); Status.Error.Id := UINT#560; END_IF; @@ -1181,7 +1181,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: waiting for the movement is finished. IF _movement_progress = 361 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#561, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#561, eAxoMessageCategory#Potential); Status.Error.Id := UINT#561; END_IF; IF Status.CurrentMovementParameters.GlobalSpeed > BYTE#0 THEN @@ -1198,7 +1198,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start movements running: acknowleadging of the finished movement. IF _movement_progress = 362 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#562, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#562, eAxoMessageCategory#Potential); Status.Error.Id := UINT#562; END_IF; @@ -1233,8 +1233,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10051; END_IF; Messenger.ActivateOnCondition(ULINT#10050,StartMovementsTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10051,StartMovementsTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#152,StartMovementsTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10051,StartMovementsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#152,StartMovementsTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartMovementsTask.RestoreTriggered() AND _movement_progress >= 350 AND _movement_progress <= 369 THEN Status.Action.Id := UINT#152; _movement_progress := 0; @@ -1260,7 +1260,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start program running: starting program. IF _power_progress = 370 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#570, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#570, eAxoMessageCategory#Potential); Status.Error.Id := UINT#570; END_IF; @@ -1274,7 +1274,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Start program running: starting program. IF _power_progress = 371 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#571, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#571, eAxoMessageCategory#Potential); Status.Error.Id := UINT#571; END_IF; @@ -1309,8 +1309,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10071; END_IF; Messenger.ActivateOnCondition(ULINT#10070,StartProgramTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10071,StartProgramTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#172,StartProgramTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10071,StartProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#172,StartProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StartProgramTask.RestoreTriggered() AND _power_progress >= 370 AND _power_progress <= 379 THEN Status.Action.Id := UINT#172; _power_progress := 0; @@ -1336,7 +1336,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop motors running: switching the motors off. IF _power_progress = 380 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#580, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#580, eAxoMessageCategory#Potential); Status.Error.Id := UINT#580; END_IF; @@ -1350,7 +1350,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop motors running: switching the motors off. IF _power_progress = 381 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#581, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#581, eAxoMessageCategory#Potential); Status.Error.Id := UINT#581; END_IF; @@ -1385,8 +1385,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10081; END_IF; Messenger.ActivateOnCondition(ULINT#10080,StopMotorsTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10081,StopMotorsTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#182,StopMotorsTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10081,StopMotorsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#182,StopMotorsTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StopMotorsTask.RestoreTriggered() AND _power_progress >= 380 AND _power_progress <= 389 THEN Status.Action.Id := UINT#182; _power_progress := 0; @@ -1412,7 +1412,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop movements and program running: stopping the movement. IF _power_progress = 390 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#590, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#590, eAxoMessageCategory#Potential); Status.Error.Id := UINT#590; END_IF; @@ -1432,7 +1432,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop movements and program running: stopping the program. IF _power_progress = 391 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#591, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#591, eAxoMessageCategory#Potential); Status.Error.Id := UINT#591; END_IF; @@ -1470,7 +1470,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics END_IF; Messenger.ActivateOnCondition(ULINT#10090,StopMovementsAndProgramTask.HasError(), eAxoMessageCategory#Error); Messenger.ActivateOnCondition(ULINT#10091,StopMovementsAndProgramTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#192,StopMovementsAndProgramTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#192,StopMovementsAndProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StopMovementsAndProgramTask.RestoreTriggered() AND _power_progress >= 390 AND _power_progress <= 399 THEN Status.Action.Id := UINT#192; _power_progress := 0; @@ -1494,7 +1494,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop movements running: stopping the movement. IF _power_progress = 400 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#600, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#600, eAxoMessageCategory#Potential); Status.Error.Id := UINT#600; END_IF; @@ -1538,8 +1538,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10101; END_IF; Messenger.ActivateOnCondition(ULINT#10100,StopMovementsTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10101,StopMovementsTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#202,StopMovementsTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10101,StopMovementsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#202,StopMovementsTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StopMovementsTask.RestoreTriggered() AND _power_progress >= 400 AND _power_progress <= 409 THEN Status.Action.Id := UINT#202; _power_progress := 0; @@ -1563,7 +1563,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics // Stop program running: stopping the program. IF _power_progress = 410 THEN IF _infoTimer.output THEN - TaskMessenger.Activate(UINT#610, eAxoMessageCategory#Warning); + TaskMessenger.Activate(UINT#610, eAxoMessageCategory#Potential); Status.Error.Id := UINT#610; END_IF; @@ -1598,8 +1598,8 @@ NAMESPACE AXOpen.Components.Abb.Robotics Status.Error.Id := UINT#10111; END_IF; Messenger.ActivateOnCondition(ULINT#10110,StopProgramTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10111,StopProgramTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#212,StopProgramTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10111,StopProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#212,StopProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); IF StopProgramTask.RestoreTriggered() AND _power_progress >= 410 AND _power_progress <= 419 THEN Status.Action.Id := UINT#212; _power_progress := 0; diff --git a/src/components.abstractions/app/apax.yml b/src/components.abstractions/app/apax.yml index 6bddc5cdc..4f5231251 100644 --- a/src/components.abstractions/app/apax.yml +++ b/src/components.abstractions/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.balluff.identification/app/apax.yml b/src/components.balluff.identification/app/apax.yml index 7978bae7d..cf2198704 100644 --- a/src/components.balluff.identification/app/apax.yml +++ b/src/components.balluff.identification/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045.st b/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045.st index f1d958b5b..2a655ce70 100644 --- a/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045.st +++ b/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045.st @@ -237,7 +237,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification //***********UPDATE**INPUTS****************** returnValue := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwId_BISM),_data); IF returnValue > WORD#0 THEN - Messenger.Activate(UINT#1201,eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1201,eAxoMessageCategory#Error); Status.Error.Id := UINT#1201; RETURN; END_IF; @@ -325,7 +325,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Read running: waiting for the presention of the tag. IF _progress = 300 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Potential); Status.Error.Id := UINT#500; END_IF; @@ -338,13 +338,13 @@ NAMESPACE AXOpen.Components.Balluff.Identification IF _progress = 301 THEN IF _infoTimer.output THEN IF Inputs.BitHeader1_JobAccepted THEN - TaskMessenger.Activate( UINT#501, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#501, eAxoMessageCategory#Potential); Status.Error.Id := UINT#501; ELSIF Inputs.BitHeader1_JobEnd THEN - TaskMessenger.Activate( UINT#502, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#502, eAxoMessageCategory#Potential); Status.Error.Id := UINT#502; ELSIF Inputs.BitHeader1_ToggleBit THEN - TaskMessenger.Activate( UINT#503, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#503, eAxoMessageCategory#Potential); Status.Error.Id := UINT#503; END_IF; END_IF; @@ -376,7 +376,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Read running: waiting for the job header to be set. IF _progress = 304 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#504, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#504, eAxoMessageCategory#Potential); Status.Error.Id := UINT#504; END_IF; @@ -394,7 +394,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Read running: waiting for the job to be accepted. IF _progress = 305 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#505, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#505, eAxoMessageCategory#Potential); Status.Error.Id := UINT#505; END_IF; @@ -407,7 +407,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Read running: processing partial segment of the data. IF _progress = 306 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#506, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#506, eAxoMessageCategory#Potential); Status.Error.Id := UINT#506; END_IF; @@ -425,7 +425,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Read running: trigger processing the following segment of the data. IF _progress = 307 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#507, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#507, eAxoMessageCategory#Potential); Status.Error.Id := UINT#507; END_IF; @@ -440,7 +440,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Read running: waiting for the data of the following data segment. IF _progress = 308 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#508, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#508, eAxoMessageCategory#Potential); Status.Error.Id := UINT#508; END_IF; @@ -459,7 +459,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Read running: processing the last segment of the data. IF _progress = 309 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#509, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#509, eAxoMessageCategory#Potential); Status.Error.Id := UINT#509; END_IF; @@ -497,8 +497,8 @@ NAMESPACE AXOpen.Components.Balluff.Identification Status.Error.Id := UINT#10001; END_IF; Messenger.ActivateOnCondition(ULINT#10000,ReadTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10001,ReadTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#102,ReadTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10001,ReadTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#102,ReadTask.RestoreTriggered() , eAxoMessageCategory#Info); IF ReadTask.RestoreTriggered() AND _progress >= 300 AND _progress <= 309 THEN Status.Action.Id := UINT#102; _progress := 0; @@ -532,7 +532,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write running: waiting for the presention of the tag. IF _progress = 320 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#520, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#520, eAxoMessageCategory#Potential); Status.Error.Id := UINT#520; END_IF; @@ -544,7 +544,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write running: processing data to send. IF _progress = 321 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Potential); Status.Error.Id := UINT#521; END_IF; @@ -572,13 +572,13 @@ NAMESPACE AXOpen.Components.Balluff.Identification IF _progress = 322 THEN IF _infoTimer.output THEN IF Inputs.BitHeader1_JobAccepted THEN - TaskMessenger.Activate( UINT#522, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#522, eAxoMessageCategory#Potential); Status.Error.Id := UINT#522; ELSIF Inputs.BitHeader1_JobEnd THEN - TaskMessenger.Activate( UINT#523, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#523, eAxoMessageCategory#Potential); Status.Error.Id := UINT#523; ELSIF Inputs.BitHeader1_ToggleBit THEN - TaskMessenger.Activate( UINT#524, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#524, eAxoMessageCategory#Potential); Status.Error.Id := UINT#524; END_IF; END_IF; @@ -601,7 +601,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write running: trigger sending the job header. IF _progress = 325 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#525, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#525, eAxoMessageCategory#Potential); Status.Error.Id := UINT#525; END_IF; @@ -622,7 +622,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write running: waiting for the job to be accepted. IF _progress = 326 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#526, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#526, eAxoMessageCategory#Potential); Status.Error.Id := UINT#526; END_IF; @@ -638,7 +638,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write running: processing partial segment of the data. IF _progress = 327 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Potential); Status.Error.Id := UINT#527; END_IF; @@ -665,7 +665,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write running: trigger sending the current segment of the data. IF _progress = 328 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Potential); Status.Error.Id := UINT#528; END_IF; @@ -679,7 +679,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write running: processing the last segment of the data. IF _progress = 329 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Potential); Status.Error.Id := UINT#529; END_IF; @@ -696,10 +696,10 @@ NAMESPACE AXOpen.Components.Balluff.Identification IF _progress = 330 THEN IF _infoTimer.output THEN IF Inputs.BitHeader1_JobAccepted THEN - TaskMessenger.Activate( UINT#530, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#530, eAxoMessageCategory#Potential); Status.Error.Id := UINT#530; ELSIF Inputs.BitHeader1_JobError THEN - TaskMessenger.Activate( UINT#531, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#531, eAxoMessageCategory#Error); Status.Error.Id := UINT#531; END_IF; END_IF; @@ -734,8 +734,8 @@ NAMESPACE AXOpen.Components.Balluff.Identification Status.Error.Id := UINT#10021; END_IF; Messenger.ActivateOnCondition(ULINT#10020,WriteTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10021,WriteTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#122,WriteTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10021,WriteTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#122,WriteTask.RestoreTriggered() , eAxoMessageCategory#Info); IF WriteTask.RestoreTriggered() AND _progress >= 320 AND _progress <= 339 THEN Status.Action.Id := UINT#122; _progress := 0; @@ -761,7 +761,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Reset communication running: restoring tasks. IF _progress = 340 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#540, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#540, eAxoMessageCategory#Potential); Status.Error.Id := UINT#540; END_IF; @@ -778,7 +778,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Reset communication running: clearing data and flags. IF _progress = 341 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#541, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#541, eAxoMessageCategory#Potential); Status.Error.Id := UINT#541; END_IF; @@ -820,8 +820,8 @@ NAMESPACE AXOpen.Components.Balluff.Identification Status.Error.Id := UINT#10041; END_IF; Messenger.ActivateOnCondition(ULINT#10040,ResetCommunicationTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10041,ResetCommunicationTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#142,ResetCommunicationTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10041,ResetCommunicationTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#142,ResetCommunicationTask.RestoreTriggered() , eAxoMessageCategory#Info); IF ResetCommunicationTask.RestoreTriggered() AND _progress >= 340 AND _progress <= 349 THEN Status.Action.Id := UINT#142; _progress := 0; @@ -847,7 +847,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Reset reader running: clearing of the data and flags. IF _progress = 350 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#550, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#550, eAxoMessageCategory#Potential); Status.Error.Id := UINT#550; END_IF; @@ -872,7 +872,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Reset reader running: waiting for the device to be powered off. IF _progress = 351 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#551, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#551, eAxoMessageCategory#Potential); Status.Error.Id := UINT#551; END_IF; @@ -886,7 +886,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Reset reader running: waiting for the device to be powered on. IF _progress = 352 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#552, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#552, eAxoMessageCategory#Potential); Status.Error.Id := UINT#552; END_IF; @@ -920,8 +920,8 @@ NAMESPACE AXOpen.Components.Balluff.Identification Status.Error.Id := UINT#10051; END_IF; Messenger.ActivateOnCondition(ULINT#10050,ResetReaderTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10051,ResetReaderTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#152,ResetReaderTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10051,ResetReaderTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#152,ResetReaderTask.RestoreTriggered() , eAxoMessageCategory#Info); IF ResetReaderTask.RestoreTriggered() AND _progress >= 350 AND _progress <= 359 THEN Status.Action.Id := UINT#152; _progress := 0; @@ -945,7 +945,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write char to memory running: waiting for the presention of the tag. IF _progress = 360 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#560, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#560, eAxoMessageCategory#Potential); Status.Error.Id := UINT#560; END_IF; @@ -957,7 +957,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write char to memory running: processing the data to be sent. IF _progress = 361 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#561, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#561, eAxoMessageCategory#Potential); Status.Error.Id := UINT#561; END_IF; @@ -980,7 +980,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write char to memory: waiting for the job to be accepted. IF _progress = 362 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#562, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#562, eAxoMessageCategory#Potential); Status.Error.Id := UINT#562; END_IF; @@ -997,7 +997,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write char to memory: waiting for the job to be finished. IF _progress = 363 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#563, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#563, eAxoMessageCategory#Potential); Status.Error.Id := UINT#563; END_IF; @@ -1015,7 +1015,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write char to memory running: cleaning the header data. IF _progress = 366 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#566, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#566, eAxoMessageCategory#Potential); Status.Error.Id := UINT#566; END_IF; @@ -1031,7 +1031,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write char to memory running: cleaning the header data. IF _progress = 367 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#567, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#567, eAxoMessageCategory#Potential); Status.Error.Id := UINT#567; END_IF; @@ -1043,7 +1043,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification // Write char to memory running: cleaning the header data. IF _progress = 368 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#568, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#568, eAxoMessageCategory#Error); Status.Error.Id := UINT#568; END_IF; @@ -1078,8 +1078,8 @@ NAMESPACE AXOpen.Components.Balluff.Identification Status.Error.Id := UINT#10061; END_IF; Messenger.ActivateOnCondition(ULINT#10060,WriteCharToMemoryTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10061,WriteCharToMemoryTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#162,WriteCharToMemoryTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10061,WriteCharToMemoryTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#162,WriteCharToMemoryTask.RestoreTriggered() , eAxoMessageCategory#Info); IF WriteCharToMemoryTask.RestoreTriggered() AND _progress >= 360 AND _progress <= 369 THEN Status.Action.Id := UINT#162; _progress := 0; @@ -1129,7 +1129,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification returnValue := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwId_BISM),_data); IF returnValue > WORD#0 THEN - Messenger.Activate(UINT#1231, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1231, eAxoMessageCategory#Error); Status.Error.Id := UINT#1231; RETURN; END_IF; diff --git a/src/components.cognex.vision/app/apax.yml b/src/components.cognex.vision/app/apax.yml index 118067642..f35027e5c 100644 --- a/src/components.cognex.vision/app/apax.yml +++ b/src/components.cognex.vision/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.cognex.vision/ctrl/src/AxoDataman/v_6_0_0/AxoDataman.st b/src/components.cognex.vision/ctrl/src/AxoDataman/v_6_0_0/AxoDataman.st index 96109df2c..cf4b8d879 100644 --- a/src/components.cognex.vision/ctrl/src/AxoDataman/v_6_0_0/AxoDataman.st +++ b/src/components.cognex.vision/ctrl/src/AxoDataman/v_6_0_0/AxoDataman.st @@ -531,7 +531,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 //***********Update inputs ************** _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwIdAcquisitionStatus) ,_data_in); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1201, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1201, eAxoMessageCategory#Error); Status.Error.Id := UINT#1201; RETURN; END_IF; @@ -544,7 +544,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwIdResultsStatus) ,_data_in); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1202, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1202, eAxoMessageCategory#Error); Status.Error.Id := UINT#1202; RETURN; END_IF; @@ -557,7 +557,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwIdSoftEventControl) ,_data_in); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1203, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1203, eAxoMessageCategory#Error); Status.Error.Id := UINT#1203; RETURN; END_IF; @@ -573,7 +573,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwIdResultData) ,_data_in); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1204, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1204, eAxoMessageCategory#Error); Status.Error.Id := UINT#1204; RETURN; END_IF; @@ -585,7 +585,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _ResultDataSize = eAxoDataman_ResultDataSize#RESULT_DATA_246B); IF _invalidDataSize THEN - Messenger.Activate(UINT#1205, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1205, eAxoMessageCategory#Error); Status.Error.Id := UINT#1205; RETURN; END_IF; @@ -637,7 +637,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Clear reasult data running: reseting the result data. IF _progress = 300 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Potential); Status.Error.Id := UINT#500; END_IF; @@ -658,7 +658,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Clear reasult data running: reseting the result data. IF _progress = 301 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#501, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#501, eAxoMessageCategory#Potential); Status.Error.Id := UINT#501; END_IF; @@ -692,8 +692,8 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 Status.Error.Id := UINT#10001; END_IF; Messenger.ActivateOnCondition(ULINT#10000,ClearResultDataTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10001,ClearResultDataTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#102,ClearResultDataTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10001,ClearResultDataTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#102,ClearResultDataTask.RestoreTriggered() , eAxoMessageCategory#Info); IF ClearResultDataTask.RestoreTriggered() AND _progress >= 300 AND _progress <= 309 THEN Status.Action.Id := UINT#102; _progress := 0; @@ -721,7 +721,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Reading running: enabling triger. IF _progress = 310 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#510, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#510, eAxoMessageCategory#Potential); Status.Error.Id := UINT#510; END_IF; @@ -738,7 +738,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Reading running: waiting for the triger ready. IF _progress = 311 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#511, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#511, eAxoMessageCategory#Potential); Status.Error.Id := UINT#511; END_IF; @@ -750,7 +750,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Reading running: waiting for the triger acknowledged. IF _progress = 312 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#512, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#512, eAxoMessageCategory#Potential); Status.Error.Id := UINT#512; END_IF; @@ -764,7 +764,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Reading running: waiting for the results available. IF _progress = 313 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#513, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#513, eAxoMessageCategory#Potential); Status.Error.Id := UINT#513; END_IF; @@ -776,7 +776,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Reading running: evaluating the result data. IF _progress = 314 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#514, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#514, eAxoMessageCategory#Error); Status.Error.Id := UINT#514; END_IF; @@ -796,7 +796,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Reading running: processing the result data. IF _progress = 315 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#515, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#515, eAxoMessageCategory#Potential); Status.Error.Id := UINT#515; END_IF; @@ -812,7 +812,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Reading finished. IF _progress = 316 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#516, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#516, eAxoMessageCategory#Potential); Status.Error.Id := UINT#516; END_IF; @@ -825,7 +825,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Reading running: error detected, reseting trigger. IF _progress = 319 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#519, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#519, eAxoMessageCategory#Potential); Status.Error.Id := UINT#519; END_IF; @@ -841,7 +841,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Reading running: error detected, reseting error. IF _progress = 320 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#520, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#520, eAxoMessageCategory#Potential); Status.Error.Id := UINT#520; END_IF; @@ -854,7 +854,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Reading running: error detected, reseting error. IF _progress = 321 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Potential); Status.Error.Id := UINT#521; END_IF; @@ -882,8 +882,8 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 Status.Error.Id := UINT#10011; END_IF; Messenger.ActivateOnCondition(ULINT#10010,ReadTask.HasError(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#10011,ReadTask.IsAborted(), eAxoMessageCategory#Error); - Messenger.ActivateOnCondition(ULINT#112,ReadTask.RestoreTriggered() , eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10011,ReadTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#112,ReadTask.RestoreTriggered() , eAxoMessageCategory#Info); IF ReadTask.RestoreTriggered() AND _progress >= 300 AND _progress <= 329 THEN Status.Action.Id := UINT#112; _progress := 0; @@ -922,7 +922,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdSoftEventControl),_data_1); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1233, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1233, eAxoMessageCategory#Error); Status.Error.Id := UINT#1233; RETURN; END_IF; @@ -948,7 +948,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdUserData) ,_data_16); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1235, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1235, eAxoMessageCategory#Error); Status.Error.Id := UINT#1235; RETURN; END_IF; @@ -958,7 +958,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdUserData) ,_data_32); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1236, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1236, eAxoMessageCategory#Error); Status.Error.Id := UINT#1236; RETURN; END_IF; @@ -968,7 +968,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdUserData) ,_data_64); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1237, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1237, eAxoMessageCategory#Error); Status.Error.Id := UINT#1237; RETURN; END_IF; @@ -978,7 +978,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdUserData) ,_data_128); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1238, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1238, eAxoMessageCategory#Error); Status.Error.Id := UINT#1238; RETURN; END_IF; @@ -988,7 +988,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdUserData) ,_data_250); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1239, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1239, eAxoMessageCategory#Error); Status.Error.Id := UINT#1239; RETURN; END_IF; @@ -1110,7 +1110,3 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_CLASS END_NAMESPACE - - - - diff --git a/src/components.cognex.vision/ctrl/src/AxoInsight/v_24_0_0/AxoInsight.st b/src/components.cognex.vision/ctrl/src/AxoInsight/v_24_0_0/AxoInsight.st index 8813a0b9e..f7c44c0b7 100644 --- a/src/components.cognex.vision/ctrl/src/AxoInsight/v_24_0_0/AxoInsight.st +++ b/src/components.cognex.vision/ctrl/src/AxoInsight/v_24_0_0/AxoInsight.st @@ -980,7 +980,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 //***********Update inputs ************** _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HW_AcquisitionStatus),_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1201, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1201, eAxoMessageCategory#Error); Status.Error.Id := UINT#1201; RETURN; END_IF; @@ -999,7 +999,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HW_InspectionStatus),_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1202, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1202, eAxoMessageCategory#Error); Status.Error.Id := UINT#1202; RETURN; END_IF; @@ -1021,7 +1021,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HW_CommandControl), _data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1203, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1203, eAxoMessageCategory#Error); Status.Error.Id := UINT#1203; RETURN; END_IF; @@ -1031,7 +1031,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HW_SoftEventControl) ,_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1204, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1204, eAxoMessageCategory#Error); Status.Error.Id := UINT#1204; RETURN; END_IF; @@ -1047,7 +1047,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HW_ResultData_Slot_11) ,_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1205, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1205, eAxoMessageCategory#Error); Status.Error.Id := UINT#1205; RETURN; END_IF; @@ -1167,7 +1167,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Clearing of the inspection results running: reseting the inspection result buffer. IF _progress = 300 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Potential); Status.Error.Id := UINT#500; END_IF; @@ -1188,7 +1188,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Clearing of the inspection results running: waiting for the result data is cleared on device side. IF _progress = 301 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#501, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#501, eAxoMessageCategory#Potential); Status.Error.Id := UINT#501; END_IF; @@ -1246,7 +1246,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Trigger running: enabling trigger. IF _progress = 310 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#510, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#510, eAxoMessageCategory#Potential); Status.Error.Id := UINT#510; END_IF; @@ -1267,7 +1267,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Trigger running: waiting for the device to be ready. IF _progress = 311 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#511, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#511, eAxoMessageCategory#Potential); Status.Error.Id := UINT#511; END_IF; @@ -1280,7 +1280,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Trigger running: waiting for the previous data is cleared. IF _progress = 312 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#512, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#512, eAxoMessageCategory#Potential); Status.Error.Id := UINT#512; END_IF; @@ -1293,7 +1293,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Trigger running: waiting for the reseting the previous cycle error state. IF _progress = 313 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#513, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#513, eAxoMessageCategory#Potential); Status.Error.Id := UINT#513; END_IF; @@ -1306,7 +1306,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Trigger running: waiting for the device to be ready for the new inspection cycle. IF _progress = 314 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#514, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#514, eAxoMessageCategory#Potential); Status.Error.Id := UINT#514; END_IF; @@ -1319,7 +1319,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Trigger running: waiting for the trigger to be enabled. IF _progress = 315 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#515, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#515, eAxoMessageCategory#Potential); Status.Error.Id := UINT#515; END_IF; @@ -1332,7 +1332,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Trigger running: waiting for the inspection to be completed. IF _progress = 316 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#516, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#516, eAxoMessageCategory#Potential); Status.Error.Id := UINT#516; END_IF; @@ -1345,7 +1345,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Trigger running: waiting for the inspection to be valid. IF _progress = 317 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#517, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#517, eAxoMessageCategory#Potential); Status.Error.Id := UINT#517; END_IF; @@ -1357,7 +1357,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Trigger running: parsing the inspection results. IF _progress = 318 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#518, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#518, eAxoMessageCategory#Potential); Status.Error.Id := UINT#518; END_IF; _offset := UINT#4; @@ -1382,7 +1382,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _offset := _ResultDataSize_Slot_11; _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HW_ResultData_Slot_12) ,_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1207, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1207, eAxoMessageCategory#Error); Status.Error.Id := UINT#1207; RETURN; END_IF; @@ -1401,7 +1401,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _offset := _ResultDataSize_Slot_11 + _ResultDataSize_Slot_12; _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HW_ResultData_Slot_13) ,_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1209, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1209, eAxoMessageCategory#Error); Status.Error.Id := UINT#1209; RETURN; END_IF; @@ -1420,7 +1420,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _offset := _ResultDataSize_Slot_11 + _ResultDataSize_Slot_12 + _ResultDataSize_Slot_13; _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HW_ResultData_Slot_14) ,_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1211, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1211, eAxoMessageCategory#Error); Status.Error.Id := UINT#1211; RETURN; END_IF; @@ -1438,7 +1438,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Trigger finished. IF _progress = 319 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#519, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#519, eAxoMessageCategory#Potential); Status.Error.Id := UINT#519; END_IF; @@ -1505,7 +1505,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by name running: waiting for the previous action is finished. IF _progress = 321 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Potential); Status.Error.Id := UINT#521; END_IF; @@ -1520,7 +1520,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by name running: waiting for the device to be ready. IF _progress = 322 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#522, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#522, eAxoMessageCategory#Potential); Status.Error.Id := UINT#522; END_IF; @@ -1533,7 +1533,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by name running: reseting the error. IF _progress = 323 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#523, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#523, eAxoMessageCategory#Potential); Status.Error.Id := UINT#523; END_IF; @@ -1548,7 +1548,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by name running: filling the user data with the job name. IF _progress = 324 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#524, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#524, eAxoMessageCategory#Potential); Status.Error.Id := UINT#524; END_IF; @@ -1570,7 +1570,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by name running: writing the job name to the device. IF _progress = 325 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#525, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#525, eAxoMessageCategory#Potential); Status.Error.Id := UINT#525; END_IF; @@ -1589,7 +1589,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by name running: waiting for the job name is received. IF _progress = 326 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#526, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#526, eAxoMessageCategory#Potential); Status.Error.Id := UINT#526; END_IF; @@ -1606,7 +1606,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by name running: waiting for the command is completed. IF _progress = 327 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Potential); Status.Error.Id := UINT#527; END_IF; @@ -1624,7 +1624,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by name running: waiting for the command complete acknowledged. IF _progress = 328 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Potential); Status.Error.Id := UINT#528; END_IF; @@ -1639,7 +1639,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by name running: waiting for the device to be online. IF _progress = 329 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Potential); Status.Error.Id := UINT#529; END_IF; @@ -1725,7 +1725,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by number running: waiting for the previous action is finished. IF _progress = 341 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#541, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#541, eAxoMessageCategory#Potential); Status.Error.Id := UINT#541; END_IF; @@ -1740,7 +1740,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by number running: waiting for the device to be offline. IF _progress = 342 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#542, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#542, eAxoMessageCategory#Potential); Status.Error.Id := UINT#542; END_IF; @@ -1753,7 +1753,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by number running: reseting the error. IF _progress = 343 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#543, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#543, eAxoMessageCategory#Potential); Status.Error.Id := UINT#543; END_IF; @@ -1768,7 +1768,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by number runningg: waiting for the command is completed. IF _progress = 344 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#544, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#544, eAxoMessageCategory#Potential); Status.Error.Id := UINT#544; END_IF; @@ -1786,7 +1786,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by number running: waiting for the command complete acknowledged. IF _progress = 345 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#545, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#545, eAxoMessageCategory#Potential); Status.Error.Id := UINT#545; END_IF; @@ -1801,7 +1801,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // Change job by number running: waiting for the device to be online. IF _progress = 346 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#546, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#546, eAxoMessageCategory#Potential); Status.Error.Id := UINT#546; END_IF; @@ -1871,7 +1871,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 IF _progress = 350 THEN THIS.CallTimers(FALSE); IF _softEventNumber > UINT#7 THEN - TaskMessenger.Activate( UINT#550, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#550, eAxoMessageCategory#Potential); Status.Error.Id := UINT#550; SoftEventTask.ThrowWhen(TRUE); ELSE @@ -1881,7 +1881,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // SoftEvent running: checking the soft event number. IF _progress = 351 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#551, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#551, eAxoMessageCategory#Potential); Status.Error.Id := UINT#551; END_IF; _progress := 352; @@ -1889,7 +1889,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // SoftEvent running: waiting for the soft event is finished. IF _progress = 352 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#552, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#552, eAxoMessageCategory#Potential); Status.Error.Id := UINT#552; END_IF; @@ -1904,7 +1904,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // SoftEvent running: waiting for the soft event is acknowledged. IF _progress = 353 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#553, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#553, eAxoMessageCategory#Potential); Status.Error.Id := UINT#553; END_IF; @@ -1963,7 +1963,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // SendData running: filling the user data buffer. IF _progress = 360 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#560, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#560, eAxoMessageCategory#Potential); Status.Error.Id := UINT#560; END_IF; @@ -1979,7 +1979,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // SendData running: sending the user data to the device. IF _progress = 361 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#561, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#561, eAxoMessageCategory#Potential); Status.Error.Id := UINT#561; END_IF; @@ -1993,7 +1993,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 // SendData running: waiting for the user is acknowledged. IF _progress = 362 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#562, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#562, eAxoMessageCategory#Potential); Status.Error.Id := UINT#562; END_IF; @@ -2042,7 +2042,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_AcquisitionControl),_data_1); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1231, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1231, eAxoMessageCategory#Error); Status.Error.Id := UINT#1231; RETURN; END_IF; @@ -2055,7 +2055,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_InspectionControl),_data_1); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1232, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1232, eAxoMessageCategory#Error); Status.Error.Id := UINT#1232; RETURN; END_IF; @@ -2065,7 +2065,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_CommandControl),_data_2); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1233, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1233, eAxoMessageCategory#Error); Status.Error.Id := UINT#1233; RETURN; END_IF; @@ -2081,7 +2081,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_SoftEventControl),_data_1); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1234, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1234, eAxoMessageCategory#Error); Status.Error.Id := UINT#1234; RETURN; END_IF; @@ -2104,7 +2104,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_7) ,_data_16); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1236, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1236, eAxoMessageCategory#Error); Status.Error.Id := UINT#1236; RETURN; END_IF; @@ -2114,7 +2114,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_7) ,_data_32); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1237, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1237, eAxoMessageCategory#Error); Status.Error.Id := UINT#1237; RETURN; END_IF; @@ -2124,7 +2124,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_7) ,_data_64); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1238, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1238, eAxoMessageCategory#Error); Status.Error.Id := UINT#1238; RETURN; END_IF; @@ -2134,7 +2134,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_7) ,_data_128); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1239, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1239, eAxoMessageCategory#Error); Status.Error.Id := UINT#1239; RETURN; END_IF; @@ -2144,7 +2144,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_7) ,_data_254); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1240, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1240, eAxoMessageCategory#Error); Status.Error.Id := UINT#1240; RETURN; END_IF; @@ -2171,7 +2171,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_8) ,_data_16); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1242, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1242, eAxoMessageCategory#Error); Status.Error.Id := UINT#1242; RETURN; END_IF; @@ -2181,7 +2181,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_8) ,_data_32); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1243, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1243, eAxoMessageCategory#Error); Status.Error.Id := UINT#1243; RETURN; END_IF; @@ -2191,7 +2191,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_8) ,_data_64); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1244, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1244, eAxoMessageCategory#Error); Status.Error.Id := UINT#1244; RETURN; END_IF; @@ -2201,7 +2201,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_8) ,_data_128); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1245, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1245, eAxoMessageCategory#Error); Status.Error.Id := UINT#1245; RETURN; END_IF; @@ -2211,7 +2211,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_8) ,_data_254); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1246, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1246, eAxoMessageCategory#Error); Status.Error.Id := UINT#1246; RETURN; END_IF; @@ -2238,7 +2238,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_9) ,_data_16); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1248, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1248, eAxoMessageCategory#Error); Status.Error.Id := UINT#1248; RETURN; END_IF; @@ -2248,7 +2248,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_9) ,_data_32); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1249, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1249, eAxoMessageCategory#Error); Status.Error.Id := UINT#1249; RETURN; END_IF; @@ -2258,7 +2258,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_9) ,_data_64); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1250, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1250, eAxoMessageCategory#Error); Status.Error.Id := UINT#1250; RETURN; END_IF; @@ -2268,7 +2268,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_9) ,_data_128); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1251, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1251, eAxoMessageCategory#Error); Status.Error.Id := UINT#1251; RETURN; END_IF; @@ -2278,7 +2278,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_9) ,_data_254); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1252, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1252, eAxoMessageCategory#Error); Status.Error.Id := UINT#1252; RETURN; END_IF; @@ -2305,7 +2305,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_10) ,_data_16); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1254, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1254, eAxoMessageCategory#Error); Status.Error.Id := UINT#1254; RETURN; END_IF; @@ -2315,7 +2315,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_10) ,_data_32); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1255, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1255, eAxoMessageCategory#Error); Status.Error.Id := UINT#1255; RETURN; END_IF; @@ -2325,7 +2325,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_10) ,_data_64); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1256, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1256, eAxoMessageCategory#Error); Status.Error.Id := UINT#1256; RETURN; END_IF; @@ -2335,7 +2335,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_10) ,_data_128); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1257, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1257, eAxoMessageCategory#Error); Status.Error.Id := UINT#1257; RETURN; END_IF; @@ -2345,7 +2345,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HW_UserDataSlot_10) ,_data_254); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1258, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1258, eAxoMessageCategory#Error); Status.Error.Id := UINT#1258; RETURN; END_IF; diff --git a/src/components.cognex.vision/ctrl/src/AxoInsight/v_6_0_0/AxoInsight.st b/src/components.cognex.vision/ctrl/src/AxoInsight/v_6_0_0/AxoInsight.st index a922e956d..43a5dfeb7 100644 --- a/src/components.cognex.vision/ctrl/src/AxoInsight/v_6_0_0/AxoInsight.st +++ b/src/components.cognex.vision/ctrl/src/AxoInsight/v_6_0_0/AxoInsight.st @@ -635,7 +635,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 //***********Update inputs ************** _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwIdAcquisitionStatus) ,_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1201, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1201, eAxoMessageCategory#Error); Status.Error.Id := UINT#1201; RETURN; END_IF; @@ -654,7 +654,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwIdInspectionStatus) ,_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1202, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1202, eAxoMessageCategory#Error); Status.Error.Id := UINT#1202; RETURN; END_IF; @@ -676,7 +676,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwIdCommandControl) ,_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1203, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1203, eAxoMessageCategory#Error); Status.Error.Id := UINT#1203; RETURN; END_IF; @@ -686,7 +686,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwIdSoftEventControl) ,_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1204, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1204, eAxoMessageCategory#Error); Status.Error.Id := UINT#1204; RETURN; END_IF; @@ -703,7 +703,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwIdResultData) ,_data_255); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1205, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1205, eAxoMessageCategory#Error); Status.Error.Id := UINT#1205; RETURN; END_IF; @@ -715,7 +715,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _ResultDataSize = UINT#250 ); IF _invalidDataSize THEN - Messenger.Activate(UINT#1206, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1206, eAxoMessageCategory#Error); Status.Error.Id := UINT#1206; RETURN; END_IF; @@ -760,7 +760,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Clearing of the inspection results running: reseting the inspection result buffer. IF _progress = 300 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Potential); Status.Error.Id := UINT#500; END_IF; @@ -781,7 +781,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Clearing of the inspection results running: waiting for the result data is cleared on device side. IF _progress = 301 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#501, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#501, eAxoMessageCategory#Potential); Status.Error.Id := UINT#501; END_IF; @@ -840,7 +840,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Trigger running: enabling trigger. IF _progress = 310 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#510, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#510, eAxoMessageCategory#Potential); Status.Error.Id := UINT#510; END_IF; @@ -861,7 +861,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Trigger running: waiting for the device to be ready. IF _progress = 311 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#511, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#511, eAxoMessageCategory#Potential); Status.Error.Id := UINT#511; END_IF; @@ -874,7 +874,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Trigger running: waiting for the previous data is cleared. IF _progress = 312 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#512, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#512, eAxoMessageCategory#Potential); Status.Error.Id := UINT#512; END_IF; @@ -887,7 +887,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Trigger running: waiting for the reseting the previous cycle error state. IF _progress = 313 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#513, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#513, eAxoMessageCategory#Potential); Status.Error.Id := UINT#513; END_IF; @@ -900,7 +900,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Trigger running: waiting for the device to be ready for the new inspection cycle. IF _progress = 314 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#514, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#514, eAxoMessageCategory#Potential); Status.Error.Id := UINT#514; END_IF; @@ -913,7 +913,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Trigger running: waiting for the trigger to be enabled. IF _progress = 315 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#515, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#515, eAxoMessageCategory#Potential); Status.Error.Id := UINT#515; END_IF; @@ -926,7 +926,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Trigger running: waiting for the inspection to be completed. IF _progress = 316 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#516, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#516, eAxoMessageCategory#Potential); Status.Error.Id := UINT#516; END_IF; @@ -939,7 +939,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Trigger running: waiting for the inspection to be valid. IF _progress = 317 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#517, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#517, eAxoMessageCategory#Potential); Status.Error.Id := UINT#517; END_IF; @@ -951,7 +951,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Trigger running: parsing the inspection results. IF _progress = 318 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#518, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#518, eAxoMessageCategory#Potential); Status.Error.Id := UINT#518; END_IF; @@ -967,7 +967,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Trigger finished. IF _progress = 319 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#519, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#519, eAxoMessageCategory#Potential); Status.Error.Id := UINT#519; END_IF; @@ -1034,7 +1034,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by name running: waiting for the previous action is finished. IF _progress = 321 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Potential); Status.Error.Id := UINT#521; END_IF; @@ -1049,7 +1049,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by name running: waiting for the device to be ready. IF _progress = 322 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#522, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#522, eAxoMessageCategory#Potential); Status.Error.Id := UINT#522; END_IF; @@ -1062,7 +1062,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by name running: reseting the error. IF _progress = 323 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#523, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#523, eAxoMessageCategory#Potential); Status.Error.Id := UINT#523; END_IF; @@ -1077,7 +1077,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by name running: filling the user data with the job name. IF _progress = 324 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#524, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#524, eAxoMessageCategory#Potential); Status.Error.Id := UINT#524; END_IF; @@ -1099,7 +1099,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by name running: writing the job name to the device. IF _progress = 325 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#525, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#525, eAxoMessageCategory#Potential); Status.Error.Id := UINT#525; END_IF; @@ -1118,7 +1118,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by name running: waiting for the job name is received. IF _progress = 326 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#526, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#526, eAxoMessageCategory#Potential); Status.Error.Id := UINT#526; END_IF; @@ -1135,7 +1135,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by name running: waiting for the command is completed. IF _progress = 327 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Potential); Status.Error.Id := UINT#527; END_IF; @@ -1153,7 +1153,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by name running: waiting for the command complete acknowledged. IF _progress = 328 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Potential); Status.Error.Id := UINT#528; END_IF; @@ -1168,7 +1168,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by name running: waiting for the device to be online. IF _progress = 329 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Potential); Status.Error.Id := UINT#529; END_IF; @@ -1254,7 +1254,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by number running: waiting for the previous action is finished. IF _progress = 341 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#541, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#541, eAxoMessageCategory#Potential); Status.Error.Id := UINT#541; END_IF; @@ -1269,7 +1269,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by number running: waiting for the device to be offline. IF _progress = 342 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#542, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#542, eAxoMessageCategory#Potential); Status.Error.Id := UINT#542; END_IF; @@ -1282,7 +1282,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by number running: reseting the error. IF _progress = 343 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#543, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#543, eAxoMessageCategory#Potential); Status.Error.Id := UINT#543; END_IF; @@ -1297,7 +1297,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by number runningg: waiting for the command is completed. IF _progress = 344 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#544, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#544, eAxoMessageCategory#Potential); Status.Error.Id := UINT#544; END_IF; @@ -1315,7 +1315,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by number running: waiting for the command complete acknowledged. IF _progress = 345 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#545, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#545, eAxoMessageCategory#Potential); Status.Error.Id := UINT#545; END_IF; @@ -1330,7 +1330,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // Change job by number running: waiting for the device to be online. IF _progress = 346 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#546, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#546, eAxoMessageCategory#Potential); Status.Error.Id := UINT#546; END_IF; @@ -1400,7 +1400,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 IF _progress = 350 THEN THIS.CallTimers(FALSE); IF _softEventNumber > UINT#7 THEN - TaskMessenger.Activate( UINT#550, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#550, eAxoMessageCategory#Potential); Status.Error.Id := UINT#550; SoftEventTask.ThrowWhen(TRUE); ELSE @@ -1410,7 +1410,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // SoftEvent running: checking the soft event number. IF _progress = 351 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#551, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#551, eAxoMessageCategory#Potential); Status.Error.Id := UINT#551; END_IF; _progress := 352; @@ -1418,7 +1418,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // SoftEvent running: waiting for the soft event is finished. IF _progress = 352 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#552, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#552, eAxoMessageCategory#Potential); Status.Error.Id := UINT#552; END_IF; @@ -1433,7 +1433,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // SoftEvent running: waiting for the soft event is acknowledged. IF _progress = 353 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#553, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#553, eAxoMessageCategory#Potential); Status.Error.Id := UINT#553; END_IF; @@ -1492,7 +1492,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // SendData running: filling the user data buffer. IF _progress = 360 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#560, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#560, eAxoMessageCategory#Potential); Status.Error.Id := UINT#560; END_IF; @@ -1508,7 +1508,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // SendData running: sending the user data to the device. IF _progress = 361 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#561, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#561, eAxoMessageCategory#Potential); Status.Error.Id := UINT#561; END_IF; @@ -1522,7 +1522,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 // SendData running: waiting for the user is acknowledged. IF _progress = 362 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#562, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#562, eAxoMessageCategory#Potential); Status.Error.Id := UINT#562; END_IF; @@ -1571,7 +1571,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdAcquisitionControl),_data_1); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1231, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1231, eAxoMessageCategory#Error); Status.Error.Id := UINT#1231; RETURN; END_IF; @@ -1584,7 +1584,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdInspectionControl),_data_1); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1232, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1232, eAxoMessageCategory#Error); Status.Error.Id := UINT#1232; RETURN; END_IF; @@ -1594,7 +1594,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdCommandControl),_data_2); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1233, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1233, eAxoMessageCategory#Error); Status.Error.Id := UINT#1233; RETURN; END_IF; @@ -1610,7 +1610,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdSoftEventControl),_data_1); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1234, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1234, eAxoMessageCategory#Error); Status.Error.Id := UINT#1234; RETURN; END_IF; @@ -1622,7 +1622,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 _UserDataSize = UINT#254 ); IF _invalidDataSize THEN - Messenger.Activate(UINT#1235, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1235, eAxoMessageCategory#Error); Status.Error.Id := UINT#1235; RETURN; END_IF; @@ -1636,7 +1636,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdUserData) ,_data_16); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1236, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1236, eAxoMessageCategory#Error); Status.Error.Id := UINT#1236; RETURN; END_IF; @@ -1646,7 +1646,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdUserData) ,_data_32); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1237, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1237, eAxoMessageCategory#Error); Status.Error.Id := UINT#1237; RETURN; END_IF; @@ -1656,7 +1656,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdUserData) ,_data_64); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1238, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1238, eAxoMessageCategory#Error); Status.Error.Id := UINT#1238; RETURN; END_IF; @@ -1666,7 +1666,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdUserData) ,_data_128); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1239, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1239, eAxoMessageCategory#Error); Status.Error.Id := UINT#1239; RETURN; END_IF; @@ -1676,7 +1676,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 END_FOR; _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwIdUserData) ,_data_254); IF _retVal > WORD#0 THEN - Messenger.Activate(UINT#1240, eAxoMessageCategory#ProgrammingError); + Messenger.Activate(UINT#1240, eAxoMessageCategory#Error); Status.Error.Id := UINT#1240; RETURN; END_IF; diff --git a/src/components.cognex.vision/ctrl/src/AxoVisionPro/AxoVisionPro.st b/src/components.cognex.vision/ctrl/src/AxoVisionPro/AxoVisionPro.st index c7c524654..00d720577 100644 --- a/src/components.cognex.vision/ctrl/src/AxoVisionPro/AxoVisionPro.st +++ b/src/components.cognex.vision/ctrl/src/AxoVisionPro/AxoVisionPro.st @@ -1093,7 +1093,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // HardResetAllCamerasTask running: waiting for the job id set. IF _progress = 300 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Potential); Status.Error.Id := UINT#500; END_IF; @@ -1133,7 +1133,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // HardResetAllCamerasTask running: waiting for the job id cleared. IF _progress = 301 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#501, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#501, eAxoMessageCategory#Potential); Status.Error.Id := UINT#501; END_IF; @@ -1194,7 +1194,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ResetTask running: checking if the data buffer is free. IF _progress = 310 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#510, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#510, eAxoMessageCategory#Potential); Status.Error.Id := UINT#510; END_IF; @@ -1217,7 +1217,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ResetTask running: writing the user data. IF _progress = 311 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#511, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#511, eAxoMessageCategory#Potential); Status.Error.Id := UINT#511; END_IF; @@ -1236,7 +1236,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ResetTask running: checking if the data buffer is free. IF _progress = 312 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#512, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#512, eAxoMessageCategory#Potential); Status.Error.Id := UINT#512; END_IF; @@ -1251,7 +1251,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ResetTask running: releasing the data buffer. IF _progress = 313 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#513, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#513, eAxoMessageCategory#Potential); Status.Error.Id := UINT#513; END_IF; @@ -1318,7 +1318,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TriggerTask running: waiting for the system to be ready. IF _progress = 320 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#520, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#520, eAxoMessageCategory#Potential); Status.Error.Id := UINT#520; END_IF; @@ -1334,7 +1334,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TriggerTask running: waiting for the system to be online. IF _progress = 321 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Potential); Status.Error.Id := UINT#521; END_IF; @@ -1346,7 +1346,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TriggerTask running: reseting camera before trigger started. IF _progress = 322 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#522, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#522, eAxoMessageCategory#Potential); Status.Error.Id := UINT#522; END_IF; @@ -1361,7 +1361,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TriggerTask running: reseting the trigger. IF _progress = 323 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#523, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#523, eAxoMessageCategory#Potential); Status.Error.Id := UINT#523; END_IF; @@ -1374,7 +1374,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TriggerTask running: setting the trigger and waiting for acknowledgement. IF _progress = 324 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#524, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#524, eAxoMessageCategory#Potential); Status.Error.Id := UINT#524; END_IF; @@ -1387,7 +1387,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TriggerTask running: resetting the trigger and waiting for acknowledgment to fall. IF _progress = 325 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#525, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#525, eAxoMessageCategory#Potential); Status.Error.Id := UINT#525; END_IF; @@ -1444,7 +1444,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: waiting for the system to be ready. IF _progress = 360 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#560, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#560, eAxoMessageCategory#Potential); Status.Error.Id := UINT#560; END_IF; @@ -1456,7 +1456,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: waiting for the system to be online. IF _progress = 361 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#561, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#561, eAxoMessageCategory#Potential); Status.Error.Id := UINT#561; END_IF; @@ -1468,7 +1468,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: checking the correct JobId. IF _progress = 362 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#562, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#562, eAxoMessageCategory#Potential); Status.Error.Id := UINT#562; END_IF; @@ -1480,7 +1480,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: waiting for the data buffer is free. IF _progress = 363 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#563, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#563, eAxoMessageCategory#Potential); Status.Error.Id := UINT#563; END_IF; @@ -1500,7 +1500,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: locking the data buffer. IF _progress = 364 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#564, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#564, eAxoMessageCategory#Potential); Status.Error.Id := UINT#564; END_IF; @@ -1512,7 +1512,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: setting the user data. IF _progress = 365 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#565, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#565, eAxoMessageCategory#Potential); Status.Error.Id := UINT#565; END_IF; @@ -1530,7 +1530,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: waiting for the results to be valid. IF _progress = 366 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#566, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#566, eAxoMessageCategory#Potential); Status.Error.Id := UINT#566; END_IF; @@ -1542,7 +1542,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: calculating the size of the data. IF _progress = 367 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#567, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#567, eAxoMessageCategory#Potential); Status.Error.Id := UINT#567; END_IF; Inputs.Status.ReadedDataVariantSize := _readResultsLength; @@ -1554,7 +1554,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: copying the data from hardware to the buffer. IF _progress = 369 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#569, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#569, eAxoMessageCategory#Potential); Status.Error.Id := UINT#569; END_IF; @@ -1714,7 +1714,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: reading the data. IF _progress = 370 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#570, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#570, eAxoMessageCategory#Potential); Status.Error.Id := UINT#570; END_IF; @@ -1726,7 +1726,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: acknowledging the result data. IF _progress = 371 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#571, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#571, eAxoMessageCategory#Potential); Status.Error.Id := UINT#571; END_IF; @@ -1744,7 +1744,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: reseting the job load Id. IF _progress = 372 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#572, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#572, eAxoMessageCategory#Potential); Status.Error.Id := UINT#572; END_IF; @@ -1760,7 +1760,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // ReadResultsTask running: loading the job. IF _progress = 373 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#573, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#573, eAxoMessageCategory#Potential); Status.Error.Id := UINT#573; END_IF; @@ -1823,7 +1823,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: waiting for the system to be ready. IF _progress = 380 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#580, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#580, eAxoMessageCategory#Potential); Status.Error.Id := UINT#580; END_IF; //Userdata buffer sa plnia prve 4 bajty informacne, data su od 4 a viac. @@ -1840,7 +1840,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: waiting for the system to be online. IF _progress = 381 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#581, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#581, eAxoMessageCategory#Potential); Status.Error.Id := UINT#581; END_IF; @@ -1852,7 +1852,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: waiting for the data buffer is free. IF _progress = 382 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#582, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#582, eAxoMessageCategory#Potential); Status.Error.Id := UINT#582; END_IF; // PLC nastavi na User Data ID inspekcie, ID operacie a User Data (cislo jobu, seriove cislo kusu, tolerancie). @@ -1868,7 +1868,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: locking the data buffer. IF _progress = 383 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#583, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#583, eAxoMessageCategory#Potential); Status.Error.Id := UINT#583; END_IF; @@ -1885,7 +1885,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: setting the length of the data to sent. IF _progress = 384 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#584, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#584, eAxoMessageCategory#Potential); Status.Error.Id := UINT#584; END_IF; @@ -1898,7 +1898,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: filling the user data to be sent. IF _progress = 386 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#586, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#586, eAxoMessageCategory#Potential); Status.Error.Id := UINT#586; END_IF; IF _sendDataLength = UINT#0 THEN @@ -2130,7 +2130,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: waiting for falling of the set user data acknowledge. IF _progress = 387 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#587, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#587, eAxoMessageCategory#Potential); Status.Error.Id := UINT#587; END_IF; @@ -2143,7 +2143,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: waiting for the confirmation of the user data. IF _progress = 388 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#588, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#588, eAxoMessageCategory#Potential); Status.Error.Id := UINT#588; END_IF; @@ -2156,7 +2156,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: waiting for falling of the set user data acknowledge. IF _progress = 389 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#589, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#589, eAxoMessageCategory#Potential); Status.Error.Id := UINT#589; END_IF; @@ -2168,7 +2168,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: waiting for falling of the set user data acknowledge. IF _progress = 390 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#590, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#590, eAxoMessageCategory#Potential); Status.Error.Id := UINT#590; END_IF; @@ -2184,7 +2184,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: data handler set. IF _progress = 391 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#591, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#591, eAxoMessageCategory#Potential); Status.Error.Id := UINT#591; END_IF; @@ -2197,7 +2197,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: waiting for data handler ack. IF _progress = 392 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#592, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#592, eAxoMessageCategory#Potential); Status.Error.Id := UINT#592; END_IF; @@ -2210,7 +2210,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // SendDataTask running: waiting for data handler ack false. IF _progress = 393 THEN IF _infoTimer.output THEN - TaskMessenger.Activate( UINT#593, eAxoMessageCategory#Warning); + TaskMessenger.Activate( UINT#593, eAxoMessageCategory#Potential); Status.Error.Id := UINT#593; END_IF; diff --git a/src/components.desoutter.tightening/app/apax.yml b/src/components.desoutter.tightening/app/apax.yml index e037ea932..5f1a32c6d 100644 --- a/src/components.desoutter.tightening/app/apax.yml +++ b/src/components.desoutter.tightening/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.drives/app/apax.yml b/src/components.drives/app/apax.yml index 530d0e793..3accdf967 100644 --- a/src/components.drives/app/apax.yml +++ b/src/components.drives/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.dukane.welders/app/apax.yml b/src/components.dukane.welders/app/apax.yml index 535e89100..93e8cde55 100644 --- a/src/components.dukane.welders/app/apax.yml +++ b/src/components.dukane.welders/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.elements/app/apax.yml b/src/components.elements/app/apax.yml index 27c03e844..a0c198d93 100644 --- a/src/components.elements/app/apax.yml +++ b/src/components.elements/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.festo.drives/app/apax.yml b/src/components.festo.drives/app/apax.yml index 54907c024..7654f9cc5 100644 --- a/src/components.festo.drives/app/apax.yml +++ b/src/components.festo.drives/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.keyence.vision/app/apax.yml b/src/components.keyence.vision/app/apax.yml index 4fe4042c4..db3d07d1c 100644 --- a/src/components.keyence.vision/app/apax.yml +++ b/src/components.keyence.vision/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.kuka.robotics/app/apax.yml b/src/components.kuka.robotics/app/apax.yml index 6a84bc454..389d5d260 100644 --- a/src/components.kuka.robotics/app/apax.yml +++ b/src/components.kuka.robotics/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.mitsubishi.robotics/app/apax.yml b/src/components.mitsubishi.robotics/app/apax.yml index 2ff590628..ce4c09412 100644 --- a/src/components.mitsubishi.robotics/app/apax.yml +++ b/src/components.mitsubishi.robotics/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.pneumatics/app/apax.yml b/src/components.pneumatics/app/apax.yml index 1f321f11f..9261b3d4d 100644 --- a/src/components.pneumatics/app/apax.yml +++ b/src/components.pneumatics/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.rexroth.drives/app/apax.yml b/src/components.rexroth.drives/app/apax.yml index 6e39ce80d..ad5062941 100644 --- a/src/components.rexroth.drives/app/apax.yml +++ b/src/components.rexroth.drives/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.rexroth.press/app/apax.yml b/src/components.rexroth.press/app/apax.yml index be0bac678..ff0370410 100644 --- a/src/components.rexroth.press/app/apax.yml +++ b/src/components.rexroth.press/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.rexroth.tightening/app/apax.yml b/src/components.rexroth.tightening/app/apax.yml index 4af8f23cd..6912f0cb1 100644 --- a/src/components.rexroth.tightening/app/apax.yml +++ b/src/components.rexroth.tightening/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.robotics/app/apax.yml b/src/components.robotics/app/apax.yml index 86fe6984d..e40959fe2 100644 --- a/src/components.robotics/app/apax.yml +++ b/src/components.robotics/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.siem.communication/app/apax.yml b/src/components.siem.communication/app/apax.yml index 74a8c5937..9edb502ec 100644 --- a/src/components.siem.communication/app/apax.yml +++ b/src/components.siem.communication/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.siem.identification/app/apax.yml b/src/components.siem.identification/app/apax.yml index 9e1e8d982..62965bd84 100644 --- a/src/components.siem.identification/app/apax.yml +++ b/src/components.siem.identification/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.ur.robotics/app/apax.yml b/src/components.ur.robotics/app/apax.yml index 9474d0707..a45fd5a50 100644 --- a/src/components.ur.robotics/app/apax.yml +++ b/src/components.ur.robotics/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/components.zebra.vision/app/apax.yml b/src/components.zebra.vision/app/apax.yml index 2592106dc..b223509c3 100644 --- a/src/components.zebra.vision/app/apax.yml +++ b/src/components.zebra.vision/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/core/app/apax.yml b/src/core/app/apax.yml index a281027c7..b00b0e0a8 100644 --- a/src/core/app/apax.yml +++ b/src/core/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/data/app/apax.yml b/src/data/app/apax.yml index 850a9ca45..59e2064d1 100644 --- a/src/data/app/apax.yml +++ b/src/data/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/data/tests/AXOpen.Data.Tests_L1/ax/apax.yml b/src/data/tests/AXOpen.Data.Tests_L1/ax/apax.yml index 2e0ffba7e..5ea0626cc 100644 --- a/src/data/tests/AXOpen.Data.Tests_L1/ax/apax.yml +++ b/src/data/tests/AXOpen.Data.Tests_L1/ax/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/data/tests/AXOpen.Repository.Integration.Tests_L4/ax/apax.yml b/src/data/tests/AXOpen.Repository.Integration.Tests_L4/ax/apax.yml index 6bd83093e..0ce1322ea 100644 --- a/src/data/tests/AXOpen.Repository.Integration.Tests_L4/ax/apax.yml +++ b/src/data/tests/AXOpen.Repository.Integration.Tests_L4/ax/apax.yml @@ -135,12 +135,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/inspectors/app/apax.yml b/src/inspectors/app/apax.yml index 20302486a..c90ca9925 100644 --- a/src/inspectors/app/apax.yml +++ b/src/inspectors/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/integrations/app/apax.yml b/src/integrations/app/apax.yml index f46c2146f..74db49553 100644 --- a/src/integrations/app/apax.yml +++ b/src/integrations/app/apax.yml @@ -138,12 +138,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/io/app/apax.yml b/src/io/app/apax.yml index 45a3d1f2a..25763a214 100644 --- a/src/io/app/apax.yml +++ b/src/io/app/apax.yml @@ -14,7 +14,7 @@ variables: AXTARGETPLATFORMINPUT: .\bin\1500\ AX_USERNAME: "admin" AX_TARGET_PWD: "Qwerty123456+" - USE_PLC_SIM_ADVANCED: "false" + USE_PLC_SIM_ADVANCED: "true" # <= Do not commit any changes to the following variables. You may modify them locally, but committing the changes will mess up the nightly build. registries: "@inxton": "https://npm.pkg.github.com/" diff --git a/src/probers/app/apax.yml b/src/probers/app/apax.yml index 476f22f25..df3a0badd 100644 --- a/src/probers/app/apax.yml +++ b/src/probers/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/simatic1500/app/apax.yml b/src/simatic1500/app/apax.yml index 2bcbf44c7..4c1a8af59 100644 --- a/src/simatic1500/app/apax.yml +++ b/src/simatic1500/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/template.axolibrary/app/apax.yml b/src/template.axolibrary/app/apax.yml index e5b5628a3..7f7a0731f 100644 --- a/src/template.axolibrary/app/apax.yml +++ b/src/template.axolibrary/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/timers/app/apax.yml b/src/timers/app/apax.yml index 47a90fbbc..4124c1cd0 100644 --- a/src/timers/app/apax.yml +++ b/src/timers/app/apax.yml @@ -136,12 +136,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install diff --git a/src/utils/app/apax.yml b/src/utils/app/apax.yml index 181b538ad..1186ed480 100644 --- a/src/utils/app/apax.yml +++ b/src/utils/app/apax.yml @@ -137,12 +137,20 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax swddo' Finished in :" $(expr $(date +%s) - $START) "s" alf: | #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw (apax plcsim & apax clean & apax install & apax clean_plc & apax ssc & apax hwfd & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all_first.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install