From aca85ec3860522663b2ae02812b47b5c162b83ec Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Mon, 25 Apr 2022 15:19:08 +0200
Subject: [PATCH] Add .probe p(...) commands (including plotting and averaging)

---
 examples/probe/Dual-NMOS-amp.cir   | 8 +++++---
 examples/probe/F5TurboV2-Probe.cir | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/examples/probe/Dual-NMOS-amp.cir b/examples/probe/Dual-NMOS-amp.cir
index 4106dc0b5..d40ed21a9 100644
--- a/examples/probe/Dual-NMOS-amp.cir
+++ b/examples/probe/Dual-NMOS-amp.cir
@@ -40,7 +40,7 @@ R5 Net-_C4-Pad1_ Net-_R4-Pad1_ 19.5k
 .probe v(tj1) v(tj2) v(tcase1) v(tcase2) v(in) v(out)
 .probe i(m1:s) vd(m2:s, m1:s) vd(M2:1:3)
 .probe alli
-.probe p(M2) p(M1)
+.probe p(M2) p(M1) p(XU1)
 .save @m1[id] @m2[id] ; in out
 .control
 set controlswait
@@ -53,12 +53,14 @@ rusage
 settype temperature  tj1 tj2 tcase1 tcase2
 plot tj1 tj2 tcase1 tcase2
 plot in out xlimit 6 6.04
-plot i(u1:vcc-) i(u1:vcc+)*(-1) xlimit 6 6.04
+plot i(xu1:vcc-) i(xu1:vcc+)*(-1) xlimit 6 6.04
 plot @m1[id] + i(m1:d) xlimit 9 9.04
-settype power m1:power m2:power
+settype power m1:power m2:power xu1:power
 plot  m1:power m2:power ylimit 11 21
+plot xu1:power
 meas tran m1power avg  m1:power
 meas tran m2power avg  m2:power
+meas tran U1power avg  xu1:power
 end
 .endc
 .end
diff --git a/examples/probe/F5TurboV2-Probe.cir b/examples/probe/F5TurboV2-Probe.cir
index 2c9863af8..825ae321b 100644
--- a/examples/probe/F5TurboV2-Probe.cir
+++ b/examples/probe/F5TurboV2-Probe.cir
@@ -34,7 +34,7 @@ RTH1 Net-_D3a1-Pad1_ Net-_R11-Pad1_ 4.7k
 XP1 Net-_P1-Pad1_ +32 +32 RPOT value=5k ratio=0.15
 R13 Net-_Q3-Pad2_ Net-_P1-Pad1_ 47.5
 MQ3 out Net-_Q3-Pad2_ Net-_D3a1-Pad1_ IRFP9240
-.probe i(MQ3, 3) i(MQ5, s)  ; <------------------------------------------
+.probe p(MQ3, 3) p(MQ5, s)  ; <------------------------------------------
 R18 +32 Net-_D3a1-Pad1_ 1
 R17 +32 Net-_D3a1-Pad1_ 1
 R7 out Net-_P3-Pad1_ 220
@@ -69,6 +69,10 @@ display
 rusage
 plot out in
 plot i(mq3:s) i(mq5:s)
+settype power mq3:power mq5:power
+plot mq3:power mq5:power
+meas tran mq3power avg mq3:power
+meas tran mq5power avg mq5:power
 .endc
 
 .end