1 files changed, 13 insertions, 2 deletions
diff --git a/bin/msp430-etv b/bin/msp430-etv
index 773d5fe..c65e1b4 100755
--- a/bin/msp430-etv
+++ b/bin/msp430-etv
@@ -504,8 +504,9 @@ def main():
 
     if args.stat:
         mean_voltage = np.mean(data[:, 2] * 1e-3)
-        mean_current = np.mean(data[:, 1] * 1e-9)
-        mean_power = np.mean(data[:, 1] * data[:, 2] * 1e-12)
+        mean_power = np.mean(power_from_energy)
+        current = power_from_energy / (data[1:, 2] * 1e-3)
+        mean_current = np.mean(current)
         print(
             "Mean voltage: {:.2f} V       : {:.9f}".format(mean_voltage, mean_voltage)
         )
@@ -515,6 +516,16 @@ def main():
             )
         )
         print(
+            "Current prediction error: {:.0f} µA ({:.2f}%)".format(
+                np.mean(np.abs(mean_current - current)) * 1e6,
+                np.mean(
+                    np.abs(mean_current - current)
+                    / ((np.abs(current) + np.abs(mean_current)) / 2)
+                )
+                * 100,
+            )
+        )
+        print(
             "Mean power: {:.0f} µW       : {:.9f}".format(mean_power * 1e6, mean_power)
         )
         print(