diff options
| -rwxr-xr-x | bin/msp430-etv | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/msp430-etv b/bin/msp430-etv index b4f1b89..28aaa5d 100755 --- a/bin/msp430-etv +++ b/bin/msp430-etv @@ -177,7 +177,13 @@ if __name__ == '__main__': for i, line in enumerate(data_lines): if i >= opt['skip']: - timestamp, current, voltage, total_energy = map(float, line.split(' ')) + fields = line.split(' ') + if len(fields) == 4: + timestamp, current, voltage, total_energy = map(float, line.split(' ')) + elif len(fields) == 5: + cpustate, timestamp, current, voltage, total_energy = map(float, line.split(' ')) + else: + raise RuntimeError('cannot parse line "{}"'.format(line)) data[i - opt['skip']] = [timestamp, current, voltage, total_energy] m_duration_us = data[-1, 0] - data[0, 0] |