Add more data to db

This commit is contained in:
2025-02-26 14:51:27 +01:00
parent 4df2642299
commit bddba4be91
5 changed files with 83 additions and 14 deletions

View File

@@ -11,3 +11,15 @@ record(bi,"${AXIS_PREFIX}-SS1-EnaAct"){
field(ONAM, "1")
field(ZNAM, "0")
}
record(ai,"${AXIS_PREFIX}-SS1-VelMaxLim"){
field(DESC, "Velocity max limit (not safety...)")
field(VAL, ${VEL_MAX_LIM=-1})
field(PREC, 3)
}
record(ai,"${AXIS_PREFIX}-SS1-VelRestLim"){
field(DESC, "Velocity rest limit (not safety...)")
field(VAL, ${VEL_REST_LIM=-1})
field(PREC, 3)
}

View File

@@ -64,6 +64,14 @@ record(bi,"${P}SS1-${NAME}-RedVeloCmdAct"){
field(OSV, "NO_ALARM")
}
record(ai,"$(P)SS1-${NAME}-Dly") {
field(DESC, "Power off delay [ms]")
field(EGU, "ms")
field(VAL, "$(DELAY=0)")
field(PREC, "0")
}
record(stringin,"$(P)SS1-Grp${ID=0}-Nam") {
field(DESC, "Name of Grp ${ID=0}")
field(VAL, "${NAME}")

View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>311</width>
<height>227</height>
<height>269</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,7 +19,7 @@
<x>5</x>
<y>35</y>
<width>296</width>
<height>121</height>
<height>151</height>
</rect>
</property>
<property name="title">
@@ -28,14 +28,14 @@
<widget class="caLabel" name="calabel_6">
<property name="geometry">
<rect>
<x>45</x>
<x>10</x>
<y>60</y>
<width>206</width>
<height>28</height>
</rect>
</property>
<property name="text">
<string>Reduced velo cmd active</string>
<string>Reduced velo cmd active:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -44,7 +44,7 @@
<widget class="caLed" name="caled_2">
<property name="geometry">
<rect>
<x>10</x>
<x>245</x>
<y>30</y>
<width>30</width>
<height>30</height>
@@ -71,7 +71,7 @@
<widget class="caLed" name="caled_3">
<property name="geometry">
<rect>
<x>10</x>
<x>245</x>
<y>60</y>
<width>30</width>
<height>30</height>
@@ -98,14 +98,14 @@
<widget class="caLabel" name="calabel_5">
<property name="geometry">
<rect>
<x>45</x>
<x>10</x>
<y>30</y>
<width>246</width>
<height>28</height>
</rect>
</property>
<property name="text">
<string>Rampdown cmd active (E-STOP)</string>
<string>E-Stop (rampdown cmd active):</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -114,14 +114,14 @@
<widget class="caLabel" name="calabel_4">
<property name="geometry">
<rect>
<x>45</x>
<x>10</x>
<y>90</y>
<width>251</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>Axis at rest</string>
<string>Axis at rest:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -130,7 +130,7 @@
<widget class="caLed" name="caled">
<property name="geometry">
<rect>
<x>10</x>
<x>245</x>
<y>88</y>
<width>30</width>
<height>30</height>
@@ -154,6 +154,50 @@
</color>
</property>
</widget>
<widget class="caLineEdit" name="calineedit_47">
<property name="geometry">
<rect>
<x>225</x>
<y>120</y>
<width>61</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="channel" stdset="0">
<string notr="true">$(IOC):SS1-$(SAFETY_GRP)-Dly</string>
</property>
<property name="colorMode">
<enum>caLineEdit::Default</enum>
</property>
<property name="alarmHandling">
<enum>caLineEdit::onBackground</enum>
</property>
<property name="precisionMode">
<enum>caLineEdit::Channel</enum>
</property>
</widget>
<widget class="caLabel" name="calabel_7">
<property name="geometry">
<rect>
<x>10</x>
<y>115</y>
<width>206</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>Power off delay [ms]:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</widget>
<widget class="caLabel" name="calabel">
<property name="geometry">
@@ -175,7 +219,7 @@
<property name="geometry">
<rect>
<x>10</x>
<y>160</y>
<y>195</y>
<width>291</width>
<height>61</height>
</rect>
@@ -211,6 +255,11 @@ dedicated safety system.</string>
<extends>QWidget</extends>
<header>caLed</header>
</customwidget>
<customwidget>
<class>caLineEdit</class>
<extends>QLineEdit</extends>
<header>caLineEdit</header>
</customwidget>
<customwidget>
<class>caMultiLineString</class>
<extends>QPlainTextEdit</extends>

View File

@@ -32,4 +32,4 @@
ecmcAddAxisToSafetyGroup("${NAME}",${AX_ID},${VELO_REST_LIM=0},0,${VELO_MAX_LIM=0.0})
#- Load SS1 axis records
dbLoadRecords("ecmcSS1Axis.template","AXIS_PREFIX=${ECMC_MOTOR_1_FULL_NAME=},NAME=${NAME}")
dbLoadRecords("ecmcSS1Axis.template","AXIS_PREFIX=${ECMC_MOTOR_${AX_ID}_FULL_NAME=},NAME=${NAME},VEL_MAX_LIM=${VELO_MAX_LIM=0.0},VEL_REST_LIM=${VELO_REST_LIM=0.0}")

View File

@@ -36,5 +36,5 @@ ecmcAddSS1SafetyGroup("${NAME}","${EC_RAMP_DOWN_CMD}","${EC_AXES_AT_REST_STAT}",
ecmcEpicsEnvSetCalc(ECMC_PLG_SAFETY_GRP_CNT, "${ECMC_PLG_SAFETY_GRP_CNT=0}+1", "%02d")
#- Load SS1 group records
dbLoadRecords("ecmcSS1Group.template","P=${ECMC_PREFIX},NAME=${NAME},ID=${ECMC_PLG_SAFETY_GRP_CNT},COUNT=${ECMC_PLG_SAFETY_GRP_CNT}")
dbLoadRecords("ecmcSS1Group.template","P=${ECMC_PREFIX},NAME=${NAME},ID=${ECMC_PLG_SAFETY_GRP_CNT},COUNT=${ECMC_PLG_SAFETY_GRP_CNT},DELAY=${DELAY_MS=0}")