From 7487fa9449de23812c2e5da4dcc4f8739b801209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= <anders.sandstroem@psi.ch> Date: Mon, 11 Nov 2024 15:12:19 +0100 Subject: [PATCH] EL7*: Chaneg velo EGU to RAW --- db/Beckhoff_7XXX/ecmcEL7031-chX.template | 4 +- db/Beckhoff_7XXX/ecmcEL7037-chX.template | 4 +- db/Beckhoff_7XXX/ecmcEL7037_CSP-chX.template | 4 +- db/Beckhoff_7XXX/ecmcEL72XX_DRV.template | 4 +- db/Beckhoff_7XXX/ecmcEL7332-chX.template | 4 +- db/Beckhoff_7XXX/ecmcEL7342-chX.template | 4 +- qt/ecmcEL5021.ui | 39 ++++++++++++++++++++ 7 files changed, 51 insertions(+), 12 deletions(-) diff --git a/db/Beckhoff_7XXX/ecmcEL7031-chX.template b/db/Beckhoff_7XXX/ecmcEL7031-chX.template index c9a704dc1..259262272 100644 --- a/db/Beckhoff_7XXX/ecmcEL7031-chX.template +++ b/db/Beckhoff_7XXX/ecmcEL7031-chX.template @@ -56,7 +56,7 @@ record(ai,"${ECMC_P}Drv${CH_ID}-Spd-RB"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=V)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=7)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") @@ -78,7 +78,7 @@ record(ao,"${ECMC_P}Drv${CH_ID}-Spd"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=V)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=7)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") diff --git a/db/Beckhoff_7XXX/ecmcEL7037-chX.template b/db/Beckhoff_7XXX/ecmcEL7037-chX.template index 0e478e96d..a21ba198a 100644 --- a/db/Beckhoff_7XXX/ecmcEL7037-chX.template +++ b/db/Beckhoff_7XXX/ecmcEL7037-chX.template @@ -56,7 +56,7 @@ record(ai,"${ECMC_P}Drv${CH_ID}-Spd-RB"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=V)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=7)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") @@ -78,7 +78,7 @@ record(ao,"${ECMC_P}Drv${CH_ID}-Spd"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=V)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=7)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") diff --git a/db/Beckhoff_7XXX/ecmcEL7037_CSP-chX.template b/db/Beckhoff_7XXX/ecmcEL7037_CSP-chX.template index e76d14ff6..6fa27e311 100644 --- a/db/Beckhoff_7XXX/ecmcEL7037_CSP-chX.template +++ b/db/Beckhoff_7XXX/ecmcEL7037_CSP-chX.template @@ -25,7 +25,7 @@ record(ai,"${ECMC_P}Drv${CH_ID}-PosCmd-RB"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=V)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=7)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") @@ -47,7 +47,7 @@ record(ao,"${ECMC_P}Drv${CH_ID}-PosCmd"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=V)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=7)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") diff --git a/db/Beckhoff_7XXX/ecmcEL72XX_DRV.template b/db/Beckhoff_7XXX/ecmcEL72XX_DRV.template index fd127bcf2..2b5ad1a85 100644 --- a/db/Beckhoff_7XXX/ecmcEL72XX_DRV.template +++ b/db/Beckhoff_7XXX/ecmcEL72XX_DRV.template @@ -26,7 +26,7 @@ record(ai,"${ECMC_P}Drv${CH_ID}-Spd-RB"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=3)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") @@ -49,7 +49,7 @@ record(ao,"${ECMC_P}Drv${CH_ID}-Spd"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=3)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") diff --git a/db/Beckhoff_7XXX/ecmcEL7332-chX.template b/db/Beckhoff_7XXX/ecmcEL7332-chX.template index dc01cb345..5ab12a38f 100644 --- a/db/Beckhoff_7XXX/ecmcEL7332-chX.template +++ b/db/Beckhoff_7XXX/ecmcEL7332-chX.template @@ -24,7 +24,7 @@ record(ai,"${ECMC_P}Drv${CH_ID}-Spd-RB"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=V)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=7)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") @@ -45,7 +45,7 @@ record(ao,"${ECMC_P}Drv${CH_ID}-Spd"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=V)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=7)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") diff --git a/db/Beckhoff_7XXX/ecmcEL7342-chX.template b/db/Beckhoff_7XXX/ecmcEL7342-chX.template index 2bd230bf9..50910fc07 100644 --- a/db/Beckhoff_7XXX/ecmcEL7342-chX.template +++ b/db/Beckhoff_7XXX/ecmcEL7342-chX.template @@ -25,7 +25,7 @@ record(ai,"${ECMC_P}Drv${CH_ID}-Spd-RB"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=V)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=7)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") @@ -47,7 +47,7 @@ record(ao,"${ECMC_P}Drv${CH_ID}-Spd"){ field(LINR, "$(LINR=SLOPE)") field(ESLO, "$(ESLO=1)") field(EOFF, "$(EOFF=0)") - field(EGU, "$(EGU=)") + field(EGU, "$(EGU=RAW)") field(PREC, "$(PREC=7)") field(LOW, "$(LOW=0)") field(LOLO, "$(LOLO=0)") diff --git a/qt/ecmcEL5021.ui b/qt/ecmcEL5021.ui index 5d93b961f..68d714415 100644 --- a/qt/ecmcEL5021.ui +++ b/qt/ecmcEL5021.ui @@ -314,6 +314,45 @@ </property> </widget> </widget> + <widget class="caLabel" name="calabel_10"> + <property name="geometry"> + <rect> + <x>0</x> + <y>145</y> + <width>51</width> + <height>21</height> + </rect> + </property> + <property name="text"> + <string>Latch pos:</string> + </property> + </widget> + <widget class="caLineEdit" name="calineedit_2"> + <property name="geometry"> + <rect> + <x>10</x> + <y>163</y> + <width>86</width> + <height>16</height> + </rect> + </property> + <property name="channel" stdset="0"> + <string notr="true">$(IOC):m$(MasterID)s$(SlaveID)-Enc01-LtchPosAct</string> + </property> + <property name="background"> + <color alpha="0"> + <red>160</red> + <green>160</green> + <blue>164</blue> + </color> + </property> + <property name="colorMode"> + <enum>caLineEdit::Static</enum> + </property> + <property name="precisionMode"> + <enum>caLineEdit::User</enum> + </property> + </widget> </widget> <customwidgets> <customwidget>