From 5b0b3281869e0f1515fce8a279271e994de60d15 Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Sun, 31 Jul 2022 15:49:50 +0200
Subject: [PATCH] If a node name to be plotted ends by ':power', its type is
 set to POWER. Thus 'settype power nodename(s)' in the examples is no longer
 necessary.

---
 examples/probe/Dual-NMOS-amp.cir   | 1 -
 examples/probe/F5TurboV2-Probe.cir | 4 ++--
 examples/probe/mos-test.cir        | 2 +-
 examples/probe/probe-i-dev.cir     | 1 -
 src/frontend/outitf.c              | 2 ++
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/probe/Dual-NMOS-amp.cir b/examples/probe/Dual-NMOS-amp.cir
index d40ed21a9..55be3e971 100644
--- a/examples/probe/Dual-NMOS-amp.cir
+++ b/examples/probe/Dual-NMOS-amp.cir
@@ -55,7 +55,6 @@ plot tj1 tj2 tcase1 tcase2
 plot in out 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 xu1:power
 plot  m1:power m2:power ylimit 11 21
 plot xu1:power
 meas tran m1power avg  m1:power
diff --git a/examples/probe/F5TurboV2-Probe.cir b/examples/probe/F5TurboV2-Probe.cir
index 825ae321b..36d0ad195 100644
--- a/examples/probe/F5TurboV2-Probe.cir
+++ b/examples/probe/F5TurboV2-Probe.cir
@@ -34,7 +34,8 @@ 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 p(MQ3, 3) p(MQ5, s)  ; <------------------------------------------
+.probe i(MQ3, 3) i(MQ5, s)  ; <------------------------------------------
+.probe p(MQ3) p(MQ5)  ; <------------------------------------------
 R18 +32 Net-_D3a1-Pad1_ 1
 R17 +32 Net-_D3a1-Pad1_ 1
 R7 out Net-_P3-Pad1_ 220
@@ -69,7 +70,6 @@ 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
diff --git a/examples/probe/mos-test.cir b/examples/probe/mos-test.cir
index 7f1ab3211..7cb054e87 100644
--- a/examples/probe/mos-test.cir
+++ b/examples/probe/mos-test.cir
@@ -1,4 +1,4 @@
-.probe test with simple CMOS inverter
+.probe test with simple CMOS inverter, many buggy .probe commands
 
 Vd dd 0 dc 5
 Vin in 0 dc 0 PULSE (0 5 0 10n 10n 100n 200n)
diff --git a/examples/probe/probe-i-dev.cir b/examples/probe/probe-i-dev.cir
index 8dde714c5..2ccad3e7d 100644
--- a/examples/probe/probe-i-dev.cir
+++ b/examples/probe/probe-i-dev.cir
@@ -31,7 +31,6 @@ X1 c1 b1 e1 s1  pbip
 .control
 *op
 dc vbb 0 2 0.01
-settype power q1:power
 plot q1:power
 display
 *print all
diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c
index 9fbd0b550..6bae09b34 100644
--- a/src/frontend/outitf.c
+++ b/src/frontend/outitf.c
@@ -953,6 +953,8 @@ guess_type(const char *name)
         type = SV_RES;
     else if (cieq(name, "i-sweep"))
         type = SV_CURRENT;
+    else if (strstr(name, ":power\0"))
+        type = SV_POWER;
     /* current source ISRC parameters for current */
     else if (substring("@i", name) && (substring("[c]", name) || substring("[dc]", name) || substring("[current]", name)))
             type = SV_CURRENT;