From 2515c1194779173a3db719d374041950a2d82054 Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Mon, 25 Sep 2023 15:23:37 +0200 Subject: [PATCH] fix: Special separator : changed to makro $(S=:). --- evgMrmApp/Db/seq-repeater.db | 4 ++-- evrApp/Db/evralias.db | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/evgMrmApp/Db/seq-repeater.db b/evgMrmApp/Db/seq-repeater.db index ee5f27fa..baeedc3f 100644 --- a/evgMrmApp/Db/seq-repeater.db +++ b/evgMrmApp/Db/seq-repeater.db @@ -29,7 +29,7 @@ record(waveform, "$(P)Timestamp-SP") { alias("$(P)Timestamp-RB") } -record(longout, "$(P)Mask:Rep-SP") { +record(longout, "$(P)Mask$(S=:)Rep-SP") { field( DESC, "Mask selecting repeated slots") field( FLNK, "$(P)Rep-Calc_") info( autosaveFields_pass0, "VAL") @@ -47,7 +47,7 @@ record(aSub, "$(P)Rep-Calc_") { field( INPB, "$(NREP)") field( FTB , "ULONG") # C - Bit mask to select which repetitions should actually be issued - field( INPC, "$(P)Mask:Rep-SP MS PP") + field( INPC, "$(P)Mask$(S=:)Rep-SP MS PP") field( FTC , "ULONG") # D - Unused field( INPD, "$(P)Timestamp-SP MS PP") diff --git a/evrApp/Db/evralias.db b/evrApp/Db/evralias.db index 8852cb2f..5e544230 100644 --- a/evrApp/Db/evralias.db +++ b/evrApp/Db/evralias.db @@ -5,14 +5,13 @@ alias("$(PN)Ena-Sel","$(PNA)Ena-Sel") alias("$(PN)Polarity-Sel","$(PNA)Polarity-Sel") alias("$(PN)Delay-SP","$(PNA)Delay-SP") alias("$(PN)Delay-RB","$(PNA)Delay-RB") -alias("$(PN)Delay:Raw-RB","$(PNA)Delay:Raw-RB") +alias("$(PN)Delay$(S=:)Raw-RB","$(PNA)Delay$(S=:)Raw-RB") alias("$(PN)Width-SP","$(PNA)Width-SP") alias("$(PN)Width-RB","$(PNA)Width-RB") -alias("$(PN)Width:Raw-RB","$(PNA)Width:Raw-RB") +alias("$(PN)Width$(S=:)Raw-RB","$(PNA)Width$(S=:)Raw-RB") alias("$(PN)Prescaler-SP","$(PNA)Prescaler-SP") alias("$(PN)Prescaler-RB","$(PNA)Prescaler-RB") alias("$(PN)Res-I","$(PNA)Res-I") -alias("$(PN)Evt:Trig0-SP","$(PNA)Evt:Trig0-SP") -alias("$(PN)Evt:Trig1-SP","$(PNA)Evt:Trig1-SP") -alias("$(PN)Evt:Trig2-SP","$(PNA)Evt:Trig2-SP") - +alias("$(PN)Evt$(S=:)Trig0-SP","$(PNA)Evt$(S=:)Trig0-SP") +alias("$(PN)Evt$(S=:)Trig1-SP","$(PNA)Evt$(S=:)Trig1-SP") +alias("$(PN)Evt$(S=:)Trig2-SP","$(PNA)Evt$(S=:)Trig2-SP")