diff --git a/Db/ss1.template b/Db/ss1.template index da1dab2..3645680 100644 --- a/Db/ss1.template +++ b/Db/ss1.template @@ -51,11 +51,11 @@ record(bi,"${P}SS1-${NAME}-AxsStndStllAct"){ field(ONAM, "Standstill") field(ZSV, "NO_ALARM") field(OSV, "NO_ALARM") - field(FLNK, "${P}SS1-${NAME}-RedVeloAct.PROC") + field(FLNK, "${P}SS1-${NAME}-RedVeloCmdAct.PROC") } # // bit 3 reduce velo active -record(bi,"${P}SS1-${NAME}-RedVeloAct"){ +record(bi,"${P}SS1-${NAME}-RedVeloCmdAct"){ field(DESC, "SS1-${NAME}: Reduce velo active") field(INP, "${P}SS1-${NAME}-Stat_.B3") field(ZNAM, "Not Active") diff --git a/iocsh/cfg/axis.yaml b/iocsh/cfg/axis.yaml index da7c169..4db5aad 100644 --- a/iocsh/cfg/axis.yaml +++ b/iocsh/cfg/axis.yaml @@ -68,7 +68,6 @@ input: forward: ec0.s$(DRV_SID).driveStatus01.12 # Ethercat entry for low limit switch input backward: ec0.s$(DRV_SID).driveStatus01.11 # Ethercat entry for high limit switch input home: 'ec0.s$(DRV_SID).ONE.0' # Ethercat entry for home switch - interlock: 'ec0.s$(DRV_SID).ONE.0' # Ethercat entry for interlock switch input softlimits: enable: true # Enable soft limits diff --git a/iocsh/test_lab_rack.script b/iocsh/test_lab_rack.script index a5e8a26..9f76462 100644 --- a/iocsh/test_lab_rack.script +++ b/iocsh/test_lab_rack.script @@ -72,4 +72,3 @@ ${SCRIPTEXEC} ${ecmc_plugin_safety_DIR}addSS1Group.cmd "NAME=first,EC_RAMP_DOWN_ #- VELO_REST_LIM : Velocity at rest limit [unit same as EGU of axis] #- VELO_MAX_LIM : Velocity maximum limit, -1 to disable [unit same as EGU of axis] ${SCRIPTEXEC} ${ecmc_plugin_safety_DIR}addAxisToSafetyGroup.cmd "NAME=first,AX_ID=1,VELO_REST_LIM=0.01,VELO_MAX_LIM=0.1" - diff --git a/qt/ecmc_plugin_safety_main.ui b/qt/ecmc_plugin_safety_main.ui new file mode 100644 index 0000000..eaf5199 --- /dev/null +++ b/qt/ecmc_plugin_safety_main.ui @@ -0,0 +1,83 @@ + + + Form + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + 100 + 80 + 30 + 30 + + + + $(IOC):SS1$(SAFETY_GROUP)-AxsStndStllAct + + + + + + 140 + 80 + 116 + 28 + + + + Axis at rest + + + + + + 140 + 115 + 206 + 28 + + + + Rampdown cmd active + + + + + + 100 + 115 + 30 + 30 + + + + $(IOC):SS1$(SAFETY_GROUP)-RmpDwnCmdAct + + + + + + caLabel + QLabel +
caLabel
+
+ + caLed + QWidget +
caLed
+
+
+ + +
diff --git a/qt/test_plugin.ui b/qt/test_plugin.ui new file mode 100644 index 0000000..33f6578 --- /dev/null +++ b/qt/test_plugin.ui @@ -0,0 +1,143 @@ + + + Form + + + + 0 + 0 + 525 + 312 + + + + Form + + + + + 120 + 70 + 41 + 151 + + + + $(IOC):m$(M_ID=0)s$(BI_S_ID)-One + + + 1 + + + + + + 120 + 235 + 56 + 51 + + + + $(IOC):m$(M_ID=0)s$(BO_S_ID)-Zero + + + 0 + + + + + + 160 + 100 + 90 + 28 + + + + E-Stop + + + + + + 170 + 170 + 121 + 28 + + + + Reduce velo + + + + + + 170 + 245 + 116 + 28 + + + + Axis at rest + + + + + + 405 + 255 + 100 + 22 + + + + $(IOC):m$(M_ID=0)s$(BI_S_ID)-One + + + + + + 20 + 30 + 426 + 28 + + + + Simulation of motion safety box + + + + + + caTextEntry + caLineEdit +
caTextEntry
+
+ + caByteController + QWidget +
caByteController
+
+ + caLabel + QLabel +
caLabel
+
+ + caLineEdit + QLineEdit +
caLineEdit
+
+ + caByte + QWidget +
caByte
+
+
+ + +