Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pyulog/messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ def main():
logged_messages = sorted(events, key=lambda m: m[0])

for t, log_level, message in logged_messages:
m1, s1 = divmod(int(t/1e6), 60)
total_ms = int(t / 1000)
m1, s1 = divmod(total_ms // 1000, 60)
h1, m1 = divmod(m1, 60)
print("{:d}:{:02d}:{:02d} {:}: {:}".format(h1, m1, s1, log_level, message))
ms = total_ms % 1000
print("{:d}:{:02d}:{:02d}.{:03d} {:}: {:}".format(h1, m1, s1, ms, log_level, message))



2 changes: 1 addition & 1 deletion test/sample_appended_messages.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0:00:11 WARNING: [commander_tests] Not ready to fly: Sensors not set up correctly
0:00:11.919 WARNING: [commander_tests] Not ready to fly: Sensors not set up correctly
8 changes: 4 additions & 4 deletions test/sample_messages.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0:02:38 ERROR: [sensors] no barometer found on /dev/baro0 (2)
0:02:42 ERROR: [sensors] no barometer found on /dev/baro0 (2)
0:02:51 ERROR: [sensors] no barometer found on /dev/baro0 (2)
0:02:56 ERROR: [sensors] no barometer found on /dev/baro0 (2)
0:02:38.215 ERROR: [sensors] no barometer found on /dev/baro0 (2)
0:02:42.073 ERROR: [sensors] no barometer found on /dev/baro0 (2)
0:02:51.624 ERROR: [sensors] no barometer found on /dev/baro0 (2)
0:02:56.408 ERROR: [sensors] no barometer found on /dev/baro0 (2)
36 changes: 18 additions & 18 deletions test/sample_px4_events_messages.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
475214:49:10 INFO: logging: opening log file 2024-3-18/14_49_10.ulg
475214:49:10 INFO: [px4] Startup script returned successfully
475214:49:10 INFO: [logger] Start file log (type: full)
475214:49:10 INFO: [logger] Opened full log file: ./log/2024-03-18/14_49_10.ulg
475214:49:10 INFO: [mavlink] partner IP: 127.0.0.1
475214:49:11 WARNING: [health_and_arming_checks] Preflight: GPS fix too low
475214:49:18 INFO: [tone_alarm] home set
475214:49:18 WARNING: [health_and_arming_checks] Preflight: GPS fix too low
475214:49:21 INFO: [commander] Ready for takeoff!
475214:49:25 INFO: Armed by internal command
475214:49:25 INFO: Using default takeoff altitude: 2.50 m
475214:49:25 INFO: [tone_alarm] arming warning
475214:49:27 INFO: Takeoff detected
475214:49:32 INFO: RTL: start return at 491 m (3 m above destination)
475214:49:32 INFO: RTL: land at destination
475214:49:38 INFO: Landing detected
475214:49:40 INFO: Disarmed by landing
475214:49:40 INFO: [tone_alarm] notify neutral
475214:49:10.346 INFO: logging: opening log file 2024-3-18/14_49_10.ulg
475214:49:10.346 INFO: [px4] Startup script returned successfully
475214:49:10.346 INFO: [logger] Start file log (type: full)
475214:49:10.346 INFO: [logger] Opened full log file: ./log/2024-03-18/14_49_10.ulg
475214:49:10.842 INFO: [mavlink] partner IP: 127.0.0.1
475214:49:11.914 WARNING: [health_and_arming_checks] Preflight: GPS fix too low
475214:49:18.802 INFO: [tone_alarm] home set
475214:49:18.850 WARNING: [health_and_arming_checks] Preflight: GPS fix too low
475214:49:21.010 INFO: [commander] Ready for takeoff!
475214:49:25.282 INFO: Armed by internal command
475214:49:25.282 INFO: Using default takeoff altitude: 2.50 m
475214:49:25.282 INFO: [tone_alarm] arming warning
475214:49:27.094 INFO: Takeoff detected
475214:49:32.482 INFO: RTL: start return at 491 m (3 m above destination)
475214:49:32.694 INFO: RTL: land at destination
475214:49:38.482 INFO: Landing detected
475214:49:40.486 INFO: Disarmed by landing
475214:49:40.486 INFO: [tone_alarm] notify neutral
Loading