Add actually working support for EnergyTrace++ JSTATE field

1 files 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]