diff --git a/.gitattributes b/.gitattributes index 03b6f4958..bd9998623 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,6 +15,7 @@ *.css text eol=lf *.cs text eol=lf *.ps1 text eol=lf +*.sln text eol=lf # Windows-native scripts that often *must* be CRLF in the working tree diff --git a/src/abstractions/app/apax.yml b/src/abstractions/app/apax.yml index 517011354..79ecb57ea 100644 --- a/src/abstractions/app/apax.yml +++ b/src/abstractions/app/apax.yml @@ -1,4 +1,4 @@ -name: "abstractions-app" +name: "abstractions-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.abb.robotics/app/apax.yml b/src/components.abb.robotics/app/apax.yml index ff35edf0e..5d904b68a 100644 --- a/src/components.abb.robotics/app/apax.yml +++ b/src/components.abb.robotics/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.abb.robotics" +name: "app_axopen.components.abb.robotics" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.abstractions/app/apax.yml b/src/components.abstractions/app/apax.yml index 6bddc5cdc..635e669e8 100644 --- a/src/components.abstractions/app/apax.yml +++ b/src/components.abstractions/app/apax.yml @@ -1,4 +1,4 @@ -name: "components.abstractions-app" +name: "components.abstractions-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.balluff.identification/app/apax.yml b/src/components.balluff.identification/app/apax.yml index 7978bae7d..204ee7787 100644 --- a/src/components.balluff.identification/app/apax.yml +++ b/src/components.balluff.identification/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.balluff.identification" +name: "app_axopen.components.balluff.identification" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.cognex.vision/app/apax.yml b/src/components.cognex.vision/app/apax.yml index 118067642..78873d8c2 100644 --- a/src/components.cognex.vision/app/apax.yml +++ b/src/components.cognex.vision/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.cognex.vision" +name: "app_axopen.components.cognex.vision" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.desoutter.tightening/app/apax.yml b/src/components.desoutter.tightening/app/apax.yml index e037ea932..1f72b246b 100644 --- a/src/components.desoutter.tightening/app/apax.yml +++ b/src/components.desoutter.tightening/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.desoutter.tightening" +name: "app_axopen.components.desoutter.tightening" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.drives/app/apax.yml b/src/components.drives/app/apax.yml index 530d0e793..0fda3e96f 100644 --- a/src/components.drives/app/apax.yml +++ b/src/components.drives/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.drives" +name: "app_axopen.components.drives" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.dukane.welders/app/apax.yml b/src/components.dukane.welders/app/apax.yml index 535e89100..6e3fd9a3c 100644 --- a/src/components.dukane.welders/app/apax.yml +++ b/src/components.dukane.welders/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.dukane.welders" +name: "app_axopen.components.dukane.welders" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.elements/app/apax.yml b/src/components.elements/app/apax.yml index 27c03e844..2be314e4d 100644 --- a/src/components.elements/app/apax.yml +++ b/src/components.elements/app/apax.yml @@ -1,4 +1,4 @@ -name: "elementscomponents" +name: "elementscomponents" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.festo.drives/app/apax.yml b/src/components.festo.drives/app/apax.yml index 54907c024..6bf1e6725 100644 --- a/src/components.festo.drives/app/apax.yml +++ b/src/components.festo.drives/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.festo.drives" +name: "app_axopen.components.festo.drives" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.keyence.vision/app/apax.yml b/src/components.keyence.vision/app/apax.yml index 4fe4042c4..1c212eda8 100644 --- a/src/components.keyence.vision/app/apax.yml +++ b/src/components.keyence.vision/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.keyence.vision" +name: "app_axopen.components.keyence.vision" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.kuka.robotics/app/apax.yml b/src/components.kuka.robotics/app/apax.yml index 6a84bc454..5c93a59c6 100644 --- a/src/components.kuka.robotics/app/apax.yml +++ b/src/components.kuka.robotics/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.kuka.robotics" +name: "app_axopen.components.kuka.robotics" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.mitsubishi.robotics/app/apax.yml b/src/components.mitsubishi.robotics/app/apax.yml index 2ff590628..395654fba 100644 --- a/src/components.mitsubishi.robotics/app/apax.yml +++ b/src/components.mitsubishi.robotics/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.mitsubishi.robotics" +name: "app_axopen.components.mitsubishi.robotics" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.pneumatics/app/apax.yml b/src/components.pneumatics/app/apax.yml index 1f321f11f..4718028ef 100644 --- a/src/components.pneumatics/app/apax.yml +++ b/src/components.pneumatics/app/apax.yml @@ -1,4 +1,4 @@ -name: "pneumaticcomponents" +name: "pneumaticcomponents" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESEmptySlot.hwl.yml b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESEmptySlot.hwl.yml index 66a6315b0..2c6a82518 100644 --- a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESEmptySlot.hwl.yml +++ b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESEmptySlot.hwl.yml @@ -3,24 +3,7 @@ Templates: - Name: 'AventicsPneumaticsAESEmptySlot' Placeholders: - Name: 'NAME' - Value: 'Slot_1' - AllowedValues: - - 'Slot_1' - - 'Slot_2' - - 'Slot_3' - - 'Slot_4' - - 'Slot_5' - - 'Slot_6' - - 'Slot_7' - - 'Slot_8' - - 'Slot_9' - - 'Slot_10' - - 'Slot_11' - - 'Slot_12' - - 'Slot_13' - - 'Slot_14' - - 'Slot_15' - - 'Slot_16' + Optional: TRUE - Name: 'SLOT' Value: 1 AllowedValues: @@ -41,9 +24,5 @@ Templates: - 15 - 16 Content: - Name: '${NAME}' - TypeIdentifier: - FileName: 'GSDML-V2.34-AVENTICS-02B5-AES2-20240707.XML' - GsdId: 'IDM_0' + TypeIdentifier: NotAssigned Slot: ${SLOT} - diff --git a/src/components.rexroth.drives/app/apax.yml b/src/components.rexroth.drives/app/apax.yml index 6e39ce80d..67477f5bb 100644 --- a/src/components.rexroth.drives/app/apax.yml +++ b/src/components.rexroth.drives/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.rexroth.drives" +name: "app_axopen.components.rexroth.drives" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.rexroth.press/app/apax.yml b/src/components.rexroth.press/app/apax.yml index be0bac678..3f4a94726 100644 --- a/src/components.rexroth.press/app/apax.yml +++ b/src/components.rexroth.press/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.rexroth.press" +name: "app_axopen.components.rexroth.press" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.rexroth.tightening/app/apax.yml b/src/components.rexroth.tightening/app/apax.yml index 4af8f23cd..ed745f843 100644 --- a/src/components.rexroth.tightening/app/apax.yml +++ b/src/components.rexroth.tightening/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.rexroth.tightening" +name: "app_axopen.components.rexroth.tightening" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.robotics/app/apax.yml b/src/components.robotics/app/apax.yml index 86fe6984d..c7dfb2d45 100644 --- a/src/components.robotics/app/apax.yml +++ b/src/components.robotics/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.robotics" +name: "app_axopen.components.robotics" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.siem.communication/app/apax.yml b/src/components.siem.communication/app/apax.yml index 74a8c5937..34b62df26 100644 --- a/src/components.siem.communication/app/apax.yml +++ b/src/components.siem.communication/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.siem.communication" +name: "app_axopen.components.siem.communication" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.siem.identification/app/apax.yml b/src/components.siem.identification/app/apax.yml index 9e1e8d982..091f8eb87 100644 --- a/src/components.siem.identification/app/apax.yml +++ b/src/components.siem.identification/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.siem.identification" +name: "app_axopen.components.siem.identification" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.ur.robotics/app/apax.yml b/src/components.ur.robotics/app/apax.yml index 9474d0707..7cb81c446 100644 --- a/src/components.ur.robotics/app/apax.yml +++ b/src/components.ur.robotics/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.ur.robotics" +name: "app_axopen.components.ur.robotics" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.zebra.vision/app/apax.yml b/src/components.zebra.vision/app/apax.yml index 2592106dc..b96e6907b 100644 --- a/src/components.zebra.vision/app/apax.yml +++ b/src/components.zebra.vision/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.zebra.vision" +name: "app_axopen.components.zebra.vision" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/core/Core.sln b/src/core/Core.sln index c6d1424f7..d1a428804 100644 --- a/src/core/Core.sln +++ b/src/core/Core.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{41C85C70-C257-446F-BB74-7E4E47AD8F3F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{D893A4FB-6364-4919-9A0A-DB176AAD051D}" @@ -31,6 +31,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Secur EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{E83AFBE7-2988-43C2-A453-55E94878C2E4}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{A45F7042-0D12-4B3A-AE07-723C4061C754}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{4184F228-E499-4282-B5A1-4376A6A2F8B0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.ToolBox", "..\toolbox\src\AXOpen.ToolBox\AXOpen.ToolBox.csproj", "{61C92912-711A-4417-9E5A-504420F47EBC}" @@ -101,6 +103,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{426B3BA4-AA2B-44AC-98A9-4E2B826D073E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{501B0833-4B76-40B9-94A8-657CCE4109DE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{740EA12E-CB94-446C-9F94-1933C8A95B2B}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{74599743-E341-4D59-9541-122C4996A6C9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\timers\src", "{FA557D42-4EE1-4808-BEAC-FAF9F7B31F49}" @@ -183,6 +189,10 @@ Global {E83AFBE7-2988-43C2-A453-55E94878C2E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {E83AFBE7-2988-43C2-A453-55E94878C2E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {E83AFBE7-2988-43C2-A453-55E94878C2E4}.Release|Any CPU.Build.0 = Release|Any CPU + {A45F7042-0D12-4B3A-AE07-723C4061C754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A45F7042-0D12-4B3A-AE07-723C4061C754}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A45F7042-0D12-4B3A-AE07-723C4061C754}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A45F7042-0D12-4B3A-AE07-723C4061C754}.Release|Any CPU.Build.0 = Release|Any CPU {4184F228-E499-4282-B5A1-4376A6A2F8B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4184F228-E499-4282-B5A1-4376A6A2F8B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {4184F228-E499-4282-B5A1-4376A6A2F8B0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -237,6 +247,8 @@ Global {E83AFBE7-2988-43C2-A453-55E94878C2E4} = {DF1ADDD7-EF90-4986-A236-38D6D197F1FA} {DF1ADDD7-EF90-4986-A236-38D6D197F1FA} = {C5810367-1907-4BDD-87FE-D3168A847425} {C5810367-1907-4BDD-87FE-D3168A847425} = {426B3BA4-AA2B-44AC-98A9-4E2B826D073E} + {A45F7042-0D12-4B3A-AE07-723C4061C754} = {501B0833-4B76-40B9-94A8-657CCE4109DE} + {501B0833-4B76-40B9-94A8-657CCE4109DE} = {740EA12E-CB94-446C-9F94-1933C8A95B2B} {4184F228-E499-4282-B5A1-4376A6A2F8B0} = {74599743-E341-4D59-9541-122C4996A6C9} {74599743-E341-4D59-9541-122C4996A6C9} = {FA557D42-4EE1-4808-BEAC-FAF9F7B31F49} {FA557D42-4EE1-4808-BEAC-FAF9F7B31F49} = {C1D57900-BC9C-4B3A-80B7-940E47132883} diff --git a/src/core/app/apax.yml b/src/core/app/apax.yml index a281027c7..a3ffe99b7 100644 --- a/src/core/app/apax.yml +++ b/src/core/app/apax.yml @@ -1,4 +1,4 @@ -name: "ix_axopencore" +name: "ix_axopencore" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/core/app/hwc/hwc.gen/plc_line.HardwareIdentifiers.json b/src/core/app/hwc/hwc.gen/plc_line.HardwareIdentifiers.json new file mode 100644 index 000000000..33456e909 --- /dev/null +++ b/src/core/app/hwc/hwc.gen/plc_line.HardwareIdentifiers.json @@ -0,0 +1,61 @@ +{ + "Version": 1, + "HardwareIdentifiers": [ + { + "Name": "plc_line", + "Value": 32 + }, + { + "Name": "plc_line~Rail_0", + "Value": 257 + }, + { + "Name": "plc_line~plc_line", + "Value": 48 + }, + { + "Name": "plc_line~plc_line~CPU display_1", + "Value": 54 + }, + { + "Name": "plc_line~plc_line~Card reader/writer_1", + "Value": 51 + }, + { + "Name": "plc_line~plc_line~DP interface_1", + "Value": 60 + }, + { + "Name": "plc_line~plc_line~OPC UA_1", + "Value": 117 + }, + { + "Name": "plc_line~plc_line~PROFINET_interface_1", + "Value": 64 + }, + { + "Name": "plc_line~plc_line~PROFINET_interface_1~Port_1", + "Value": 65 + }, + { + "Name": "plc_line~plc_line~PROFINET_interface_1~Port_2", + "Value": 66 + }, + { + "Name": "plc_line~plc_line~PROFINET_interface_2", + "Value": 72 + }, + { + "Name": "plc_line~plc_line~PROFINET_interface_2~Port_3", + "Value": 73 + }, + { + "Name": "plc_line~plc_line~Virtual communication interface", + "Value": 135 + }, + { + "Name": "profinet_plc_line", + "Value": 256 + } + ] +} \ No newline at end of file diff --git a/src/core/app/hwc/hwc.gen/plc_line.IoAddresses.json b/src/core/app/hwc/hwc.gen/plc_line.IoAddresses.json new file mode 100644 index 000000000..831c90f82 --- /dev/null +++ b/src/core/app/hwc/hwc.gen/plc_line.IoAddresses.json @@ -0,0 +1,3 @@ +{ + "Version": 2 +} \ No newline at end of file diff --git a/src/core/app/hwc/hwc.gen/plc_line.SecurityConfiguration.json b/src/core/app/hwc/hwc.gen/plc_line.SecurityConfiguration.json new file mode 100644 index 000000000..89c4d1823 --- /dev/null +++ b/src/core/app/hwc/hwc.gen/plc_line.SecurityConfiguration.json @@ -0,0 +1,9 @@ +{ + "PKIData": "AQAAAAAAAAAAAAAAAAAAAAEBAcIgAAACAAAAAAAAAAAAAwAAAN8ALS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUhvd0ZBWUhLb1pJemowQ0FRWUpLeVFEQXdJSUFRRUxBMklBQkZzWUc1Rld2UjFudCtmZTQwZjBnV1ZjYktUMwo3YzhQNmdUNTJRSVdOenQ1eTI3NlpFbER6MUVQNjFyYUdhOUVFVTNlbXROTUljMUczbEYvdkZlRFo3SG9JbDcyCmkzVVhhVVdCWDlTekFWeVhGZEVXSHBzTGxhejE4MlZQL241S2t3PT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCnsBAQACAAAnEAAgdEL+A7zacsBr0jL5MdnFLnoHsTgTz49wnviyxvOFIFQBACAADAAQNAfTwpEIt1HqlLzBfyWv1AEAAAE2fmFkifnVAABD/KtHEoFOk1eANGBfoBI5KZFmI0WGOQ1/y6Q+QAMG+e0bwg0CIWO55o5/F9EReWQry3dv/2It3kXC0JkHqubCi75E0Xw+kUeRyNL48PiZSjzDxvc1Z6P9Bh7ZNhMApYHHckA2CqW7I6y3n/3ArDTtcWDmEEuIgMyjn6P6Qu688h5mOuhCWkxV7oHAlZOiCw4cQPNSkH8I+0h0BH/IITWQZ9Rsn0T3pWtZ4dNlNte+tpN+PFj2+zNtWt8Hfgf6NEuSoRd10dJvCKmcwXFzPkk+jB2Kiguch0Udvhjpg+ZXRvYCPgfLih7K5xCD339cH04MXUZ9XzRLvcrUxz0pTDA1SOhTD7+WbezHoq2b1acyfZuFWi0EtBqii0VFbZxB2uxZ7hnWIg18rebOPtRfUAIACWxvY2FsaG9zdAEAAAAAAAAAAQAAAAIAAAAAAAAAFAC86J9YvisGIVnTs7y8AkrkFLionrQGAQAGsC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQ0KTUlJRXN6Q0NBNXVnQXdJQkFnSVVOK3E5NU5SMkN0TjBYZU0vdzFoRjJvOVZ6RUl3RFFZSktvWklodmNOQVFFTEJRQXdlekVMTUFrRw0KQTFVRUJoTUNXRmd4RWpBUUJnTlZCQWdNQ1ZOMFlYUmxUbUZ0WlRFUk1BOEdBMVVFQnd3SVEybDBlVTVoYldVeEZEQVNCZ05WQkFvTQ0KQzBOdmJYQmhibmxPWVcxbE1Sc3dHUVlEVlFRTERCSkRiMjF3WVc1NVUyVmpkR2x2Yms1aGJXVXhFakFRQmdOVkJBTU1DV3h2WTJGcw0KYUc5emREQWVGdzB5TmpBek1ESXhOVEF4TWpaYUZ3MHpOakF5TWpneE5UQXhNalphTUhzeEN6QUpCZ05WQkFZVEFsaFlNUkl3RUFZRA0KVlFRSURBbFRkR0YwWlU1aGJXVXhFVEFQQmdOVkJBY01DRU5wZEhsT1lXMWxNUlF3RWdZRFZRUUtEQXREYjIxd1lXNTVUbUZ0WlRFYg0KTUJrR0ExVUVDd3dTUTI5dGNHRnVlVk5sWTNScGIyNU9ZVzFsTVJJd0VBWURWUVFEREFsc2IyTmhiR2h2YzNRd2dnRWlNQTBHQ1NxRw0KU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ0hrRnIwUjNvM2VqM0ZkNUsyYUxVbXdWNFIyYmZKcDZnMDd0bTdkb2JCNXNUMQ0KUDhxU0t5eng3YlRpb0dBZ2dIRlhoMGlDaVNaRG5JbXJ1aGJ1VDRHMHN1UVRIZWVRemc1Mk5mWHNvWkh2ZENlaHNKMXF3VGR0K2JhQw0KK1NybzhGdVozOXB2K3JXUlE2Ly9kYTFlSnU5SjRLcjhoMG5LK2tIUnJXQUdRM2o5MGRyYnRLbUpKYTJ0TnI3K2M3VGdrelpENkZkMw0KTWV0VmI2Vk5SeEduMFF5bWxieHNhTWE0K3NBMmVjaGx6Ni9mNE13SksyNjhlRDV5Y3ZNeWNINGZzME1BR0hiOTBHV25lSkpUYVl5Ug0KbExXMDVCZTkxWjlHbEx6a3dFcTA3WXdRb1d0cWU5VDdicWJCRWJNOU9VRkRzRFdnMW56bjRGbDBKSk9yOWZNVWh5RFhBZ01CQUFHag0KZ2dFdE1JSUJLVEFKQmdOVkhSTUVBakFBTUE0R0ExVWREd0VCL3dRRUF3SUM5REFkQmdOVkhTVUVGakFVQmdnckJnRUZCUWNEQVFZSQ0KS3dZQkJRVUhBd0l3RXdZRFZSMFJCQXd3Q29JQWh3VEFxR1I0aGdBd0hRWURWUjBPQkJZRUZKQkpnVUdwWkJIdmJrODc1cmFxOWVORA0KVHBNYk1JRzRCZ05WSFNNRWdiQXdnYTJBRkpCSmdVR3BaQkh2Yms4NzVyYXE5ZU5EVHBNYm9YK2tmVEI3TVFzd0NRWURWUVFHRXdKWQ0KV0RFU01CQUdBMVVFQ0F3SlUzUmhkR1ZPWVcxbE1SRXdEd1lEVlFRSERBaERhWFI1VG1GdFpURVVNQklHQTFVRUNnd0xRMjl0Y0dGdQ0KZVU1aGJXVXhHekFaQmdOVkJBc01Fa052YlhCaGJubFRaV04wYVc5dVRtRnRaVEVTTUJBR0ExVUVBd3dKYkc5allXeG9iM04wZ2hRMw0KNnIzazFIWUswM1JkNHovRFdFWGFqMVhNUWpBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQVJ4ak4xa3JKamc4Nkk1SkNwNll3MVhJcA0KNU1Ud0VUUGgzWnBlMXFVc2NlamdXNzFzUFAzRTVHOEg1TnU4NXd1OFBCblBTUGJ5dHRsYVc3KzRkcExtMkNjSWZYZEIyc2pEc0dRSA0KUU5LQUhRNHdPakFkV1BRWWRYT2FtWXdVdnQyZmg2SlZNK3pHNStsMVYzVU9SVWgxb2pSeXZnVVVJdEZnZ003WitiRWdaaGxMeFhzZA0Ka1ZMeVgzZ3E5WlNxODBCTEZiWVh2V1RoTVIwdUdvT0l2KzVKbGZoV2N0bVFtSXVRMGRuNjJodUFLZFJVU1M2YUJUT09ubm8zaEljSw0KV2E1TU5PVTNmSHFjcWVMYklNeDRJRGIyNXpDZUVsODNrN3ZIVkVaR3lGZjFCQ3JoVElmVFM2RHlVRWhPVWc2LzY4eGhNL1dyRzh0Lw0KTnY2YmI4c0xzSm00WWc9PQ0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ0KFwgBAACzAQACAHwwejAUBgcqhkjOPQIBBgkrJAMDAggBAQsDYgAEKMdduZN8KbC5xxTA/MlOFAZKBHURedGnhJmJAH+rVNPXsEjVIV5eBBbjkn4M0v47WCUd6jSD91Do2tkTYb8fG8Wft7MXrp8VGdloREMEno7pcXTy5JjXJ8V7zKruYENfn5vkBQAPupWimqyJ2mi3vQAgtmTn/ck608LaWDyFMbCahImz6NKDt464ooo3qU/i/vcHXi0tLS0tQkVHSU4gRU5DUllQVEVEIFBSSVZBVEUgS0VZLS0tLS0KTUlJRk5UQmZCZ2txaGtpRzl3MEJCUTB3VWpBeEJna3Foa2lHOXcwQkJRd3dKQVFRUkhoeEFJU092V1BpT2ExSApCVmdXeXdJQ0NBQXdEQVlJS29aSWh2Y05BZ2tGQURBZEJnbGdoa2dCWlFNRUFTb0VFTWswR0RrenRKTStFa2VLCm5kQUFuYlFFZ2dUUUJ4aThPWXhwQldDS0Y2SjhQam5DRTlmby83T0FpVE9OckpnUUlyYktVQ1l6dGFEcU5MT1YKMUNKUURvQTR0Nk5aVlpoRkhnaWVqVGVmU1lxZ2dMSVd0N3I2cDF2dXVPd3NURG4wWVNhaTBBUURYdDNWalFxago0cmxYeld3MTZlTjBFLzFBRGI2SU1QZjU4cjdaTWRFVGlnZGg4cDdNNk8yUmJCUmFFcDhQMW1xc1NEdXRNRHlzCmFNTzZRTzR5Mi9qWnZZVDJPRHBhVzV0dTBrSC95QTg2N0lYSDhucC94QXNyeVJGcGJUUC9KZnQ1WTJOUkpneHYKUFE1VG1YcHZYWmUweHl0bGd0eC8rUEVMRDhMU0dMNFpIUXZ3MktnMVAySDUzcWdKVGR4eVJFMmNCb3Jsb2Y4UAp6VlRkd3FxcUwzTS9PREpic21mc3NobTZobEgyL3NvdGVqZlV4cVI3SWY4MTdEVjRXVUQ4SHpMQVVkRUZyOXdsCkptampNdUZ3Q25lcVNseit1OHkvSkY5R0JDUFdoeFN6ZXRxZzEyOGNQbGw2THltalViT2JOT1hMaS9sVFVnaWgKOVlTaHF4dHJNOUJndTJXWVViOU9Gbm9PZEdpZGdqWmtJbG81ZGMvVVVHWEhHc3gvVzVYN0NpYVowL1VSV1hTOQpFVDd3S0FlazZtd00vR3liU2RDRkhSQVdOelA0TTFONzIvVTRwakRSTE5aRVpoQjYrRXlKS1VVeUYra0VNRnBDCnUwM0RnTlgrZXhxa3lhQ01ORzNyK0VabHlrNm1ZTXUxSERteVlick81YnNobGZlcHNrUjRBN05waFNqS081ekIKL1RoNUlsb3laSmltMmxYZnBRbmZ2aktDemN2VUpVNDkzL0krTjVlNU5MUkNUcGk5UlNFaGdCLzFISEVoNERDVwpaV0Eyd1ZJZlpMcExkakxsUmREMTd1a1pGNXQwSHdsN09mNzdISVNQakh6K0lZaGJzdTR1ajVoT2ZkUUF2WjJpCnYyMStFSGdhV1l0ZW44UTdnTEZ1dmlsTzd5bmxjT1FLVjhYWEV5azRQYmFuTUtmNzJ1UGppNXA5WkJDMDlwd0QKbUVBRklldjRnWXI5OWtLSnhBa1Z3Y3JITGpaRFo0Q3YvMGFYYjFtOTNMdUpEeHpZblVIRlpyVEVUWjVtbW4xdwplV3puTkRmQlI4eUI5YnlUOGZTRm1nLy9XWUtObG9aZzZ6MkNiem9DT3FFVFBxT3hwVGRIbCtxMUdDRHlHN2ZuCnFXQWh1UjB6dm1ZcHRpUC94QWdYelBoZkJMbW0xVEEwNEtnYjJZUllIREpDWm9GODdicjZ5M0pZZjdRYk5UUDAKamVLOUhDZzZHNEw3UW1SbnJzemo4OW13NTZnYjNSNXY5b3N3N01pYlBPOXRDNHIrNElYMkEvUVhQSURWM0dwKwpud2p4Tzg5dTJSaXA4czgwWC9kdFFjOGJSQkJnajJwcWJUdzVRNm11MlFVMGFTZms5Tm5OVDV0NmttRlNPQ3JyCkRRNVczc0lHNUR4alQwclFjNHRua1pyR2ozcUc1SE8xVHhMOXdtTGJVTEJkU1FFOFZoV3JpbS9qU1VNRW0yK3gKMmJEVzVVNzh4N1NiVmRLRHJ3NnBseDF1dTk3VHR4U0o1eDBYMndNOHRUZlV5aGlJS1ZjWUdXTmdQU0ZTbFN2cgpxMy9uc3VhbEdLamtTWisxL0tsUGRlQ2ZPU1o2ak1DcFV5TzBUemY0MTF3RldjWlRZLzJHRThKSmM3YnhsN21JCkl5b0FWb1FQcFUwYmk2SWJZZC80Q0NGWktZS1ZzdWYyUE5Wd0xsTW5IUmlabFIvUGZjeWl1TklxU2lhajlMcUgKN3VsN1k1SGJZb01SWnVJV21URVp6VjJpZmNPTk0vbk1TUGFsSTBmZWtGeE05WXh1WlRaZnRuZVg3V2xuUkljdAp0QVNsQUc5NXlqc056bEtQeTNrbjNoeWlVa2JjQmsxeDFtd1ZJUkZQa2tHU0lVdk5ZZkRYT0dReGJOdWxCOXp4CnlCUktIT01SRmRYYkNGcytkaVptN1BkQVVud1p6U2d3ajk2TEhDV3p1M2FxeFFzUkdoNkd2M0xBVkE4MVo2VVcKZ1BCQ1BqQWFJOUljdkNaV0tVMEdvKzNUV2JoK2FRNlJ0by9TZ2lKajZFRGxoYTZ3QWhxbytycz0KLS0tLS1FTkQgRU5DUllQVEVEIFBSSVZBVEUgS0VZLS0tLS0KJkROUzosIElQIEFkZHJlc3M6MTkyLjE2OC4xMDAuMTIwLCBVUkk6CWxvY2FsaG9zdAIAAAAAAAAAAQAAAAIAAAAAAAAAFAC86J9YvisGIVnTs7y8AkrkFLionrQGAQAGsC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQ0KTUlJRXN6Q0NBNXVnQXdJQkFnSVVOK3E5NU5SMkN0TjBYZU0vdzFoRjJvOVZ6RUl3RFFZSktvWklodmNOQVFFTEJRQXdlekVMTUFrRw0KQTFVRUJoTUNXRmd4RWpBUUJnTlZCQWdNQ1ZOMFlYUmxUbUZ0WlRFUk1BOEdBMVVFQnd3SVEybDBlVTVoYldVeEZEQVNCZ05WQkFvTQ0KQzBOdmJYQmhibmxPWVcxbE1Sc3dHUVlEVlFRTERCSkRiMjF3WVc1NVUyVmpkR2x2Yms1aGJXVXhFakFRQmdOVkJBTU1DV3h2WTJGcw0KYUc5emREQWVGdzB5TmpBek1ESXhOVEF4TWpaYUZ3MHpOakF5TWpneE5UQXhNalphTUhzeEN6QUpCZ05WQkFZVEFsaFlNUkl3RUFZRA0KVlFRSURBbFRkR0YwWlU1aGJXVXhFVEFQQmdOVkJBY01DRU5wZEhsT1lXMWxNUlF3RWdZRFZRUUtEQXREYjIxd1lXNTVUbUZ0WlRFYg0KTUJrR0ExVUVDd3dTUTI5dGNHRnVlVk5sWTNScGIyNU9ZVzFsTVJJd0VBWURWUVFEREFsc2IyTmhiR2h2YzNRd2dnRWlNQTBHQ1NxRw0KU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ0hrRnIwUjNvM2VqM0ZkNUsyYUxVbXdWNFIyYmZKcDZnMDd0bTdkb2JCNXNUMQ0KUDhxU0t5eng3YlRpb0dBZ2dIRlhoMGlDaVNaRG5JbXJ1aGJ1VDRHMHN1UVRIZWVRemc1Mk5mWHNvWkh2ZENlaHNKMXF3VGR0K2JhQw0KK1NybzhGdVozOXB2K3JXUlE2Ly9kYTFlSnU5SjRLcjhoMG5LK2tIUnJXQUdRM2o5MGRyYnRLbUpKYTJ0TnI3K2M3VGdrelpENkZkMw0KTWV0VmI2Vk5SeEduMFF5bWxieHNhTWE0K3NBMmVjaGx6Ni9mNE13SksyNjhlRDV5Y3ZNeWNINGZzME1BR0hiOTBHV25lSkpUYVl5Ug0KbExXMDVCZTkxWjlHbEx6a3dFcTA3WXdRb1d0cWU5VDdicWJCRWJNOU9VRkRzRFdnMW56bjRGbDBKSk9yOWZNVWh5RFhBZ01CQUFHag0KZ2dFdE1JSUJLVEFKQmdOVkhSTUVBakFBTUE0R0ExVWREd0VCL3dRRUF3SUM5REFkQmdOVkhTVUVGakFVQmdnckJnRUZCUWNEQVFZSQ0KS3dZQkJRVUhBd0l3RXdZRFZSMFJCQXd3Q29JQWh3VEFxR1I0aGdBd0hRWURWUjBPQkJZRUZKQkpnVUdwWkJIdmJrODc1cmFxOWVORA0KVHBNYk1JRzRCZ05WSFNNRWdiQXdnYTJBRkpCSmdVR3BaQkh2Yms4NzVyYXE5ZU5EVHBNYm9YK2tmVEI3TVFzd0NRWURWUVFHRXdKWQ0KV0RFU01CQUdBMVVFQ0F3SlUzUmhkR1ZPWVcxbE1SRXdEd1lEVlFRSERBaERhWFI1VG1GdFpURVVNQklHQTFVRUNnd0xRMjl0Y0dGdQ0KZVU1aGJXVXhHekFaQmdOVkJBc01Fa052YlhCaGJubFRaV04wYVc5dVRtRnRaVEVTTUJBR0ExVUVBd3dKYkc5allXeG9iM04wZ2hRMw0KNnIzazFIWUswM1JkNHovRFdFWGFqMVhNUWpBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQVJ4ak4xa3JKamc4Nkk1SkNwNll3MVhJcA0KNU1Ud0VUUGgzWnBlMXFVc2NlamdXNzFzUFAzRTVHOEg1TnU4NXd1OFBCblBTUGJ5dHRsYVc3KzRkcExtMkNjSWZYZEIyc2pEc0dRSA0KUU5LQUhRNHdPakFkV1BRWWRYT2FtWXdVdnQyZmg2SlZNK3pHNStsMVYzVU9SVWgxb2pSeXZnVVVJdEZnZ003WitiRWdaaGxMeFhzZA0Ka1ZMeVgzZ3E5WlNxODBCTEZiWVh2V1RoTVIwdUdvT0l2KzVKbGZoV2N0bVFtSXVRMGRuNjJodUFLZFJVU1M2YUJUT09ubm8zaEljSw0KV2E1TU5PVTNmSHFjcWVMYklNeDRJRGIyNXpDZUVsODNrN3ZIVkVaR3lGZjFCQ3JoVElmVFM2RHlVRWhPVWc2LzY4eGhNL1dyRzh0Lw0KTnY2YmI4c0xzSm00WWc9PQ0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ0KFwgBAACzAQACAHwwejAUBgcqhkjOPQIBBgkrJAMDAggBAQsDYgAEgP+qeMKJPTwlHZVAs0IsBAnmY8TqEeWhcS+yjdL+Giw8bH2vgrj2QiydPD77MAcmbJ251I6hZXyd26beGJJi5ca+RvB03tF4oKzbmqoMlVJPK6108rRXatt6EPDD7KvDbDOYM2a+aIBnf/HTitKhSwAgrR5eH6rcT1QatlnVjchx6OEJwLkGtSvrqEQdRh1g66oHXi0tLS0tQkVHSU4gRU5DUllQVEVEIFBSSVZBVEUgS0VZLS0tLS0KTUlJRk5UQmZCZ2txaGtpRzl3MEJCUTB3VWpBeEJna3Foa2lHOXcwQkJRd3dKQVFRWHp0eS8vc3A1TjQrMjYweQo0bmtQdHdJQ0NBQXdEQVlJS29aSWh2Y05BZ2tGQURBZEJnbGdoa2dCWlFNRUFTb0VFUE1PeHlQMnVBQTN2bmdqClRtdzB1L1VFZ2dUUWVMZ2lhTFQreDRXYXFuUnpXNXFwdngxSWswcVNZK3VSeTZmaUM3WHljL1BFSVV1ajJFUTIKWVNHV2YwaGtDQVpQOUpJVUlVZUpYVmNkQnNWVXk1M3V3d3ZNVDlHL2FmQ255azR1dStiWnRtSWdvcTlpTnZaZwpISFZ4UlZuVk5IZ3BueWEyUEJ5YVduQm5LbEFzOHlDSWMxdlp4UkV1ano2cnorSDlIWjZ0alF5b20zOG10WmY1Cm5oOVB5cWJKMm9zbjd0YlBmUjJHREw1eURHaUVFQS9pVjFpSGQ4U2JFSlRZaE9ZQVZtMGhJaUVBRW1JbytXcHYKZUVrc3h0U1lQOGNQTVlEczJ3UEJRdlA5cHo0Z0tPbk5INGFZOEc1UW05MjliSXJGOU5QZXhaY1MweTUycjJwMApSSE05N1orMUswUFdycVZtVGtkdnQ1d3ZnMEdLcWZEelp6MnZHcHhMS3JpVm5yZTgxTWxyYVl4dVdYTlZ3TGhMCnV6Uklva0t3dXpKc1ZnL2ZNbjlwNGdCdTlMb3cxbXZJS1JPQ3JqSnByQzVweWhOYVBwZnlpaTdhb1FDbElpUGEKRzlRRURhbjAwMGtqN1BhQ1V2OCtZY2hZcDVUQ3hDZytSd3d3VXFBQ0VmWGJ4ZUdsMGlQdXhRN01nVWRqd3dNeQpncWJYaVJkamhvaHgrTVo3Q0xoUlc4K252cXRYRkFiZkRKYng0SzVnVlNVSnNtWnZ3dmNBR1laL1dQeE1uV0VOCjlVNGpQckkyRHpUWll5aEhGMWRkK0lpYlcweW94M1NqZGx6OFJxWWZ4UC9uMWJYTGhlbjB6VmVzblRkbno2LzQKZkdOTGpQa0VYZGRQbGFHVHNadFdxdHVybGlDcEVoVGdjb004SGRlUnNLZm1lSmNvUjhoSnlXb1RWNnZGNmZGSwpsOUkvclgwaVB6bjVndU1YQ1paZ1hhOTdxM2J6NFlaK3VoVlVVSGFVMDFQcXFYSE5MQXhFTU1LQndYSGllQ3M0ClZENHZ0RTlVVXJsQWlNemEzdHlYdHJCWlVTSnRoWWQ5ajNsRmZ3M0ZwUVdVYVphQStSTis5ZE5vQnlLeW1LWUUKZEpiN0hCb2xPcGMxeCtZaWlXZzZ3bWJ6STdSMzRjeXRQZk9vZ3hOb3lwcmhLTCtzTjh0Si9wZnZxSURjeWtUTApubmhlVE56TklQc1dETnlQQUtiaGNTdmdNWHRQVjlMMC9pUkRTUEoydUZ1NzF3L3pBK1M0QVQ4akpxTkpkRjd3CmUxZGhjT0ZoNHhkN3drM08vTUo2Z2JvN3F2TitPbkJ6VjU1dGZlcityZ2NLZURKQm92NDJPeCtkNTE5NVZ0NmIKOFhQSGhNOUllc3pyaGxyZFJvL1RibUdwMEZQdTRYN1VJOVViRXo5cmtBTEczUlBFTytLUG0vbGxocU44SW1IMQpMcGQ3dHhEcGJOZ1NhZEZhT2N4emphNDA2U2hqNTQxR2lHY052dnpSWkI1Qmdad21kRkFNZWRHMDJRcTdlZ1gvCnhrd2lSVUhmRmpET2xDMUZrZC9USkJTVkJLeXBUbHI0NlRGdlhBTXljMGdDNmNjMnBQMGhicG50cHk1d05KcUkKLzZSem40amlJNkRnM3NTZ1lSelI4Z0ZMY3FXTXMrV0FGTldTT3h5ZVVBWWlUR3R3WjNhZ2ZrQko4YmNkRlhHaAo1WTBncnRqV1ZjbWM0YkZRczNEazhrUXdySUE5c2cwQ1BWcHRnOGdqZHQramV1eE1UTHhjWlc1dUJDMEVsZkxmCnlTa0VwZjFsVkFHM0lXdTRUenI3ZU14UGpJWS9TV1NhQ1VJK3g1em1wUGdPc0tOSGg2TlJkcUdrZnEvMTZMUUYKclRKN080cFhKQ1Nmc0E0bEV6aDNRTWV2dDhDVFBXaDM2anhSbnNkbnJhZEsvbkl4dXFJSnZDWUhuaHVsaDJJNQpIY3JBMjVvTU9tZkdIVVJkWjg2ajNjSkdUbGlseEl2ejA2ZC91QWR5ZE5QdjBLWHd6bXVNT3Z2Z2dpT2hpZUVHCnlVakZnVTRxWDEyUVliWGxvMHNKMUNoQ2JTZ1FTQnZNZGdHMlo5eEMyWHQ5d2UwZ3cvWnZzZWd1eWphRmNuNHMKYUZRSisvWmFqSkl0c0dza1FCRmg1Mm1ER1dHVmY1RWF6YlA4bGJBRVJJdlZBSTUvSldQKy9hWT0KLS0tLS1FTkQgRU5DUllQVEVEIFBSSVZBVEUgS0VZLS0tLS0KJkROUzosIElQIEFkZHJlc3M6MTkyLjE2OC4xMDAuMTIwLCBVUkk6", + "UserData": "AgAAAAAAAAAAAAAAAAAAAAEAAAAFAGFkbWludAAAAAEAAAEBAAEFAAAnEAAAACDH1ZFU6LJdn+MZVLarsH7fTbRZmN7UmrGKTXFN4F98vgAAAECzhqFN7eqwlP9+8GI4WV9JkD6Oehso5dd3PfnFmZfBBpW2kTqEp9NL+ZV4979ROPvXnx2s8YG6/079WxPdre2wAA==", + "CertificateAssignments": { + "TLS": 1, + "WebServer": 2 + }, + "AccessProtectionData": "AQAAAAAAAAAAAAAAAAAAAAABAABQAAAAAAEBAAAAAgDQBwAAIAA5sEm9IACXps6BDbS4kkFUI1nI3em52QWYSip9M7ZgaSAAw4Y+/5JEOKW1um6NDV7m50NHCHEJ3ZdcF/i3FHRMvatQAAAAAAEBAAAAAgDQBwAAIAA5sEm9IACXps6BDbS4kkFUI1nI3em52QWYSip9M7ZgaSAAUeXIizJXwanj7uiSzX1NZ3qqZkM/xGGYua2ysF8ArQtQAAAAAAEBAAAAAgDQBwAAIAA5sEm9IACXps6BDbS4kkFUI1nI3em52QWYSip9M7ZgaSAAw4Y+/5JEOKW1um6NDV7m50NHCHEJ3ZdcF/i3FHRMvatQAAAAAAEBAAAAAgDQBwAAIAA5sEm9IACXps6BDbS4kkFUI1nI3em52QWYSip9M7ZgaSAAw4Y+/5JEOKW1um6NDV7m50NHCHEJ3ZdcF/i3FHRMvasgAAAAObBJvSAAl6bOgQ20uJJBVCNZyN3pudkFmEoqfTO2YGk=" +} \ No newline at end of file diff --git a/src/core/app/src/IO/HwIdentifierList.st b/src/core/app/src/IO/HwIdentifierList.st new file mode 100644 index 000000000..89ca2ab71 --- /dev/null +++ b/src/core/app/src/IO/HwIdentifierList.st @@ -0,0 +1,21 @@ +NAMESPACE AXOpen.Core + TYPE HwIdentifierList : ARRAY[0..13] OF UINT := + [ + UINT#32, + UINT#48, + UINT#51, + UINT#54, + UINT#60, + UINT#64, + UINT#65, + UINT#66, + UINT#72, + UINT#73, + UINT#117, + UINT#135, + UINT#256, + UINT#257 + ]; +END_TYPE +END_NAMESPACE + diff --git a/src/core/app/src/IO/HwIdentifiers.st b/src/core/app/src/IO/HwIdentifiers.st index 61005f32f..525a42713 100644 --- a/src/core/app/src/IO/HwIdentifiers.st +++ b/src/core/app/src/IO/HwIdentifiers.st @@ -2,22 +2,21 @@ NAMESPACE AXOpen.Core TYPE HwIdentifiers : UINT ( - plc_line_HwID :=UINT#32, - plc_line_Rail_0_HwID :=UINT#257, - plc_line_plc_line_HwID :=UINT#48, - plc_line_plc_line_CPU_display_1_HwID :=UINT#54, - plc_line_plc_line_Card_reader_writer_1_HwID :=UINT#51, - plc_line_plc_line_DP_interface_1_HwID :=UINT#60, - plc_line_plc_line_OPC_UA_1_HwID :=UINT#117, - plc_line_plc_line_PROFINET_interface_1_HwID :=UINT#64, - plc_line_plc_line_PROFINET_interface_1_Port_1_HwID :=UINT#65, - plc_line_plc_line_PROFINET_interface_1_Port_2_HwID :=UINT#66, - plc_line_plc_line_PROFINET_interface_2_HwID :=UINT#72, - plc_line_plc_line_PROFINET_interface_2_Port_3_HwID :=UINT#73, - plc_line_plc_line_Virtual_communication_interface_HwID :=UINT#135, - profinet_plc_line_HwID :=UINT#256, - - NONE := UINT#0 + plc_line_HwID := UINT#32, + plc_line_plc_line_HwID := UINT#48, + plc_line_plc_line_Card_reader_writer_1_HwID := UINT#51, + plc_line_plc_line_CPU_display_1_HwID := UINT#54, + plc_line_plc_line_DP_interface_1_HwID := UINT#60, + plc_line_plc_line_PROFINET_interface_1_HwID := UINT#64, + plc_line_plc_line_PROFINET_interface_1_Port_1_HwID := UINT#65, + plc_line_plc_line_PROFINET_interface_1_Port_2_HwID := UINT#66, + plc_line_plc_line_PROFINET_interface_2_HwID := UINT#72, + plc_line_plc_line_PROFINET_interface_2_Port_3_HwID := UINT#73, + plc_line_plc_line_OPC_UA_1_HwID := UINT#117, + plc_line_plc_line_Virtual_communication_interface_HwID := UINT#135, + profinet_plc_line_HwID := UINT#256, + plc_line_Rail_0_HwID := UINT#257 ); END_TYPE END_NAMESPACE + diff --git a/src/core/app/src/IO/Inputs.st b/src/core/app/src/IO/Inputs.st index 23b386033..41b2ae9a1 100644 --- a/src/core/app/src/IO/Inputs.st +++ b/src/core/app/src/IO/Inputs.st @@ -1,4 +1,4 @@ -NAMESPACE AXOpen.Core +NAMESPACE AXOpen.Core TYPE {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} diff --git a/src/core/app/src/IO/IoStructures.st b/src/core/app/src/IO/IoStructures.st index df51d462e..edecd4223 100644 --- a/src/core/app/src/IO/IoStructures.st +++ b/src/core/app/src/IO/IoStructures.st @@ -1,3 +1,3 @@ -NAMESPACE AXOpen.Core +NAMESPACE AXOpen.Core END_NAMESPACE diff --git a/src/core/app/src/IO/Outputs.st b/src/core/app/src/IO/Outputs.st index 66da5b20b..ffa8f7850 100644 --- a/src/core/app/src/IO/Outputs.st +++ b/src/core/app/src/IO/Outputs.st @@ -1,4 +1,4 @@ -NAMESPACE AXOpen.Core +NAMESPACE AXOpen.Core TYPE {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} diff --git a/src/core/ctrl/src/AxoCoordination/AxoSequencer/AxoSequencer.st b/src/core/ctrl/src/AxoCoordination/AxoSequencer/AxoSequencer.st index 69f6c8063..e8fc1287a 100644 --- a/src/core/ctrl/src/AxoCoordination/AxoSequencer/AxoSequencer.st +++ b/src/core/ctrl/src/AxoCoordination/AxoSequencer/AxoSequencer.st @@ -4,10 +4,22 @@ NAMESPACE AXOpen.Core USING System.Strings; {S7.extern=ReadWrite} CLASS AxoSequencer EXTENDS AxoTask IMPLEMENTS IAxoSequencer - VAR PUBLIC - {#ix-set:AttributeName = "<#Stepping mode#>"} + VAR PUBLIC + {#ix-set:AttributeName = "<#Required stepping mode#>"} + ReqSteppingMode : eAxoSteppingMode; + {#ix-set:AttributeName = "<#Set required stepping mode#>"} + SetReqSteppingMode : BOOL; + {#ix-set:AttributeName = "<#Current stepping mode#>"} + {S7.extern=Read} + {#ix-attr:[ReadOnly()]} SteppingMode : eAxoSteppingMode; - {#ix-set:AttributeName = "<#Sequence mode#>"} + {#ix-set:AttributeName = "<#Required sequence mode#>"} + ReqSequenceMode : eAxoSequenceMode; + {#ix-set:AttributeName = "<#Set required sequence mode#>"} + SetReqSequenceMode : BOOL; + {#ix-set:AttributeName = "<#Current sequence mode#>"} + {S7.extern=Read} + {#ix-attr:[ReadOnly()]} SequenceMode : eAxoSequenceMode; CurrentOrder : ULINT; {#ix-set:AttributeName = ">>"} @@ -32,7 +44,10 @@ NAMESPACE AXOpen.Core _refStep : REF_TO AxoStep; _microStep : UINT; _context : IAxoContext; - _analytics : IAxoSequencerAnalytics; + _analytics : IAxoSequencerAnalytics; + _stepExecutionMode : eAxoStepExecutionMode; + _steppingMode : eAxoSteppingMode; + _sequenceMode : eAxoSequenceMode; END_VAR METHOD PUBLIC SetAnalitics @@ -49,8 +64,27 @@ NAMESPACE AXOpen.Core IF _context = NULL THEN _context := THIS.GetContext(); END_IF; - Open := FALSE; + + SteppingMode := _steppingMode; + IF SetReqSteppingMode THEN + IF ReqSteppingMode = eAxoSteppingMode#StepByStep AND + _steppingMode <> eAxoSteppingMode#StepByStep THEN + THIS.SetSteppingMode(ReqSteppingMode); + END_IF; + IF ReqSteppingMode = eAxoSteppingMode#Continous AND + _steppingMode <> eAxoSteppingMode#Continous THEN + THIS.SetSteppingMode(ReqSteppingMode); + END_IF; + SetReqSteppingMode := FALSE; + END_IF; + + SequenceMode := _sequenceMode; + IF SetReqSequenceMode THEN + THIS.SetSequenceMode(ReqSequenceMode); + SetReqSequenceMode := FALSE; + END_IF; + SUPER.SetSuspendMultipleExecuteCallCheck(TRUE); StepForwardCommand.SetSuspendMultipleExecuteCallCheck(TRUE); @@ -113,7 +147,7 @@ NAMESPACE AXOpen.Core // Stepping inside the sequence IF _coordinatorState = AxoCoordinatorStates#Running THEN // Stepping is possible only in StepByStepMode - IF SteppingMode = eAxoSteppingMode#StepByStep THEN + IF _steppingMode = eAxoSteppingMode#StepByStep THEN // Stepping Forwards and Backwards commands cannot be executed simultaneously StepForwardCommand.SetIsDisabled(StepBackwardCommand.IsBusy() // Stepping Forwards disabled from last step @@ -145,7 +179,7 @@ NAMESPACE AXOpen.Core END_IF; IF _coordinatorState = AxoCoordinatorStates#Running && (CurrentOrder = step.GetStepOrder()) && step.IsCalledJustOnceInThisPlcCycle() THEN - IF SteppingMode = eAxoSteppingMode#Continous THEN + IF _steppingMode = eAxoSteppingMode#Continous THEN IF Enable THEN step.SetIsActive(TRUE); IF step.IsDone() THEN @@ -159,7 +193,7 @@ NAMESPACE AXOpen.Core // CurrentOrder := ULINT#1; // END_IF; END_IF; - ELSIF SteppingMode = eAxoSteppingMode#StepByStep THEN + ELSIF _steppingMode = eAxoSteppingMode#StepByStep THEN StepIn.SetIsDisabled(FALSE); IF Enable THEN step.SetIsActive(TRUE); @@ -186,12 +220,18 @@ NAMESPACE AXOpen.Core step.SetIsDisabled(NOT step.GetIsActive()); END_IF; - IF step.GetIsActive() AND (step.IsReady() OR step.IsDone() OR SteppingMode = eAxoSteppingMode#StepByStep) THEN - IF (SteppingMode = eAxoSteppingMode#Continous) THEN + IF step.GetIsActive() AND (step.IsReady() OR step.IsDone() OR _steppingMode = eAxoSteppingMode#StepByStep) THEN + IF (_steppingMode = eAxoSteppingMode#Continous) THEN + // Switching to step mode as the step is marked as 'SwitchToStepModeBeforeEnteringStep' + _stepExecutionMode := _step.GetStepExecutionMode(); + IF _stepExecutionMode = eAxoStepExecutionMode#SwitchToStepModeBeforeEnteringStep THEN + THIS.SetSteppingMode(eAxoSteppingMode#StepByStep); + RETURN; + END_IF; step.Invoke(); _context.GetLogger().Log('<#Starts step :#>', AXOpen.Logging.eLogLevel#Verbose, step); // Invoke the step in a case of step mode when StepIn Command is invoked - ELSIF (SteppingMode = eAxoSteppingMode#StepByStep) THEN + ELSIF (_steppingMode = eAxoSteppingMode#StepByStep) THEN IF StepIn.Execute() THEN IF _step.HasError() THEN _step.Restore(); @@ -258,10 +298,10 @@ NAMESPACE AXOpen.Core _context.GetLogger().Log('<#Step done :#>', AXOpen.Logging.eLogLevel#Verbose, _step); _step.DoneWhen(_step.IsBusy()); IF(_analytics <> NULL) THEN _analytics.UpdateAnalytics(CurrentStep); END_IF; - _step.SetIsActive(FALSE); + _step.SetIsActive(FALSE); CurrentOrder := CurrentOrder + ULINT#1; // Finalize the StepIn Command in a case of step mode - StepIn.DoneWhen(SteppingMode = eAxoSteppingMode#StepByStep); + StepIn.DoneWhen(_steppingMode = eAxoSteppingMode#StepByStep); END_IF; END_IF; END_METHOD @@ -288,7 +328,7 @@ NAMESPACE AXOpen.Core IF(_analytics <> NULL) THEN _analytics.UpdateAnalytics(CurrentStep); END_IF; CurrentOrder := RequestedStep.GetStepOrder(); // Finalize the StepIn Command in a case of step mode - StepIn.DoneWhen(SteppingMode = eAxoSteppingMode#StepByStep); + StepIn.DoneWhen(_steppingMode = eAxoSteppingMode#StepByStep); END_IF; END_IF; END_METHOD @@ -310,9 +350,9 @@ NAMESPACE AXOpen.Core _step.SetIsActive(FALSE); _coordinatorState := AxoCoordinatorStates#Idle; CurrentOrder := ULINT#1; - SUPER.DoneWhen(SequenceMode =eAxoSequenceMode#RunOnce); + SUPER.DoneWhen(_sequenceMode =eAxoSequenceMode#RunOnce); // Finalize the StepIn Command in a case of step mode - StepIn.DoneWhen(SteppingMode = eAxoSteppingMode#StepByStep); + StepIn.DoneWhen(_steppingMode = eAxoSteppingMode#StepByStep); THIS.OnCompleteSequence(); _context.GetLogger().Log('<#Sequence completed :#>', AXOpen.Logging.eLogLevel#Verbose, THIS); END_IF; @@ -332,6 +372,20 @@ NAMESPACE AXOpen.Core ; END_METHOD + /// + /// Executes once when the sequence is switched to StepByStep mode. + /// + METHOD PROTECTED OnEnterStepByStepMode + ; + END_METHOD + + /// + /// Executes once when the sequence is switched to Continous mode. + /// + METHOD PROTECTED OnEnterContinousMode + ; + END_METHOD + /// /// Gets the state of the coordinator /// @@ -456,14 +510,30 @@ NAMESPACE AXOpen.Core END_METHOD METHOD PUBLIC GetSteppingMode : eAxoSteppingMode - GetSteppingMode := SteppingMode; + GetSteppingMode := _steppingMode; END_METHOD METHOD PUBLIC SetSteppingMode VAR_INPUT inSteppingMode : eAxoSteppingMode; END_VAR - SteppingMode := inSteppingMode; + IF inSteppingMode = eAxoSteppingMode#StepByStep THEN + THIS.OnEnterStepByStepMode(); + ELSIF inSteppingMode = eAxoSteppingMode#Continous THEN + THIS.OnEnterContinousMode(); + END_IF; + _steppingMode := inSteppingMode; + END_METHOD + + METHOD PUBLIC GetSequenceMode : eAxoSequenceMode + GetSequenceMode := _sequenceMode; + END_METHOD + + METHOD PUBLIC SetSequenceMode + VAR_INPUT + inSequenceMode : eAxoSequenceMode; + END_VAR + _sequenceMode := inSequenceMode; END_METHOD END_CLASS diff --git a/src/core/ctrl/src/AxoCoordination/AxoStep/AxoStep.st b/src/core/ctrl/src/AxoCoordination/AxoStep/AxoStep.st index ef3445f21..620cedb17 100644 --- a/src/core/ctrl/src/AxoCoordination/AxoStep/AxoStep.st +++ b/src/core/ctrl/src/AxoCoordination/AxoStep/AxoStep.st @@ -8,7 +8,8 @@ NAMESPACE AXOpen.Core Order : ULINT; Descr : STRING[120]; IsActive : BOOL; - IsEnabled : BOOL; + IsEnabled : BOOL; + StepExecutionMode : eAxoStepExecutionMode := eAxoStepExecutionMode#ExecuteAndContinue; END_VAR VAR PROTECTED @@ -214,6 +215,14 @@ NAMESPACE AXOpen.Core METHOD PUBLIC GetStepDescription : STRING GetStepDescription := THIS.Descr; END_METHOD + + /// + /// Returns the step execution mode + /// + METHOD PUBLIC GetStepExecutionMode : eAxoStepExecutionMode + GetStepExecutionMode := THIS.StepExecutionMode; + END_METHOD + END_CLASS END_NAMESPACE diff --git a/src/core/ctrl/src/AxoCoordination/AxoStep/eAxoStepExecutionMode.st b/src/core/ctrl/src/AxoCoordination/AxoStep/eAxoStepExecutionMode.st new file mode 100644 index 000000000..5ba948897 --- /dev/null +++ b/src/core/ctrl/src/AxoCoordination/AxoStep/eAxoStepExecutionMode.st @@ -0,0 +1,9 @@ +NAMESPACE AXOpen.Core + TYPE PUBLIC + eAxoStepExecutionMode : INT + ( + ExecuteAndContinue := 0, + SwitchToStepModeBeforeEnteringStep := 1 + ) := ExecuteAndContinue; + END_TYPE +END_NAMESPACE diff --git a/src/core/ctrl/src/abstractions/AxoCoordination/AxoStep/IAxoStep.st b/src/core/ctrl/src/abstractions/AxoCoordination/AxoStep/IAxoStep.st index 42c98a433..14463a8e3 100644 --- a/src/core/ctrl/src/abstractions/AxoCoordination/AxoStep/IAxoStep.st +++ b/src/core/ctrl/src/abstractions/AxoCoordination/AxoStep/IAxoStep.st @@ -10,5 +10,6 @@ NAMESPACE AXOpen.Core METHOD IsFirstEntryToStep : BOOL END_METHOD METHOD UpdateStepAnalitics VAR_IN_OUT inoAnalytics : AxoStepAnalytics; END_VAR END_METHOD METHOD GetStepDescription : STRING END_METHOD + METHOD GetStepExecutionMode : eAxoStepExecutionMode END_METHOD END_INTERFACE END_NAMESPACE diff --git a/src/core/ctrl/src/abstractions/NULLs.st b/src/core/ctrl/src/abstractions/NULLs.st index 6ef161f31..3c55ef0e5 100644 --- a/src/core/ctrl/src/abstractions/NULLs.st +++ b/src/core/ctrl/src/abstractions/NULLs.st @@ -47,6 +47,8 @@ NAMESPACE AXOpen.Core END_METHOD END_CLASS + // Derived interface used, due to compiler issues with interface inheritance. + // https://docs.industrial-operations-x.siemens.cloud/r/en-us/ax/faq/2510/known-issues/casting-error-in-specific-inheritance-relations-when-compiling-to-1500 INTERFACE IAxoNullObject EXTENDS IAxoObject END_INTERFACE /// @@ -157,6 +159,8 @@ NAMESPACE AXOpen.Core END_METHOD END_CLASS + // Derived interface used, due to compiler issues with interface inheritance. + // https://docs.industrial-operations-x.siemens.cloud/r/en-us/ax/faq/2510/known-issues/casting-error-in-specific-inheritance-relations-when-compiling-to-1500 INTERFACE PUBLIC IAxoNullMessagingServices EXTENDS IAxoMessagingServices END_INTERFACE /// diff --git a/src/core/ctrl/test/AxoCoordination/AxoSequencerContainerTests.st b/src/core/ctrl/test/AxoCoordination/AxoSequencerContainerTests.st index 9297c8926..4ff01032f 100644 --- a/src/core/ctrl/test/AxoCoordination/AxoSequencerContainerTests.st +++ b/src/core/ctrl/test/AxoCoordination/AxoSequencerContainerTests.st @@ -1020,30 +1020,30 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC should_return_the_continous_stepping_mode - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#Continous)); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#Continous)); END_METHOD {Test} METHOD PUBLIC should_return_the_step_by_step_stepping_mode - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); END_METHOD {Test} METHOD PUBLIC should_return_the_cyclic_mode - Assert.Equal(TRUE ,THIS.EqualeAxoSequenceMode(_sequencer.SequenceMode, eAxoSequenceMode#Cyclic)); + Assert.Equal(TRUE ,THIS.EqualeAxoSequenceMode(_sequencer.GetSequenceMode(), eAxoSequenceMode#Cyclic)); END_METHOD {Test} METHOD PUBLIC should_return_the_runonce_mode - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - Assert.Equal(TRUE ,THIS.EqualeAxoSequenceMode(_sequencer.SequenceMode, eAxoSequenceMode#RunOnce)); + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); + Assert.Equal(TRUE ,THIS.EqualeAxoSequenceMode(_sequencer.GetSequenceMode(), eAxoSequenceMode#RunOnce)); END_METHOD {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_set_currently_executed_step_to_Done THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); Assert.Equal(FALSE, _sequencer._step_3.IsDone()); _sequencer.CompleteSequence(); Assert.Equal(TRUE, _sequencer._step_3.IsDone()); @@ -1052,7 +1052,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_reset_the_Busy_state_of_the_currently_executed_step THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); Assert.Equal(TRUE, _sequencer._step_3.IsBusy()); _sequencer.CompleteSequence(); Assert.Equal(FALSE, _sequencer._step_3.IsBusy()); @@ -1061,7 +1061,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_set_the_Current_Order_to_1 THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); Assert.Equal(ULINT#1, _sequencer.CurrentOrder); END_METHOD @@ -1069,7 +1069,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_set_the_coordinator_state_to_Idle THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); Assert.Equal(TRUE, THIS.EqualAxoCoordinatorStates(AxoCoordinatorStates#Idle , _sequencer.GetCoordinatorState())); END_METHOD @@ -1077,7 +1077,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_set_the_CurrentOrder_to_1 THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); _context.Close(); @@ -1087,7 +1087,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_stops_the_execution_of_the_active_step_in_the_next_PLC_cycles THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); _context.Close(); @@ -1109,7 +1109,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_coordinator_state_should_stay_in_Idle_in_the_next_PLC_cycles THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); _context.Close(); @@ -1146,8 +1146,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC all_stepping_commands_should_be_disabled_when_Sequencer_is_not_running_mode - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.PrepareSequence(); Assert.Equal(TRUE, THIS.EqualAxoCoordinatorStates(AxoCoordinatorStates#Configuring , _sequencer.GetCoordinatorState())); Assert.Equal(TRUE,_sequencer.StepForwardCommand.GetIsDisabled()); @@ -1157,8 +1157,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC StepForward_and_StepIn_commands_should_not_be_disabled_when_Sequencer_is_running_mode - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(TRUE,TRUE); Assert.Equal(TRUE, THIS.EqualAxoCoordinatorStates(AxoCoordinatorStates#Running , _sequencer.GetCoordinatorState())); Assert.Equal(FALSE,_sequencer.StepForwardCommand.GetIsDisabled()); @@ -1167,8 +1167,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC StepBackward_command_should_not_be_disabled_when_Sequencer_is_running_mode_and_CurrentOrder_is_greather_then_one - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(TRUE,TRUE); _sequencer.RequestStep(_sequencer._step_2); THIS.ExecuteSequence(TRUE,TRUE); @@ -1179,8 +1179,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC StepInCommand_should_invoke_the_current_step // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(FALSE,FALSE); Assert.Equal(ULINT#1, _sequencer.CurrentOrder); Assert.Equal(TRUE,_sequencer._step_1.IsActive); @@ -1206,8 +1206,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC StepInCommand_should_invoke_the_current_step_if_Current_step_is_Done_StepIn_should_be_also_Done // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(TRUE,FALSE); Assert.Equal(ULINT#1, _sequencer.CurrentOrder); Assert.Equal(TRUE , _sequencer._step_1.IsActive); @@ -1248,8 +1248,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests Assert.Equal(TRUE , _sequencer._step_2.GetIsDisabled()); // Act - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(TRUE,FALSE); // Assert @@ -1272,7 +1272,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1331,7 +1331,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC StepForward_should_restore_the_currently_executing_step // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1362,7 +1362,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC StepForward_should_prepare_following_step_to_be_ready_to_execute // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1390,7 +1390,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC StepForward_command_should_be_in_done_state_after_succesfull_execution // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1420,7 +1420,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1445,7 +1445,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_sequencer._step_3); _sequencer.StepIn.Invoke(); @@ -1467,7 +1467,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC StepForward_command_should_be_disabled_when_CurrentOrder_is_equal_to_last_step_order - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_sequencer._step_3); THIS.ExecuteSequence(FALSE,FALSE); @@ -1485,7 +1485,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_sequencer._step_3); _sequencer.StepIn.Invoke(); @@ -1548,7 +1548,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_sequencer._step_3); _sequencer.StepIn.Invoke(); @@ -1580,7 +1580,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_sequencer._step_3); _sequencer.StepIn.Invoke(); @@ -1614,7 +1614,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_sequencer._step_3); _sequencer.StepIn.Invoke(); @@ -1644,7 +1644,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_sequencer._step_3); _sequencer.StepIn.Invoke(); @@ -1670,7 +1670,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE,TRUE,FALSE,TRUE); _sequencer.RequestStep(_sequencer._step_3); _sequencer.StepIn.Invoke(); @@ -1692,7 +1692,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC StepBackward_command_should_be_disabled_when_CurrentOrder_is_equal_to_last_step_order - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); Assert.Equal(ULINT#1,_sequencer.CurrentOrder); @@ -1720,7 +1720,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_be_triggered_when_sequence_starts_even_in_step_by_step_mode - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnBeforeSequenceStartCounter()); @@ -1728,7 +1728,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_not_be_triggered_when_sequence_has_been_already_started_even_in_step_by_step_mode - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1737,7 +1737,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_be_triggered_when_sequence_starts_even_in_run_once_mode - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnBeforeSequenceStartCounter()); @@ -1745,7 +1745,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_not_be_triggered_when_sequence_has_been_already_started_even_in_run_once_mode - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); THIS.ExecuteSequence(FALSE,FALSE); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1754,8 +1754,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_be_triggered_when_sequence_starts_even_in_run_once_mode_and_step_by_step_mode - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnBeforeSequenceStartCounter()); @@ -1763,8 +1763,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_not_be_triggered_when_sequence_has_been_already_started_even_in_run_once_mode_and_step_by_step_mode - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1791,7 +1791,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_be_triggered_when_CompleteSequence_is_called_even_in_step_by_step_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnCompleteSequenceCounter()); @@ -1800,7 +1800,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_not_be_triggered_when_CompleteSequence_was_already_called_even_in_step_by_step_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); _sequencer.CompleteSequence(); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); @@ -1810,7 +1810,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_be_triggered_when_CompleteSequence_is_called_even_in_run_once_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnCompleteSequenceCounter()); @@ -1819,7 +1819,7 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_not_be_triggered_when_CompleteSequence_was_already_called_even_in_run_once_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); @@ -1829,8 +1829,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_be_triggered_when_CompleteSequence_is_called_even_in_run_once_mode_and_step_by_step_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnCompleteSequenceCounter()); @@ -1839,8 +1839,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_not_be_triggered_when_CompleteSequence_was_already_called_even_in_run_once_mode_and_step_by_step_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); _sequencer.CompleteSequence(); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); @@ -1853,8 +1853,8 @@ NAMESPACE AXOpen.Core.AxoSequencerContainer_Tests count :ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); diff --git a/src/core/ctrl/test/AxoCoordination/AxoSequencerTests.st b/src/core/ctrl/test/AxoCoordination/AxoSequencerTests.st index 302934a76..4dca3f30e 100644 --- a/src/core/ctrl/test/AxoCoordination/AxoSequencerTests.st +++ b/src/core/ctrl/test/AxoCoordination/AxoSequencerTests.st @@ -927,30 +927,30 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC should_return_the_continous_stepping_mode - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#Continous)); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#Continous)); END_METHOD {Test} METHOD PUBLIC should_return_the_step_by_step_stepping_mode - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); END_METHOD {Test} METHOD PUBLIC should_return_the_cyclic_mode - Assert.Equal(TRUE ,THIS.EqualeAxoSequenceMode(_sequencer.SequenceMode, eAxoSequenceMode#Cyclic)); + Assert.Equal(TRUE ,THIS.EqualeAxoSequenceMode(_sequencer.GetSequenceMode(), eAxoSequenceMode#Cyclic)); END_METHOD {Test} METHOD PUBLIC should_return_the_runonce_mode - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - Assert.Equal(TRUE ,THIS.EqualeAxoSequenceMode(_sequencer.SequenceMode, eAxoSequenceMode#RunOnce)); + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); + Assert.Equal(TRUE ,THIS.EqualeAxoSequenceMode(_sequencer.GetSequenceMode(), eAxoSequenceMode#RunOnce)); END_METHOD {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_set_currently_executed_step_to_Done THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); Assert.Equal(FALSE, _step_3.IsDone()); _sequencer.CompleteSequence(); Assert.Equal(TRUE, _step_3.IsDone()); @@ -959,7 +959,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_reset_the_Busy_state_of_the_currently_executed_step THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); Assert.Equal(TRUE, _step_3.IsBusy()); _sequencer.CompleteSequence(); Assert.Equal(FALSE, _step_3.IsBusy()); @@ -968,7 +968,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_set_the_Current_Order_to_1 THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); Assert.Equal(ULINT#1, _sequencer.CurrentOrder); END_METHOD @@ -976,7 +976,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_set_the_coordinator_state_to_Idle THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); Assert.Equal(TRUE, THIS.EqualAxoCoordinatorStates(AxoCoordinatorStates#Idle , _sequencer.GetCoordinatorState())); END_METHOD @@ -984,7 +984,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_set_the_CurrentOrder_to_1 THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); _context.Close(); @@ -994,7 +994,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_should_stops_the_execution_of_the_active_step_in_the_next_PLC_cycles THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); _context.Close(); @@ -1016,7 +1016,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC RunOnce_mode_CompleteSequence_coordinator_state_should_stay_in_Idle_in_the_next_PLC_cycles THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); _context.Close(); @@ -1053,8 +1053,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC all_stepping_commands_should_be_disabled_when_Sequencer_is_not_running_mode - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.PrepareSequence(); Assert.Equal(TRUE, THIS.EqualAxoCoordinatorStates(AxoCoordinatorStates#Configuring , _sequencer.GetCoordinatorState())); Assert.Equal(TRUE,_sequencer.StepForwardCommand.GetIsDisabled()); @@ -1064,8 +1064,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC StepForward_and_StepIn_commands_should_not_be_disabled_when_Sequencer_is_running_mode - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(TRUE,TRUE); Assert.Equal(TRUE, THIS.EqualAxoCoordinatorStates(AxoCoordinatorStates#Running , _sequencer.GetCoordinatorState())); Assert.Equal(FALSE,_sequencer.StepForwardCommand.GetIsDisabled()); @@ -1074,8 +1074,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC StepBackward_command_should_not_be_disabled_when_Sequencer_is_running_mode_and_CurrentOrder_is_greather_then_one - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(TRUE,TRUE); _sequencer.RequestStep(_step_2); THIS.ExecuteSequence(TRUE,TRUE); @@ -1086,8 +1086,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC StepInCommand_should_invoke_the_current_step // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(FALSE,FALSE); Assert.Equal(ULINT#1, _sequencer.CurrentOrder); Assert.Equal(TRUE,_step_1.IsActive); @@ -1113,8 +1113,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC StepInCommand_should_invoke_the_current_step_if_Current_step_is_Done_StepIn_should_be_also_Done // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(TRUE,FALSE); Assert.Equal(ULINT#1, _sequencer.CurrentOrder); Assert.Equal(TRUE,_step_1.IsActive); @@ -1155,8 +1155,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests Assert.Equal(TRUE ,_step_2.GetIsDisabled()); // Act - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(TRUE,FALSE); // Assert @@ -1179,7 +1179,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1237,7 +1237,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC StepForward_should_restore_the_currently_executing_step // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1266,7 +1266,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC StepForward_should_prepare_following_step_to_be_ready_to_execute // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1296,7 +1296,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC StepForward_command_should_be_in_done_state_after_succesfull_execution // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1326,7 +1326,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1351,7 +1351,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_step_3); _sequencer.StepIn.Invoke(); @@ -1373,7 +1373,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC StepForward_command_should_be_disabled_when_CurrentOrder_is_equal_to_last_step_order - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_step_3); THIS.ExecuteSequence(FALSE,FALSE); @@ -1391,7 +1391,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_step_3); _sequencer.StepIn.Invoke(); @@ -1453,7 +1453,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_step_3); _sequencer.StepIn.Invoke(); @@ -1485,7 +1485,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_step_3); _sequencer.StepIn.Invoke(); @@ -1519,7 +1519,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_step_3); _sequencer.StepIn.Invoke(); @@ -1549,7 +1549,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.RequestStep(_step_3); _sequencer.StepIn.Invoke(); @@ -1575,7 +1575,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests _previousOrder : ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE,TRUE,FALSE,TRUE); _sequencer.RequestStep(_step_3); _sequencer.StepIn.Invoke(); @@ -1597,7 +1597,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC StepBackward_command_should_be_disabled_when_CurrentOrder_is_equal_to_last_step_order - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); Assert.Equal(ULINT#1,_sequencer.CurrentOrder); @@ -1624,7 +1624,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_be_triggered_when_sequence_starts_even_in_step_by_step_mode - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnBeforeSequenceStartCounter()); @@ -1632,7 +1632,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_not_be_triggered_when_sequence_has_been_already_started_even_in_step_by_step_mode - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1641,7 +1641,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_be_triggered_when_sequence_starts_even_in_run_once_mode - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnBeforeSequenceStartCounter()); @@ -1649,7 +1649,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_not_be_triggered_when_sequence_has_been_already_started_even_in_run_once_mode - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); THIS.ExecuteSequence(FALSE,FALSE); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1658,8 +1658,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_be_triggered_when_sequence_starts_even_in_run_once_mode_and_step_by_step_mode - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnBeforeSequenceStartCounter()); @@ -1667,8 +1667,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnBeforeSequenceStart_should_not_be_triggered_when_sequence_has_been_already_started_even_in_run_once_mode_and_step_by_step_mode - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS.ExecuteSequence(FALSE,FALSE); THIS._counter := _sequencer.GetOnBeforeSequenceStartCounter(); THIS.ExecuteSequence(FALSE,FALSE); @@ -1695,7 +1695,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_be_triggered_when_CompleteSequence_is_called_even_in_step_by_step_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnCompleteSequenceCounter()); @@ -1704,7 +1704,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_not_be_triggered_when_CompleteSequence_was_already_called_even_in_step_by_step_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); _sequencer.CompleteSequence(); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); @@ -1714,7 +1714,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_be_triggered_when_CompleteSequence_is_called_even_in_run_once_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnCompleteSequenceCounter()); @@ -1723,7 +1723,7 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_not_be_triggered_when_CompleteSequence_was_already_called_even_in_run_once_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); _sequencer.CompleteSequence(); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); @@ -1733,8 +1733,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_be_triggered_when_CompleteSequence_is_called_even_in_run_once_mode_and_step_by_step_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); Assert.Equal(THIS._counter + ULINT#1,_sequencer.GetOnCompleteSequenceCounter()); @@ -1743,8 +1743,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests {Test} METHOD PUBLIC OnCompleteSequence_should_not_be_triggered_when_CompleteSequence_was_already_called_even_in_run_once_mode_and_step_by_step_mode THIS.ExecuteSequence(TRUE,FALSE); - _sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; + _sequencer.SetSequenceMode(eAxoSequenceMode#RunOnce); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); _sequencer.CompleteSequence(); THIS._counter := _sequencer.GetOnCompleteSequenceCounter(); _sequencer.CompleteSequence(); @@ -1757,8 +1757,8 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests count :ULINT; END_VAR // Arrange - _sequencer.SteppingMode := eAxoSteppingMode#StepByStep; - Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.SteppingMode, eAxoSteppingMode#StepByStep)); + _sequencer.SetSteppingMode(eAxoSteppingMode#StepByStep); + Assert.Equal(TRUE ,THIS.EqualeAxoSteppingMode(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep)); THIS.ExecuteSequence(FALSE,FALSE); _sequencer.StepIn.Invoke(); @@ -1974,5 +1974,46 @@ NAMESPACE AXOpen.Core.AxoSequencer_Tests Assert.Equal(_step_3.StartSignature , ULINT#3); Assert.Equal(counter, UINT#6); END_METHOD + + {Test} + METHOD PUBLIC SwitchToStepModeBeforeEnteringStep_should_set_the_sequencer_into_the_step_mode + // Arrange + _step_1.StepExecutionMode := eAxoStepExecutionMode#ExecuteAndContinue; + _step_2.StepExecutionMode := eAxoStepExecutionMode#SwitchToStepModeBeforeEnteringStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#Continous); + // Act + THIS.ExecuteSequence(FALSE,FALSE); + // Assert + Assert.Equal(_sequencer.GetSteppingMode(), eAxoSteppingMode#Continous); + // Act + THIS.ExecuteSequence(TRUE,FALSE); + // Assert + Assert.Equal(_sequencer.GetSteppingMode(), eAxoSteppingMode#StepByStep); + END_METHOD + + {Test} + METHOD PUBLIC SwitchToStepModeBeforeEnteringStep_should_set_the_step_to_active + // Arrange + _step_1.StepExecutionMode := eAxoStepExecutionMode#ExecuteAndContinue; + _step_2.StepExecutionMode := eAxoStepExecutionMode#SwitchToStepModeBeforeEnteringStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#Continous); + // Act + THIS.ExecuteSequence(TRUE,FALSE); + // Assert + Assert.Equal(_step_2.IsActive,TRUE); + END_METHOD + + {Test} + METHOD PUBLIC SwitchToStepModeBeforeEnteringStep_should_not_invoke_the_step + // Arrange + _step_1.StepExecutionMode := eAxoStepExecutionMode#ExecuteAndContinue; + _step_2.StepExecutionMode := eAxoStepExecutionMode#SwitchToStepModeBeforeEnteringStep; + _sequencer.SetSteppingMode(eAxoSteppingMode#Continous); + // Act + THIS.ExecuteSequence(TRUE,FALSE); + // Assert + Assert.Equal(_step_2.IsBusy(),FALSE); + END_METHOD + END_CLASS END_NAMESPACE \ No newline at end of file diff --git a/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerDebuggerView.razor b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerDebuggerView.razor new file mode 100644 index 000000000..e62e5301b --- /dev/null +++ b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerDebuggerView.razor @@ -0,0 +1,143 @@ +@namespace AXOpen.Core +@inherits RenderableComplexComponentBase + +
+
+
@Localizer["SequencerMonitoredSteps"]
+
+ + + + + + + + + + + + + + + + + + + @if (!MonitoredSteps.Any()) + { + + + + } + else + { + @foreach (var monitored in MonitoredSteps) + { + + + + + + + + } + } + +
@Localizer["SequencerBreakpoint"]@Localizer["Actions"]@Localizer["SequencerOrder"]@Localizer["SequencerDesc"]@Localizer["SequencerRemove"]
@Localizer["SequencerNoMonitoredStepsSelected"]
+ + +
+ @if (monitored.Order == CurrentStepOrder && ShowCurrentStepRunButtons) + { + + } +
+ 		@monitored.Order@monitored.Desc + +
+
+
+ +
+ @Localizer["ViewDetails"] +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + @if (Steps.Count == 0) + { + + + + } + else + { + @foreach (var item in Steps) + { + + + + + + + + + } + } + +
@Localizer["SequencerBreakpoint"]@Localizer["Actions"]@Localizer["SequencerOrder"]@Localizer["SequencerDesc"]@Localizer["SequencerMonitor"]
@Localizer["SequencerNoStepsFound"]
+ + + @if (item.Order == CurrentStepOrder && ShowCurrentStepRunButtons) + { + + + } + @item.Order@item.Desc + +
+
+
+
diff --git a/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerDebuggerView.razor.cs b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerDebuggerView.razor.cs new file mode 100644 index 000000000..0d4cc2145 --- /dev/null +++ b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerDebuggerView.razor.cs @@ -0,0 +1,253 @@ +using AXSharp.Connector; +using AXSharp.Presentation.Blazor.Controls.RenderableContent; +using BlazorContextMenu; +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using System.Linq; +using System.Threading.Tasks; + +namespace AXOpen.Core; + +public partial class AxoSequencerDebuggerView : RenderableComplexComponentBase +{ + private readonly AxoSequencerStepsCollector _collector = new(); + private readonly HashSet _monitoredStepOrders = new(); + private bool _isMonitoredStepsLoaded; + + [Parameter] + public string? Class { get; set; } + + [Inject] + private IJSRuntime JSRuntime { get; set; } = default!; + + + + protected IReadOnlyList Steps { get; private set; } = Array.Empty(); + + private string MonitoredStepsStorageKey => $"axo-sequencer-monitored-steps:{Component.Symbol}"; + + private IEnumerable MonitoredSteps => + Steps.Where(step => _monitoredStepOrders.Contains(step.Order)); + + private bool ShowCurrentStepRunButtons => + Component.CurrentStep is not null + && Component.CurrentStep.StepExecutionMode.LastValue != (short)eAxoStepExecutionMode.ExecuteAndContinue; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + Steps = await _collector.GetFlatSteps( + Component.GetConnector(), + Component, + static (sequence, step) => new FlatAxoStepItem(sequence, step), + static item => item.Order); + StateHasChanged(); + } + + if (!_isMonitoredStepsLoaded) + { + var loaded = await TryLoadMonitoredStepsAsync(); + if (loaded) + { + _isMonitoredStepsLoaded = true; + StateHasChanged(); + } + } + } + private eAxoSteppingMode _currentSteppingMode => (eAxoSteppingMode)this.Component.SteppingMode.LastValue; + private string _currentStepDescription => string.IsNullOrEmpty(this.Component.CurrentStep.Descr.GetCyclic(Thread.CurrentThread.CurrentUICulture)) ? "-" : this.Component.CurrentStep.Descr.GetCyclic(Thread.CurrentThread.CurrentUICulture); + public ulong CurrentStepOrder + { + get + { + ulong order = 0; + if (this.Component.Status.LastValue == (int)eAxoTaskState.Busy) + { + order = (this.Component as AxoSequencer)?.CurrentStep.Order.GetCyclic() ?? default(ulong); + } + + else + { + return order; + } + + return order; + } + } + + + public override void ConfigurePolling() + { + foreach (var step in Component.GetDescendants()) + { + StartPolling(step.Order, 500); + StartPolling(step.StepExecutionMode, 500); + } + StartPolling(this.Component.SteppingMode, 500); + StartPolling(this.Component.CurrentStep.Descr, 500); + + } + + protected async Task ApplyBreakpointConfigurationAsync() + { + foreach (var item in Steps) + { + if (item.BreakpointBeforeExecution) + { + await item.Step.StepExecutionMode.SetAsync((short)eAxoStepExecutionMode.SwitchToStepModeBeforeEnteringStep); + } + + else + { + if (item.Step.StepExecutionMode.LastValue !=(short)eAxoStepExecutionMode.ExecuteAndContinue) + await item.Step.StepExecutionMode.SetAsync((short)eAxoStepExecutionMode.ExecuteAndContinue); + } + } + + StateHasChanged(); + } + + protected async Task ClearAllBreakpointsAsync() + { + foreach (var item in Steps) + { + item.BreakpointBeforeExecution = false; + + } + + await ApplyBreakpointConfigurationAsync(); + await this.Component.SetReqSteppingMode.SetAsync(true); + await this.Component.ReqSteppingMode.SetAsync((short)eAxoSteppingMode.Continous); + StateHasChanged(); + } + + protected async Task RunAsync() + { + await RunCurrentStepAsync(removeBreakpointForCurrentStep: false); + } + + + + + private async Task RunCurrentStepAsync(bool removeBreakpointForCurrentStep) + { + if (Component.CurrentStep is null) + { + return; + } + FlatAxoStepItem item; + + + + item = Steps.FirstOrDefault(step => step.Order == CurrentStepOrder); + if (item is not null) + { + await item.Step.StepExecutionMode.SetAsync((short)eAxoStepExecutionMode.ExecuteAndContinue); + } + + + await this.Component.SetReqSteppingMode.SetAsync(true); + await this.Component.ReqSteppingMode.SetAsync((short)eAxoSteppingMode.Continous); + + if (removeBreakpointForCurrentStep) + { + + if (item is not null) + { + item.BreakpointBeforeExecution = false; + await item.Step.StepExecutionMode.SetAsync((short)eAxoStepExecutionMode.ExecuteAndContinue); + } + } + else + { + + if (item.BreakpointBeforeExecution) + await item.Step.StepExecutionMode.SetAsync((short)eAxoStepExecutionMode.SwitchToStepModeBeforeEnteringStep); + + + } + StateHasChanged(); + } + + private static string GetBeforeBreakpointDotClass(FlatAxoStepItem item) + { + return item.StepExecutionMode == eAxoStepExecutionMode.SwitchToStepModeBeforeEnteringStep + ? "breakpoint-dot-applied" + : string.Empty; + } + + + + private string GetCurrentStepDotClass(FlatAxoStepItem item, bool isChecked) + { + return isChecked && item.Order == CurrentStepOrder + ? "breakpoint-dot-current" + : string.Empty; + } + + private string GetCurrentStepRowClass(FlatAxoStepItem item) + { + return item.Order == CurrentStepOrder + ? "current-step-row" + : string.Empty; + } + + private async Task AddToMonitor(FlatAxoStepItem item) + { + _monitoredStepOrders.Add(item.Order); + await SaveMonitoredStepsAsync(); + StateHasChanged(); + } + + private async Task RemoveFromMonitor(FlatAxoStepItem item) + { + _monitoredStepOrders.Remove(item.Order); + await SaveMonitoredStepsAsync(); + StateHasChanged(); + } + + private bool IsMonitored(FlatAxoStepItem item) + { + return _monitoredStepOrders.Contains(item.Order); + } + + private async Task TryLoadMonitoredStepsAsync() + { + try + { + var storedOrders = await JSRuntime.InvokeAsync("localStorage.getItem", MonitoredStepsStorageKey); + if (string.IsNullOrWhiteSpace(storedOrders)) + { + return true; + } + + _monitoredStepOrders.Clear(); + foreach (var value in storedOrders.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)) + { + if (ulong.TryParse(value, out var parsedOrder)) + { + _monitoredStepOrders.Add(parsedOrder); + } + } + + return true; + } + catch (InvalidOperationException) + { + return false; + } + catch (JSDisconnectedException) + { + return false; + } + } + + private async Task SaveMonitoredStepsAsync() + { + var storedOrders = string.Join(',', _monitoredStepOrders.OrderBy(order => order)); + await JSRuntime.InvokeVoidAsync("localStorage.setItem", MonitoredStepsStorageKey, storedOrders); + } + + +} diff --git a/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerDebuggerView.razor.css b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerDebuggerView.razor.css new file mode 100644 index 000000000..a869cf5fe --- /dev/null +++ b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerDebuggerView.razor.css @@ -0,0 +1,54 @@ +.breakpoint-dot { + appearance: none; + -webkit-appearance: none; + width: 14px; + height: 14px; + border-radius: 9999px; + border: 1px solid #111111; + background-color: #111111; + cursor: pointer; + display: inline-block; + vertical-align: middle; + transition: background-color 120ms ease, border-color 120ms ease, transform 120ms ease; +} + + .breakpoint-dot:checked { + background-color: #fca5a5; + border-color: #dc2626; + border-width: 2px; + } + +.breakpoint-dot.breakpoint-dot-applied { + background-color: #dc2626; + border-color: #dc2626; + +} + +.breakpoint-dot.breakpoint-dot-current { + background-color: #facc15; + border-color: #eab308; + box-shadow: 0 0 0 2px rgba(250, 204, 21, 0.28); +} + +tr.current-step-row > td { + background-color: rgba(250, 204, 21, 0.14); +} + +tr.current-step-row:hover > td { + background-color: rgba(250, 204, 21, 0.22); +} + +.breakpoint-dot:focus-visible { + outline: 2px solid #2563eb; + outline-offset: 2px; +} + +th.breakpoint-col, +td.breakpoint-col { + width: 1%; + min-width: 44px; + white-space: nowrap; + text-align: center; + padding-left: 0.4rem; + padding-right: 0.4rem; +} diff --git a/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerView.razor.cs b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerView.razor.cs index 4517c5876..dc6404fd0 100644 --- a/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerView.razor.cs +++ b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerView.razor.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; using System.Runtime.CompilerServices; using AXSharp.Connector; using Microsoft.AspNetCore.Components; @@ -27,11 +27,13 @@ private async Task ToggleStepMode() if (currentSteppingMode == eAxoSteppingMode.Continous) { - await this.Component.SteppingMode.SetAsync((short)eAxoSteppingMode.StepByStep); + await this.Component.SetReqSteppingMode.SetAsync(true); + await this.Component.ReqSteppingMode.SetAsync((short)eAxoSteppingMode.StepByStep); } else { - await this.Component.SteppingMode.SetAsync((short)eAxoSteppingMode.Continous); + await this.Component.SetReqSteppingMode.SetAsync(true); + await this.Component.ReqSteppingMode.SetAsync((short)eAxoSteppingMode.Continous); } } diff --git a/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/FlatAxoStepItem.cs b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/FlatAxoStepItem.cs new file mode 100644 index 000000000..98a9fd243 --- /dev/null +++ b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/FlatAxoStepItem.cs @@ -0,0 +1,40 @@ +using System.Globalization; + +namespace AXOpen.Core; + +public sealed record FlatAxoStepItem( + AxoSequencerContainer Sequence, + AxoStep Step) +{ + private bool _breakpointBeforeExecution = (eAxoStepExecutionMode)Step.StepExecutionMode.LastValue == eAxoStepExecutionMode.SwitchToStepModeBeforeEnteringStep; + + public ulong Order => Step.Order.LastValue; + + public string Symbol => Step.Symbol ?? string.Empty; + + public string Desc => Step.Descr.GetCyclic(CultureInfo.CurrentUICulture) ?? string.Empty; + + + + public bool BreakpointBeforeExecution + { + get => _breakpointBeforeExecution; + set + { + _breakpointBeforeExecution = value; + + + + + } + } + + public eAxoStepExecutionMode StepExecutionMode => RawStepExecutionMode; + //BreakpointBeforeExecution + // ? eAxoStepExecutionMode.SwitchToStepModeBeforeEnteringStep + // : BreakpointAfterExecution + // ? eAxoStepExecutionMode.SwitchToStepModeAfterLeavingStep + // : RawStepExecutionMode; + + private eAxoStepExecutionMode RawStepExecutionMode => (eAxoStepExecutionMode)Step.StepExecutionMode.LastValue; +}; diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de-DE.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de-DE.resx index 660893a39..45d082839 100644 --- a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de-DE.resx +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de-DE.resx @@ -314,4 +314,52 @@ Alarmcode - \ No newline at end of file + + Sperrkonfiguration senden + + + Vor Ausfuehrung sperren + + + Nach Ausfuehrung sperren + + + Schrittausfuehrungsmodus + + + Keine Schritte gefunden. + + + Uberwachte Schritte + + + Keine uberwachten Schritte ausgewahlt. + + + Haltepunkt + + + Reihenfolge + + + Beschreibung + + + Uberwachen + + + Fortsetzen + + + Entfernen + + + Zur Uberwachung hinzufugen + + + Breakpoints anwenden + + + Alle Breakpoints loschen + + diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de.resx index 279c9f59e..33385484d 100644 --- a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de.resx +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de.resx @@ -171,6 +171,21 @@ aktiv + + Sperrkonfiguration senden + + + Vor Ausfuehrung sperren + + + Nach Ausfuehrung sperren + + + Schrittausfuehrungsmodus + + + Keine Schritte gefunden. + Fehler @@ -255,4 +270,37 @@ Alarm-Code - \ No newline at end of file + + Uberwachte Schritte + + + Keine uberwachten Schritte ausgewahlt. + + + Haltepunkt + + + Reihenfolge + + + Beschreibung + + + Uberwachen + + + Fortsetzen + + + Entfernen + + + Zur Uberwachung hinzufugen + + + Breakpoints anwenden + + + Alle Breakpoints loschen + + diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es-ES.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es-ES.resx index d38bdcd05..c11f36516 100644 --- a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es-ES.resx +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es-ES.resx @@ -314,4 +314,52 @@ Código de alarma - \ No newline at end of file + + Enviar configuracion de suspension + + + Suspender antes de la ejecucion + + + Suspender despues de la ejecucion + + + Modo de ejecucion del paso + + + No se encontraron pasos. + + + Pasos monitorizados + + + No hay pasos monitorizados seleccionados. + + + Punto de interrupcion + + + Orden + + + Descripcion + + + Monitorizar + + + Continuar + + + Quitar + + + Anadir al monitor + + + Aplicar puntos de interrupcion + + + Borrar todos los puntos de interrupcion + + diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es.resx index 96d4fe46c..36437fa5e 100644 --- a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es.resx +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es.resx @@ -171,6 +171,22 @@ activo + + Enviar configuracion de suspension + + + Suspender antes de la ejecucion + + + Suspender despues de la ejecucion + + + Modo de ejecucion del paso + + + No se encontraron pasos. + + Error @@ -255,4 +271,37 @@ Código de alarma - \ No newline at end of file + + Pasos monitorizados + + + No hay pasos monitorizados seleccionados. + + + Punto de interrupcion + + + Orden + + + Descripcion + + + Monitorizar + + + Continuar + + + Quitar + + + Anadir al monitor + + + Aplicar puntos de interrupcion + + + Borrar todos los puntos de interrupcion + + diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.hu-HU.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.hu-HU.resx index 1997bb0de..661e3383b 100644 --- a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.hu-HU.resx +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.hu-HU.resx @@ -314,4 +314,52 @@ Riasztási kód - \ No newline at end of file + + Felfuggesztes konfiguracio kuldese + + + Felfuggesztes vegrehajtas elott + + + Felfuggesztes vegrehajtas utan + + + Lepes vegrehajtasi mod + + + Nem talalhato lepes. + + + Figyelt lepesek + + + Nincs kivalasztott figyelt lepes. + + + Torespont + + + Sorrend + + + Leiras + + + Figyeles + + + Folytatas + + + Eltavolitas + + + Hozzaadas a figyeleshez + + + Torespontok alkalmazasa + + + Osszes torespont torlese + + diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.pl-PL.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.pl-PL.resx index eef4cea96..fc40a011e 100644 --- a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.pl-PL.resx +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.pl-PL.resx @@ -314,4 +314,52 @@ Kod alarmu - \ No newline at end of file + + Wyslij konfiguracje zawieszenia + + + Zawies przed wykonaniem + + + Zawies po wykonaniu + + + Tryb wykonania kroku + + + Nie znaleziono krokow. + + + Monitorowane kroki + + + Nie wybrano monitorowanych krokow. + + + Punkt przerwania + + + Kolejnosc + + + Opis + + + Monitoruj + + + Kontynuuj + + + Usun + + + Dodaj do monitorowanych + + + Zastosuj punkty przerwania + + + Wyczysc wszystkie punkty przerwania + + diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.resx index e6d6783a3..abad415d1 100644 --- a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.resx +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.resx @@ -1,4 +1,4 @@ - + @@ -156,10 +156,10 @@ - Active · Acknowledged + Active � Acknowledged - Active · Unacknowledged + Active � Unacknowledged Cleared @@ -225,7 +225,7 @@ Pending - Active · Ack + Active � Ack @@ -260,4 +260,52 @@ Alarm code - \ No newline at end of file + + Send suspend configuration + + + Suspend before execution + + + Suspend after execution + + + Step execution mode + + + No steps found. + + + Monitored steps + + + No monitored steps selected. + + + Breakpoint + + + Order + + + Desc + + + Monitor + + + Continue + + + Remove + + + Add to monitor + + + Apply breakpoints + + + Clear all breakpoints + + diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk-SK.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk-SK.resx index 7ce98b6ff..a3797fc9e 100644 --- a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk-SK.resx +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk-SK.resx @@ -314,4 +314,52 @@ Kód alarmu - \ No newline at end of file + + Odoslat konfiguraciu pozastavenia + + + Pozastavit pred vykonanim + + + Pozastavit po vykonani + + + Rezim vykonania kroku + + + Nenasli sa ziadne kroky. + + + Monitorované kroky + + + Nie sú vybraté žiadne monitorované kroky. + + + Bod prerušenia + + + Poradie + + + Popis + + + Monitor + + + Pokračovať + + + Odstrániť + + + Pridať do monitoru + + + Použiť body prerušenia + + + Vymazať všetky body prerušenia + + diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk.resx index 6bc6b9d08..323b3b9d0 100644 --- a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk.resx +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk.resx @@ -171,6 +171,21 @@ aktívny + + Odoslat konfiguraciu pozastavenia + + + Pozastavit pred vykonanim + + + Pozastavit po vykonani + + + Rezim vykonania kroku + + + Nenasli sa ziadne kroky. + Chyba @@ -255,4 +270,37 @@ Kód alarmu - \ No newline at end of file + + Monitorované kroky + + + Nie sú vybraté žiadne monitorované kroky. + + + Bod prerušenia + + + Poradie + + + Popis + + + Monitor + + + Pokračovať + + + Odstrániť + + + Pridať do monitoru + + + Použiť body prerušenia + + + Vymazať všetky body prerušenia + + diff --git a/src/core/src/AXOpen.Core/AxoCoordination/AxoSequencerStepsCollector.cs b/src/core/src/AXOpen.Core/AxoCoordination/AxoSequencerStepsCollector.cs new file mode 100644 index 000000000..0a1e04e08 --- /dev/null +++ b/src/core/src/AXOpen.Core/AxoCoordination/AxoSequencerStepsCollector.cs @@ -0,0 +1,122 @@ +using AXOpen.Core; +using AXSharp.Connector; +using System.ComponentModel; +using System.Threading.Tasks; + +namespace AXOpen.Core; + +public sealed class AxoSequencerStepsCollector +{ + public IReadOnlyList GetStepsBySequence(ITwinObject root, string sequenceSymbol) + => GetStepsBySequence(root, sequenceSymbol, static (sequence, step) => new FlatAxoStepItem(sequence, step), static item => item.Order); + + public IReadOnlyList GetStepsBySequence( + ITwinObject root, + string sequenceSymbol, + Func itemFactory, + Func orderSelector) + { + if (string.IsNullOrWhiteSpace(sequenceSymbol)) + { + return Array.Empty(); + } + + var sequence = Traverse(root) + .OfType() + .FirstOrDefault(item => string.Equals(item.Symbol, sequenceSymbol, StringComparison.OrdinalIgnoreCase)); + + if (sequence is null) + { + return Array.Empty(); + } + + return GetStepsBySequence(sequence, itemFactory, orderSelector); + } + + public IReadOnlyList GetStepsBySequence( + AxoSequencerContainer sequence, + Func itemFactory, + Func orderSelector) + { + var items = CollectStepsForSequence(sequence, knownSteps: null, itemFactory); + + return items + .OrderBy(orderSelector) + .ToArray(); + } + + public async Task> GetFlatSteps( + Connector connector, + ITwinObject root, + Func itemFactory, + Func orderSelector) + { + await connector.ReadBatchAsync( + Traverse(root) + .OfType() + .SelectMany(step => new ITwinPrimitive[] { step.Descr, step.Order, step.StepExecutionMode })); + + var items = new List(); + var knownSteps = new HashSet(StringComparer.OrdinalIgnoreCase); + + foreach (var sequence in Traverse(root).OfType()) + { + items.AddRange(CollectStepsForSequence(sequence, knownSteps, itemFactory)); + } + + return items + .OrderBy(orderSelector) + .ToArray(); + } + + private static IReadOnlyList CollectStepsForSequence( + AXOpen.Core.AxoSequencerContainer sequence, + HashSet? knownSteps, + Func itemFactory) + { + var items = new List(); + + foreach (var step in Traverse(sequence).OfType()) + { + if (string.IsNullOrWhiteSpace(step.Symbol)) + { + continue; + } + + if (knownSteps is not null && !knownSteps.Add(step.Symbol)) + { + continue; + } + if (step.Order.LastValue!=0 && step.GetSymbolTail()!="CurrentStep") + { + items.Add(itemFactory(sequence, step)); + } + + } + + return items; + } + + private static IEnumerable Traverse(ITwinObject root) + { + var visited = new HashSet(); + var stack = new Stack(); + stack.Push(root); + + while (stack.Count > 0) + { + var current = stack.Pop(); + if (!visited.Add(current)) + { + continue; + } + + yield return current; + + foreach (var child in current.GetChildren().OfType()) + { + stack.Push(child); + } + } + } +} diff --git a/src/core/src/AXOpen.Core/AxoCoordination/FlatAxoStepItem.cs b/src/core/src/AXOpen.Core/AxoCoordination/FlatAxoStepItem.cs new file mode 100644 index 000000000..79ca86b61 --- /dev/null +++ b/src/core/src/AXOpen.Core/AxoCoordination/FlatAxoStepItem.cs @@ -0,0 +1,39 @@ +using System.Globalization; + +namespace AXOpen.Core; + +public sealed record FlatAxoStepItem( + AxoSequencerContainer Sequence, + AxoStep Step) +{ + private bool _suspendStepBeforeExecution = (eAxoStepExecutionMode)Step.StepExecutionMode.LastValue == eAxoStepExecutionMode.SwitchToStepModeBeforeEnteringStep; + public ulong Order => Step.Order.LastValue; + + public string Symbol => Step.Symbol ?? string.Empty; + + public string Desc => Step.Descr.GetCyclic(CultureInfo.CurrentUICulture) ?? string.Empty; + + + + public bool SuspendStepBeforeExecution + { + get => _suspendStepBeforeExecution; + set + { + _suspendStepBeforeExecution = value; + + + if (value) + { + Step.StepExecutionMode.Cyclic = (short)eAxoStepExecutionMode.SwitchToStepModeBeforeEnteringStep; + } + } + } + + public eAxoStepExecutionMode StepExecutionMode => + SuspendStepBeforeExecution + ? eAxoStepExecutionMode.SwitchToStepModeBeforeEnteringStep + : RawStepExecutionMode; + + private eAxoStepExecutionMode RawStepExecutionMode => (eAxoStepExecutionMode)Step.StepExecutionMode.LastValue; +}; diff --git a/src/core/this.sln b/src/core/this.sln index c6d1424f7..d1a428804 100644 --- a/src/core/this.sln +++ b/src/core/this.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{41C85C70-C257-446F-BB74-7E4E47AD8F3F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{D893A4FB-6364-4919-9A0A-DB176AAD051D}" @@ -31,6 +31,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Secur EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{E83AFBE7-2988-43C2-A453-55E94878C2E4}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{A45F7042-0D12-4B3A-AE07-723C4061C754}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{4184F228-E499-4282-B5A1-4376A6A2F8B0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.ToolBox", "..\toolbox\src\AXOpen.ToolBox\AXOpen.ToolBox.csproj", "{61C92912-711A-4417-9E5A-504420F47EBC}" @@ -101,6 +103,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{426B3BA4-AA2B-44AC-98A9-4E2B826D073E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{501B0833-4B76-40B9-94A8-657CCE4109DE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{740EA12E-CB94-446C-9F94-1933C8A95B2B}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{74599743-E341-4D59-9541-122C4996A6C9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\timers\src", "{FA557D42-4EE1-4808-BEAC-FAF9F7B31F49}" @@ -183,6 +189,10 @@ Global {E83AFBE7-2988-43C2-A453-55E94878C2E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {E83AFBE7-2988-43C2-A453-55E94878C2E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {E83AFBE7-2988-43C2-A453-55E94878C2E4}.Release|Any CPU.Build.0 = Release|Any CPU + {A45F7042-0D12-4B3A-AE07-723C4061C754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A45F7042-0D12-4B3A-AE07-723C4061C754}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A45F7042-0D12-4B3A-AE07-723C4061C754}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A45F7042-0D12-4B3A-AE07-723C4061C754}.Release|Any CPU.Build.0 = Release|Any CPU {4184F228-E499-4282-B5A1-4376A6A2F8B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4184F228-E499-4282-B5A1-4376A6A2F8B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {4184F228-E499-4282-B5A1-4376A6A2F8B0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -237,6 +247,8 @@ Global {E83AFBE7-2988-43C2-A453-55E94878C2E4} = {DF1ADDD7-EF90-4986-A236-38D6D197F1FA} {DF1ADDD7-EF90-4986-A236-38D6D197F1FA} = {C5810367-1907-4BDD-87FE-D3168A847425} {C5810367-1907-4BDD-87FE-D3168A847425} = {426B3BA4-AA2B-44AC-98A9-4E2B826D073E} + {A45F7042-0D12-4B3A-AE07-723C4061C754} = {501B0833-4B76-40B9-94A8-657CCE4109DE} + {501B0833-4B76-40B9-94A8-657CCE4109DE} = {740EA12E-CB94-446C-9F94-1933C8A95B2B} {4184F228-E499-4282-B5A1-4376A6A2F8B0} = {74599743-E341-4D59-9541-122C4996A6C9} {74599743-E341-4D59-9541-122C4996A6C9} = {FA557D42-4EE1-4808-BEAC-FAF9F7B31F49} {FA557D42-4EE1-4808-BEAC-FAF9F7B31F49} = {C1D57900-BC9C-4B3A-80B7-940E47132883} diff --git a/src/data/app/apax.yml b/src/data/app/apax.yml index 850a9ca45..62873b75d 100644 --- a/src/data/app/apax.yml +++ b/src/data/app/apax.yml @@ -1,4 +1,4 @@ -name: "axopen.data-app" +name: "axopen.data-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | 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..b15752c46 100644 --- a/src/data/tests/AXOpen.Data.Tests_L1/ax/apax.yml +++ b/src/data/tests/AXOpen.Data.Tests_L1/ax/apax.yml @@ -1,4 +1,4 @@ -name: "axopen.data.tests_l1" +name: "axopen.data.tests_l1" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | 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..2ab1c85a0 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 @@ -1,4 +1,4 @@ -name: "axopen.integration.tests_l4" +name: "axopen.integration.tests_l4" version: '0.0.0-dev.0' type: app targets: @@ -139,8 +139,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -171,6 +187,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/inspectors/app/apax.yml b/src/inspectors/app/apax.yml index 20302486a..9d73eb004 100644 --- a/src/inspectors/app/apax.yml +++ b/src/inspectors/app/apax.yml @@ -1,4 +1,4 @@ -name: "axopen.inspectors" +name: "axopen.inspectors" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/integrations/app/apax.yml b/src/integrations/app/apax.yml index f46c2146f..a030180a6 100644 --- a/src/integrations/app/apax.yml +++ b/src/integrations/app/apax.yml @@ -1,4 +1,4 @@ -name: "axopen.integrations" +name: "axopen.integrations" version: '0.0.0-dev.0' type: app targets: @@ -142,8 +142,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -174,6 +190,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/io/app/apax.yml b/src/io/app/apax.yml index 45a3d1f2a..506cb68e9 100644 --- a/src/io/app/apax.yml +++ b/src/io/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.io" +name: "app_axopen.io" version: '0.0.0-dev.0' type: app targets: @@ -149,7 +149,19 @@ scripts: 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" + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -180,6 +192,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/probers/app/apax.yml b/src/probers/app/apax.yml index 476f22f25..31710696d 100644 --- a/src/probers/app/apax.yml +++ b/src/probers/app/apax.yml @@ -1,4 +1,4 @@ -name: "probers-app" +name: "probers-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/scripts/all.sh b/src/scripts/all.sh index c66a61894..ba21aac9c 100644 --- a/src/scripts/all.sh +++ b/src/scripts/all.sh @@ -1,4 +1,4 @@ -export GREEN='\033[0;32m' +export GREEN='\033[0;32m' export RED='\033[0;31m' export YELLOW='\033[0;33m' export NC='\033[0m\r\n' # No Color+CRLF diff --git a/src/simatic1500/app/apax.yml b/src/simatic1500/app/apax.yml index 2bcbf44c7..5bd200807 100644 --- a/src/simatic1500/app/apax.yml +++ b/src/simatic1500/app/apax.yml @@ -1,4 +1,4 @@ -name: "simatic1500-app" +name: "simatic1500-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/template.axolibrary/app/apax.yml b/src/template.axolibrary/app/apax.yml index e5b5628a3..1a3907b73 100644 --- a/src/template.axolibrary/app/apax.yml +++ b/src/template.axolibrary/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_apaxappname" +name: "app_apaxappname" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/timers/app/apax.yml b/src/timers/app/apax.yml index 47a90fbbc..b5ca0cb22 100644 --- a/src/timers/app/apax.yml +++ b/src/timers/app/apax.yml @@ -1,4 +1,4 @@ -name: "timers-app" +name: "timers-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/utils/app/apax.yml b/src/utils/app/apax.yml index 181b538ad..4968abe47 100644 --- a/src/utils/app/apax.yml +++ b/src/utils/app/apax.yml @@ -1,4 +1,4 @@ -name: "utils-app" +name: "utils-app" version: '0.0.0-dev.0' type: app targets: @@ -141,8 +141,24 @@ scripts: 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 + 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" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_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 cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_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 cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -173,6 +189,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: |