From 3be77b35f1dfb4b2f90712974c3de71c1e088884 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 4 Nov 2019 15:41:21 +0100 Subject: Add actually working support for EnergyTrace++ JSTATE field --- bin/msp430-etv | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/msp430-etv b/bin/msp430-etv index 28aaa5d..442f637 100755 --- a/bin/msp430-etv +++ b/bin/msp430-etv @@ -179,9 +179,10 @@ if __name__ == '__main__': if i >= opt['skip']: fields = line.split(' ') if len(fields) == 4: - timestamp, current, voltage, total_energy = map(float, line.split(' ')) + timestamp, current, voltage, total_energy = map(int, fields) elif len(fields) == 5: - cpustate, timestamp, current, voltage, total_energy = map(float, line.split(' ')) + cpustate = fields[0] + timestamp, current, voltage, total_energy = map(int, fields[1:]) else: raise RuntimeError('cannot parse line "{}"'.format(line)) data[i - opt['skip']] = [timestamp, current, voltage, total_energy] -- cgit v1.2.3