From 4d587b18d465a5fe18cbe9bcc4b6a1dee227ba66 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Thu, 14 Sep 2017 11:37:30 -0500
Subject: [PATCH] update wfdemo

---
 iocBoot/iocwfdemo/iq.db | 19 ++++++++++++++-----
 pdbApp/demo.cpp         |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/iocBoot/iocwfdemo/iq.db b/iocBoot/iocwfdemo/iq.db
index 8e7df87..d91576f 100644
--- a/iocBoot/iocwfdemo/iq.db
+++ b/iocBoot/iocwfdemo/iq.db
@@ -2,6 +2,8 @@ record(ao, "$(N)Rate") {
     field(VAL, "1.0")
     field(PINI, "YES")
     field(PREC, "3")
+    field(DRVH, "2.0")
+    field(DRVL, "0.000000000001")
     field( OUT, "$(N)dly_.ODLY NPP")
 }
 
@@ -17,7 +19,9 @@ record(calc, "$(N)Phase:I") {
     field( EGU, "rad")
     field(PREC, "3")
     field(FLNK, "$(N)Phase:Q")
-    info(pdbGroup0, "$(N)iq|phas_i=VAL")
+    info(Q:group, {
+	"$(N)iq":{"phas.i": {+type:"plain", +channel:"VAL"}}
+    })
     #field(TPRO, "1")
 }
 
@@ -28,7 +32,9 @@ record(calc, "$(N)Phase:Q") {
     field( EGU, "rad")
     field(PREC, "3")
     field(FLNK, "$(N)I")
-    info(pdbGroup0, "$(N)iq|phas_q=VAL")
+    info(Q:group, {
+	"$(N)iq":{"phas.q": {+type:"plain", +channel:"VAL"}}
+    })
 }
 
 record(waveform, "$(N)I") {
@@ -37,7 +43,9 @@ record(waveform, "$(N)I") {
     field(FTVL, "DOUBLE")
     field(NELM, "500")
     field(FLNK, "$(N)Q")
-    info(pdbGroup0, "$(N)iq|I=VAL")
+    info(Q:group, {
+	"$(N)iq":{"I": {+channel:"VAL"}}
+    })
 }
 
 record(waveform, "$(N)Q") {
@@ -46,8 +54,9 @@ record(waveform, "$(N)Q") {
     field(FTVL, "DOUBLE")
     field(NELM, "500")
     field(FLNK, "$(N)dly_")
-    info(pdbGroup0, "$(N)iq|Q=VAL")
-    info(pdbTrigger,"$(N)iq|Q>*")
+    info(Q:group, {
+	"$(N)iq":{"Q": {+channel:"VAL", +trigger:"Q>*"}}
+    })
 }
 
 record(calcout, "$(N)dly_") {
diff --git a/pdbApp/demo.cpp b/pdbApp/demo.cpp
index 59d852b..bdb2f80 100644
--- a/pdbApp/demo.cpp
+++ b/pdbApp/demo.cpp
@@ -38,7 +38,7 @@ long process_spin(waveformRecord *prec)
 
     phase *= pi_180; // deg -> rad
 
-    for(size_t i=0; i<prec->nelm; i++)
+    for(size_t i=0, N=prec->nelm; i<N; i++)
         val[i] = sin(freq*i+phase);
 
     prec->nord = prec->nelm;