Skip to content

Commit

Permalink
Merge branch 'paulscherrerinstitute:master' into phytron522005
Browse files Browse the repository at this point in the history
  • Loading branch information
cdn-lnk authored Feb 15, 2024
2 parents 33facc2 + 4e11fa9 commit b495214
Show file tree
Hide file tree
Showing 257 changed files with 1,640 additions and 379 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ tools

.venv
hugo/content/source/

*.pyc
7 changes: 3 additions & 4 deletions Changelog.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PVs changed:

* Update ecmcEL7037_PosIF-chX.template
** "StartType" to "StrtType", affetced terminals:
*** EL7037 in position interface
*** EL7037 in position interface

* Update ecmcEL60X2-chX.template
** "Array" to "Arr", affected terminals:
Expand Down Expand Up @@ -60,7 +60,7 @@ PVs changed:
*** EL3702

* Update of ecmcEL5101-chX.template
** "LtchAutRstSp" to "LchAutRstSp", affected terminals:
** "LtchAutRstSp" to "LchAutRstSp", affected terminals:
*** EL5101
*** EL5101_32bit
*** EL7031
Expand Down Expand Up @@ -88,7 +88,7 @@ PVs changed:
*** EL7041
*** EL7041-1000
*** EL7047

* Update of ecmcEL7332-chX.template:
** "SyncErr-Alrm" to "SyncErrAlrm"
** "Stl-Alrm" to "StlAlrm"
Expand Down Expand Up @@ -136,4 +136,3 @@ These features need to be tested for the v8 release!
- `ECMC` version `ruckig` (aka `v8`): Due to a fixed typo in the `ECMC` command set, which required a fix in the `jinja2` templates.

v7.0.0

2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
theme: jekyll-theme-slate
theme: jekyll-theme-slate
1 change: 0 additions & 1 deletion db/Beckhoff_3XXX/ecmcEL3114.substitutions
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ file "ecmc_status_analog-chX.template"
{03, "AI"}
{04, "AI"}
}

