From a1b4ec01b8e0f57b8c9fc8b9379c21cf6b8fa148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= Date: Mon, 18 Mar 2024 09:26:32 +0100 Subject: [PATCH] Cleanup --- iocsh/cfg/axis.yaml | 17 ----------------- iocsh/plc/plc_cfg.yaml | 9 --------- iocsh/plc/plc_no_ec_fft_sin.plc | 9 --------- iocsh/plc/test.plc | 9 --------- iocsh/test_4ax_box.script | 1 - 5 files changed, 45 deletions(-) delete mode 100644 iocsh/plc/plc_cfg.yaml delete mode 100644 iocsh/plc/plc_no_ec_fft_sin.plc delete mode 100644 iocsh/plc/test.plc diff --git a/iocsh/cfg/axis.yaml b/iocsh/cfg/axis.yaml index 0212a33..cf560ae 100644 --- a/iocsh/cfg/axis.yaml +++ b/iocsh/cfg/axis.yaml @@ -183,20 +183,3 @@ monitoring: # time: # trajectory: 100 # Time allowed outside max diff velo before system init halt # drive: 200 # Time allowed outside max diff velo before system disables drive - -#plc: -# enable: true # Enable axis plc -# externalCommands: true # Allow axis to inputs from PLC -# file: ${PLC_PATH}test.plc -# code: # Sync code -# - "if(static.counter % ${LIMIT} == 0){println('AX PLC: Appended');static.counter:=0;};" # calculate set pos for physical axis -# - "if(not(static.plc_code_loaded)) {static.counter:=static.counter+1;};" -# - ec0.s$(DRV_SLAVE).ONE > 1; # Enable axis if one of master axes is enabled -# - ec0.s$(DRV_SLAVE).ZERO > 1; # calculate set pos for physical axis -# velocity_filter: # Filter used to smother velocity feedforward -# encoder: # Filter plc enc velo -# enable: false # Filter enable -# size: 100 # Filter size -# trajectory: # Filter plc traj velo -# enable: false # Filter enable -# size: 100 # Filter size diff --git a/iocsh/plc/plc_cfg.yaml b/iocsh/plc/plc_cfg.yaml deleted file mode 100644 index 7914e14..0000000 --- a/iocsh/plc/plc_cfg.yaml +++ /dev/null @@ -1,9 +0,0 @@ -macros: LIMIT=1000,TYPE=1 # Macros to pass to this file (also plc.file) -plc: - id: 1 - enable: yes - rateMilliseconds: 1 - file: ${PLC_PATH}test.plc - code: - - "if(static.counter % ${LIMIT} == 0){println('PLC: Appended');static.counter:=0;};" # calculate set pos for physical axis - - "if(not(static.plc_code_loaded)) {static.counter:=static.counter+1;};" diff --git a/iocsh/plc/plc_no_ec_fft_sin.plc b/iocsh/plc/plc_no_ec_fft_sin.plc deleted file mode 100644 index 3491427..0000000 --- a/iocsh/plc/plc_no_ec_fft_sin.plc +++ /dev/null @@ -1,9 +0,0 @@ -############################################################################################### -# For help on syntax, variables and functions, please read the file: "plcSyntaxHelp.plc" -# -# PLC Functionality Demo: -# No hardware related variables -# - -static.time:=ec_get_time()/1E9; -static.sineval:=sin(2*pi*${FREQ=10}*static.time); diff --git a/iocsh/plc/test.plc b/iocsh/plc/test.plc deleted file mode 100644 index df6bb5c..0000000 --- a/iocsh/plc/test.plc +++ /dev/null @@ -1,9 +0,0 @@ -static.counter:=static.counter+1; -static.plc_code_loaded:=1; -if(static.counter % ${LIMIT} == 0) { - if(${TYPE}=0) { - println('AX PLC: File'); - } else { - println('PLC : File'); - }; -}; diff --git a/iocsh/test_4ax_box.script b/iocsh/test_4ax_box.script index e6f6af2..3a0c51b 100644 --- a/iocsh/test_4ax_box.script +++ b/iocsh/test_4ax_box.script @@ -45,7 +45,6 @@ ecmcConfigOrDie "Cfg.EcApplyConfig(1)" ## AXIS 1 # epicsEnvSet("DEV", "$(IOC)") -epicsEnvSet("PLC_PATH", "/ioc/c6025a5a/ecmccfg/examples/test/ecmccomp/plc/") ${SCRIPTEXEC} ${ECMC_CONFIG_ROOT}loadYamlAxis.cmd, "FILE=./cfg/axis.yaml" ##############################################################################