aleks/flix
1
0
Fork 0
mirror of https://github.com/okalachev/flix.git synced 2025-07-29 04:19:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve log download: remove empty records, sort by timestamp

Browse Source 
To make Plotjuggler not to warn about unsorted records everytime
This commit is contained in:
Oleg Kalachev 2024-02-18 01:23:33 +03:00
parent 4eec63adfa
commit 455729fdb4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flix/log.ino
View File

@ -44,6 +44,7 @@ void dumpLog() {
Serial.printf("t,rates.x,rates.y,rates.z,ratesTarget.x,ratesTarget.y,ratesTarget.z," Serial.printf("t,rates.x,rates.y,rates.z,ratesTarget.x,ratesTarget.y,ratesTarget.z,"
"attitude.x,attitude.y,attitude.z,attitudeTarget.x,attitudeTarget.y,attitudeTarget.z,thrustTarget\n"); "attitude.x,attitude.y,attitude.z,attitudeTarget.x,attitudeTarget.y,attitudeTarget.z,thrustTarget\n");
for (int i = 0; i < LOG_SIZE; i++) { for (int i = 0; i < LOG_SIZE; i++) {
if (logBuffer[i][0] == 0) continue; // skip empty records
for (int j = 0; j < LOG_COLUMNS - 1; j++) { for (int j = 0; j < LOG_COLUMNS - 1; j++) {
Serial.printf("%f,", logBuffer[i][j]); Serial.printf("%f,", logBuffer[i][j]);
} }

11
tools/grab_log.py
View File

@ -9,8 +9,7 @@ PORT = os.environ['PORT']
DIR = os.path.dirname(os.path.realpath(__file__)) DIR = os.path.dirname(os.path.realpath(__file__))
dev = serial.Serial(port=PORT, baudrate=115200, timeout=0.5) dev = serial.Serial(port=PORT, baudrate=115200, timeout=0.5)
lines = []
log = open(f'{DIR}/log/{datetime.datetime.now().isoformat()}.csv', 'wb')
print('Downloading log...') print('Downloading log...')
count = 0 count = 0
@ -19,8 +18,14 @@ while True:
line = dev.readline() line = dev.readline()
if not line: if not line:
break break
log.write(line) lines.append(line)
count += 1 count += 1
print(f'\r{count} lines', end='') print(f'\r{count} lines', end='')
# sort by timestamp
header = lines.pop(0)
lines.sort(key=lambda line: float(line.split(b',')[0]))
log = open(f'{DIR}/log/{datetime.datetime.now().isoformat()}.csv', 'wb')
log.writelines([header] + lines)
print(f'\nWritten {os.path.relpath(log.name, os.curdir)}') print(f'\nWritten {os.path.relpath(log.name, os.curdir)}')