7 changes: 7 additions & 0 deletions db/Beckhoff_5XXX/ecmcEL5032.substitutions
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# use the EL5042 template, as the process image is identical
file "ecmcEL5042-chX.template"
{
pattern {CH_ID}
{01 }
{02 }
}
1 change: 1 addition & 0 deletions db/Beckhoff_5XXX/ecmcEL5042-chX.template
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# TODO: rename to match EL5032 and EL5042, and potentially more.
record(ai,"${ECMC_P}Enc${CH_ID}-PosAct"){
field(DESC, "$(HWTYPE): CH$(CH_ID): Actual position")
field(PINI, "$(PINI=1)")
Expand Down
2 changes: 1 addition & 1 deletion db/Beckhoff_5XXX/ecmcEL5101-0011.substitutions
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
file "ecmcEL5101-0011-chX.template"
{
pattern { CH_ID, DTYP, FTVL }
{ 01, asynInt32ArrayIn, LONG }
{ 01, asynInt32ArrayIn, LONG }
}
6 changes: 3 additions & 3 deletions db/Beckhoff_6XXX/ecmcEL6090_counter-chX.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ record(ai,"${ECMC_P}Cntr${CH_ID}-Act"){
field(DESC, "$(HWTYPE): Counter value")
field(PINI, "$(PINI=1)")
field(DTYP, "asynInt32")
field(INP, "@asyn(${PORT},${ADDR=0},${TIMEOUT=1})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.counterActual${CH_ID}?")
field(INP, "@asyn(${PORT},${ADDR=0},${TIMEOUT=1})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.counterActual${CH_ID}?")
field(SCAN, "I/O Intr")
field(LINR, "$(LINR=SLOPE)")
field(ESLO, "$(ESLO=1)")
Expand All @@ -25,7 +25,7 @@ record(bo,"${ECMC_P}Cntr${CH_ID}-Incr"){
field(PINI, "$(PINI=1)")
field(DESC, "$(DESC=$(HWTYPE)): inc counter")
field(DTYP, "asynInt32")
field(OUT, "@asyn(${PORT},${ADDR=0},${TIMEOUT=1})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.counterIncrement${CH_ID}=")
field(OUT, "@asyn(${PORT},${ADDR=0},${TIMEOUT=1})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.counterIncrement${CH_ID}=")
field(ZNAM, "$(ZNAM=Zero)")
field(ONAM, "$(ONAM=One)")
field(ZSV, "$(ZSV=NO_ALARM)")
Expand All @@ -38,7 +38,7 @@ record(bo,"${ECMC_P}Cntr${CH_ID}-Rst"){
field(PINI, "$(PINI=1)")
field(DESC, "$(DESC=$(HWTYPE)): reset counter")
field(DTYP, "asynInt32")
field(OUT, "@asyn(${PORT},${ADDR=0},${TIMEOUT=1})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.counterReset${CH_ID}=")
field(OUT, "@asyn(${PORT},${ADDR=0},${TIMEOUT=1})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.counterReset${CH_ID}=")
field(ZNAM, "$(ZNAM=Zero)")
field(ONAM, "$(ONAM=One)")
field(ZSV, "$(ZSV=NO_ALARM)")
Expand Down
6 changes: 3 additions & 3 deletions db/Beckhoff_6XXX/ecmcEL6090_timer-chX.template
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
record(ai,"${ECMC_P}Tmr${CH_ID}-Act"){
field(DESC, "$(HWTYPE): Timer value")
field(PINI, "$(PINI=1)")
field(DTYP, "asynInt32")
field(INP, "@asyn(${PORT},${ADDR=0},${TIMEOUT=1})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.timerActual${CH_ID}?")
field(DTYP, "asynInt32")
field(INP, "@asyn(${PORT},${ADDR=0},${TIMEOUT=1})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.timerActual${CH_ID}?")
field(SCAN, "I/O Intr")
field(LINR, "$(LINR=SLOPE)")
field(ESLO, "$(ESLO=1)")
Expand Down Expand Up @@ -38,7 +38,7 @@ record(bo,"${ECMC_P}Tmr${CH_ID}-Rst"){
field(PINI, "$(PINI=1)")
field(DESC, "$(DESC=$(HWTYPE)): reset timer")
field(DTYP, "asynInt32")
field(OUT, "@asyn(${PORT},${ADDR=0},${TIMEOUT=1})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.timerReset${CH_ID}=")
field(OUT, "@asyn(${PORT},${ADDR=0},${TIMEOUT=1})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.timerReset${CH_ID}=")
field(ZNAM, "$(ZNAM=Zero)")
field(ONAM, "$(ONAM=One)")
field(ZSV, "$(ZSV=NO_ALARM)")
Expand Down
8 changes: 4 additions & 4 deletions db/Beckhoff_6XXX/ecmcEL60X2-chX.template
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ record(longout,"${ECMC_P}Ch${CH_ID}-Cmd"){
field(DESC, "$(HWTYPE): Serial $(CH_ID): Control word")
field(PINI, "$(PINI=1)")
field(DTYP, "asynInt32")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt32/ec$(MASTER_ID).s$(SLAVE_POS).control${CH_ID}=")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt32/ec$(MASTER_ID).s$(SLAVE_POS).control${CH_ID}=")
}

###########################################################################################
Expand Down Expand Up @@ -110,7 +110,7 @@ record(bi,"${ECMC_P}Ch${CH_ID}-OvrrunAlrm"){
field(ZNAM, "Overrun OK")
field(ONAM, "Overrun Error")
field(ZSV, "NO_ALARM")
field(OSV, "MAJOR")
field(OSV, "MAJOR")
}

#record(mbboDirect,"${ECMC_P}Ch${CH_ID}-Cmd_"){
Expand All @@ -131,7 +131,7 @@ record(bi,"${ECMC_P}Ch${CH_ID}-OvrrunAlrm"){
#}

#record(bo,"${ECMC_P}Ch${CH_ID}-CtrlRA"){
# field(PINI, "$(PINI=YES)")
# field(PINI, "$(PINI=YES)")
# field(DESC, "$(DESC=$(HWTYPE): Receive Accepted)")
# field(SCAN, "Passive")
# field(OUT, "${ECMC_P}Ch${CH_ID}-Cmd_.B1 PP")
Expand All @@ -141,7 +141,7 @@ record(bi,"${ECMC_P}Ch${CH_ID}-OvrrunAlrm"){
#}

#record(bo,"${ECMC_P}Ch${CH_ID}-CtrlIR"){
# field(PINI, "$(PINI=YES)")
# field(PINI, "$(PINI=YES)")
# field(DESC, "$(DESC=$(HWTYPE): Init Request)")
# field(SCAN, "Passive")
# field(OUT, "${ECMC_P}Ch${CH_ID}-Cmd_.B2 PP")
Expand Down
4 changes: 2 additions & 2 deletions db/Beckhoff_7XXX/ecmcEL7342-chX.template
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ record(bi,"${ECMC_P}Drv${CH_ID}-TrqRed"){
field(FLNK, "${ECMC_P}Dev-BI01")
}

# These are the same for both status words.. This tempalte will be loaded twice but the
# These are the same for both status words.. This tempalte will be loaded twice but the
# recordnames are the same resulting in only one record
record(bi,"${ECMC_P}Dev-BI01"){
field(DESC, "$(HWTYPE): Digital Input 1")
Expand All @@ -152,7 +152,7 @@ record(bi,"${ECMC_P}Dev-BI01"){
field(FLNK, "${ECMC_P}Dev-BI02")
}

# These are the same for both status words.. This tempalte will be loaded twice but the
# These are the same for both status words.. This tempalte will be loaded twice but the
# recordnames are the same resulting in only one record
record(bi,"${ECMC_P}Dev-BI02"){
field(DESC, "$(HWTYPE): Digital Input 1")
Expand Down
4 changes: 2 additions & 2 deletions db/Beckhoff_7XXX/ecmcEL7342.substitutions
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ file "ecmcEL7342-chX.template"
{
pattern {CH_ID}
{01 }
{02 }
{02 }
}

file "ecmcEL5101-chX.template"
{
pattern {CH_ID}
{01 }
{02 }
{02 }
}
6 changes: 3 additions & 3 deletions db/Beckhoff_9XXX/ecmcEL9227-5500-chX.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ record(mbbiDirect,"${ECMC_P}CH${CH_ID}-StatW01"){
}

record(mbbiDirect,"${ECMC_P}CH${CH_ID}-StatW02"){
field(DESC, "$(HWTYPE): Status Word 2")
field(DESC, "$(HWTYPE): Status Word 2")
field(DTYP, "Raw Soft Channel")
field(INP, "${ECMC_P}CH${CH_ID}-StatW01.RVAL")
field(INP, "${ECMC_P}CH${CH_ID}-StatW01.RVAL")
field(FLNK, "${ECMC_P}CH${CH_ID}-EnaAct.PROC")
field(SHFT, "16")
field(TSE, "$(TSE=-2)")
Expand Down Expand Up @@ -194,7 +194,7 @@ record(bi,"${ECMC_P}CH${CH_ID}-SwtchAlrm"){
field(ZNAM, "OK")
field(ONAM, "Switch Alarm")
field(ZSV, "NO_ALARM")
field(OSV, "MAJOR")
field(OSV, "MAJOR")
}

record(ai,"${ECMC_P}CH${CH_ID}-LoadAct"){
Expand Down
1 change: 0 additions & 1 deletion db/Festo/ecmcFesto-CMM-ST.template
Original file line number Diff line number Diff line change
Expand Up @@ -288,4 +288,3 @@ record(ai,"${ECMC_P}Drv${CH_ID}-TorAct"){
field(HHSV, "$(HHSV=NO_ALARM)")
field(TSE, "$(TSE=-2)")
}

1 change: 0 additions & 1 deletion db/Festo/ecmcFesto-CMMT-ST.substitutions
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ file "ecmcFesto-CMM-ST.template" { pattern
{ CH_ID }
{ 01 }
}

1 change: 0 additions & 1 deletion db/core/ecmcAxFirstAxis.db
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ record(ao,"${P}MCU-Cfg-AX-FrstObjId") {
field(DESC, "First axis ID")
field(VAL, "$(FIRST_OBJ_ID=-1)")
}

1 change: 0 additions & 1 deletion db/core/ecmcAxPrevAxis.db
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
record(ao,"$(PREV_ECMC_P)NxtObjId") {
field(VAL, "$(NEXT_OBJ_ID=-1)")
}

14 changes: 7 additions & 7 deletions db/core/ecmcAxis.db
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ record(bo,"${P}${AXIS_NAME}-TrjSrcTyp-Cmd"){
field(TSE, "0")
}

record(bo,"${P}${AXIS_NAME}-PLC-EnaCmd"){
record(bo,"${P}${AXIS_NAME}-PLC-EnaCmd"){
field(DESC, "${AXIS_NAME}: PLC enable cmd")
field(OUT, "${P}${AXIS_NAME}-Cmd_.B6")
field(ZNAM, "disable")
Expand Down Expand Up @@ -448,7 +448,7 @@ record(bo,"${P}${AXIS_NAME}-SftLimFwdEna"){
field(TSE, "0")
}

record(ao,"${P}${AXIS_NAME}-TgtPosCmd"){
record(ao,"${P}${AXIS_NAME}-TgtPosCmd"){
field(DESC, "${AXIS_NAME}: Target Position Cmd")
field(DTYP, "asynFloat64")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynFloat64/ax$(AXIS_NO).targpos?")
Expand Down Expand Up @@ -487,7 +487,7 @@ record(mbbo, "${P}${AXIS_NAME}-MtnCmd"){
field(VAL, 0)
}

record(longout,"${P}${AXIS_NAME}-MtnCmdData"){
record(longout,"${P}${AXIS_NAME}-MtnCmdData"){
field(DESC, "${AXIS_NAME}: Motion Command Data Param")
field(DTYP, "asynInt32")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt32/ax$(AXIS_NO).cmddata?")
Expand All @@ -501,7 +501,7 @@ record(longin,"${P}${AXIS_NAME}-ErrId"){
field(PINI, "$(PINI=1)")
field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt32/ax$(AXIS_NO).errorid?")
field(SCAN, "I/O Intr")
field(SCAN, "I/O Intr")
field(TSE, "$(TSE=-2)")
field(HIGH, 1)
field(HSV, "MAJOR")
Expand All @@ -511,7 +511,7 @@ record(longin,"${P}${AXIS_NAME}-ErrId"){
record(bi,"${P}${AXIS_NAME}-Err"){
field(DESC, "${AXIS_NAME}: Error")
field(PINI, "$(PINI=1)")
field(INP, "${P}${AXIS_NAME}-ErrId.VAL")
field(INP, "${P}${AXIS_NAME}-ErrId.VAL")
field(TSE, "$(TSE=-2)")
field(ZNAM, "OK")
field(ONAM, "ERROR")
Expand All @@ -526,7 +526,7 @@ record(longin,"${P}${AXIS_NAME}-WrnId"){
field(PINI, "$(PINI=1)")
field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynInt32/ax$(AXIS_NO).warningid?")
field(SCAN, "I/O Intr")
field(SCAN, "I/O Intr")
field(TSE, "$(TSE=-2)")
field(HIGH, 1)
field(HSV, "MINOR")
Expand All @@ -535,7 +535,7 @@ record(longin,"${P}${AXIS_NAME}-WrnId"){

record(bi,"${P}${AXIS_NAME}-Wrn"){
field(DESC, "${AXIS_NAME}: Warning")
field(PINI, "$(PINI=1)")
field(PINI, "$(PINI=1)")
field(INP, "${P}${AXIS_NAME}-WrnId.VAL")
field(TSE, "$(TSE=-2)")
field(ZNAM, "OK")
Expand Down
2 changes: 1 addition & 1 deletion db/core/ecmcAxisCommission.db
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ record(ao,"${P}${AXIS_NAME}-Ctrl-Kff"){
field(VAL, "${KFF=0}")
}

record(ao,"${P}${AXIS_NAME}-SetEncPosCmd"){
record(ao,"${P}${AXIS_NAME}-SetEncPosCmd"){
field(DESC, "${AXIS_NAME}: Set Enc Pos")
field(DTYP, "asynFloat64")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))T_SMP_MS=$(T_SMP_MS=1000)/TYPE=asynFloat64/ax$(AXIS_NO).setencpos?")
Expand Down
1 change: 0 additions & 1 deletion db/core/ecmcDsFirstDs.db
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ record(ao,"${P}MCU-Cfg-DS-FrstObjId") {
field(DESC, "First DS ID")
field(VAL, "$(FIRST_OBJ_ID=-1)")
}

1 change: 0 additions & 1 deletion db/core/ecmcDsPrevDs.db
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
record(ao,"$(PREV_ECMC_P)NxtObjId") {
field(VAL, "$(NEXT_OBJ_ID=-1)")
}

1 change: 0 additions & 1 deletion db/core/ecmcEcFirstSlave.db
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ record(ao,"${P}MCU-Cfg-EC-FrstObjId") {
field(DESC, "Master: First slave ID")
field(VAL, "$(FIRST_SLAVE_ID=-1)")
}

1 change: 0 additions & 1 deletion db/core/ecmcEcPrevSlave.db
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
record(ao,"$(PREV_ECMC_P)NxtObjId") {
field(VAL, "$(NEXT_SLAVE_ID=-1)")
}

3 changes: 1 addition & 2 deletions db/core/ecmcEcSlave.template
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,8 @@ record(stringin, "${ECMC_P}HWType"){
# 3. This prefix (xxxxx:m0s00x) and slave ID are stored in epics env variables in addSlave.cmd
# 4. The same record is also defined in ecmcEcPrevSlave.db but here with the ECMC_P from previous call to addSlave.cmd
# Resulting that VAL of m0s00(x-1) is initialized to the current slave id.
# 5. The last slave in the chain will get a next slave value of -1 like initiated here
# 5. The last slave in the chain will get a next slave value of -1 like initiated here
record(ao,"$(ECMC_P)NxtObjId") {
field(DESC, "EtherCAT slave index of next slave")
field(VAL, "-1")
}

1 change: 0 additions & 1 deletion db/core/ecmcEnc.db
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ record(ai,"${P}${AXIS_NAME}-VelAct0$(ENC_NO)"){
field(DESC, "Axis ax$(AXIS_NO): Actual Velocity $(ENC_NO)")
field(TSE, "$(TSE=-2)")
}

8 changes: 4 additions & 4 deletions db/core/ecmcMcuInfo.db
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ record(ao,"$(P)MCU-Cfg-Rate") {
}

record(ao,"$(P)MCU-Cfg-Time") {
field(DESC, "RT loop sample time")
field(DESC, "RT loop sample time")
field(EGU, "ms")
field(VAL, ${M_TIME})
}
Expand All @@ -34,17 +34,17 @@ record(ao,"$(P)MCU-Cfg-PV-Time") {
}

record(stringout,"$(P)MCU-Cfg-Mode") {
field(DESC, "ecmc mode")
field(DESC, "ecmc mode")
field(VAL, ${MCU_MODE=""})
}

record(stringout,"$(P)MCU-Cfg-PVA") {
field(DESC, "PVA enabled")
field(DESC, "PVA enabled")
field(VAL, ${MCU_PVA=""})
}

record(bo,"$(P)MCU-Cfg-Eng-Mode") {
field(DESC, "Engineering MODE")
field(DESC, "Engineering MODE")
field(VAL, ${MCU_ENG=0})
field(ONAM, "Yes")
field(ZNAM, "No")
Expand Down
1 change: 0 additions & 1 deletion db/core/ecmcPlcFirstPlc.db
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ record(ao,"${P}MCU-Cfg-PLC-FrstObjId") {
field(DESC, "First PLC ID")
field(VAL, "$(FIRST_OBJ_ID=-1)")
}

1 change: 0 additions & 1 deletion db/core/ecmcPlcPrevPlc.db
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
record(ao,"$(PREV_ECMC_P)NxtObjId") {
field(VAL, "$(NEXT_OBJ_ID=-1)")
}

1 change: 0 additions & 1 deletion db/core/ecmcPlgFirstPlg.db
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ record(ao,"${P}MCU-Cfg-PLG-FrstObjId") {
field(DESC, "First PLG ID")
field(VAL, "$(FIRST_OBJ_ID=-1)")
}

1 change: 0 additions & 1 deletion db/core/ecmcPlgPrevPlg.db
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
record(ao,"$(PREV_ECMC_P)NxtObjId") {
field(VAL, "$(NEXT_OBJ_ID=-1)")
}

4 changes: 2 additions & 2 deletions db/core/ecmcSDOAsync.template
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ record(bo,"$(ECMC_P)SDO-$(NAME)-WrtCmd"){
field(OUT, "@asyn(${PORT},${ADDR},${TIMEOUT})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.sdo.${NAME}.writecmd=")
field(HIGH, "0.001")
field(ZNAM, "idle")
field(ONAM, "write")
field(ONAM, "write")
field(ZSV, "${ZSV=NO_ALARM}")
field(OSV, "${OSV=NO_ALARM}")
field(TSE, "${TSE=-2}")
Expand All @@ -43,7 +43,7 @@ record(bo,"$(ECMC_P)SDO-$(NAME)-RdCmd"){
field(OUT, "@asyn(${PORT},${ADDR},${TIMEOUT})T_SMP_MS=${T_SMP_MS=1000}/TYPE=asynInt32/ec${MASTER_ID}.s${SLAVE_POS}.sdo.${NAME}.readcmd=")
field(HIGH, "0.001")
field(ZNAM, "idle")
field(ONAM, "read")
field(ONAM, "read")
field(ZSV, "${ZSV=NO_ALARM}")
field(OSV, "${OSV=NO_ALARM}")
field(TSE, "${TSE=-2}")
Expand Down
Loading

0 comments on commit b495214

Please sign in to comment.