From bc1c8fb73a53febd187a2a7c2922a3998163170e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Dvo=C5=99=C3=A1k?= Date: Tue, 8 Dec 2020 11:45:24 +0100 Subject: [PATCH] GPS_DUMP_COMM: dump all gps instances --- msg/gps_dump.msg | 4 +++- src/drivers/gps/gps.cpp | 7 ++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/msg/gps_dump.msg b/msg/gps_dump.msg index 26de92e833..d9fbb8ab80 100644 --- a/msg/gps_dump.msg +++ b/msg/gps_dump.msg @@ -3,8 +3,10 @@ uint64 timestamp # time since system start (microseconds) +uint8 instance # Instance of GNSS reciever + uint8 len # length of data, MSB bit set = message to the gps device, # clear = message from the device -uint8[79] data # data to write to the log +uint8[79] data # data to write to the log uint8 ORB_QUEUE_LENGTH = 8 diff --git a/src/drivers/gps/gps.cpp b/src/drivers/gps/gps.cpp index 7d5c30a114..22fa2249c3 100644 --- a/src/drivers/gps/gps.cpp +++ b/src/drivers/gps/gps.cpp @@ -579,10 +579,6 @@ void GPS::initializeCommunicationDump() return; //dumping disabled } - if (_instance != Instance::Main) { - return; - } - _dump_from_device = new gps_dump_s(); _dump_to_device = new gps_dump_s(); @@ -607,7 +603,8 @@ void GPS::dumpGpsData(uint8_t *data, size_t len, bool msg_to_gps_device) return; } - gps_dump_s *dump_data = msg_to_gps_device ? _dump_to_device : _dump_from_device; + gps_dump_s *dump_data = msg_to_gps_device ? _dump_to_device : _dump_from_device; + dump_data->instance = (uint8_t) _instance; while (len > 0) { size_t write_len = len;