From c701aee7f43b2ea7174474e6d1cb931472ebe73b Mon Sep 17 00:00:00 2001 From: Noha Yassin <37175819+nohayassin@users.noreply.github.com> Date: Sun, 26 Jul 2020 12:33:41 +0300 Subject: [PATCH 1/4] FW logger bug fix --- tools/fw-logger/rs-fw-logger.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/fw-logger/rs-fw-logger.cpp b/tools/fw-logger/rs-fw-logger.cpp index 6085f86ba5..00d36b7c24 100644 --- a/tools/fw-logger/rs-fw-logger.cpp +++ b/tools/fw-logger/rs-fw-logger.cpp @@ -127,10 +127,12 @@ int main(int argc, char* argv[]) else { stringstream sstr; - sstr << log_message.get_timestamp(); - sstr << " " << log_message.get_severity_str(); - sstr << " FW_Log_Data:"; + sstr << datetime_string() << " FW_Log_Data:"; + //sstr << log_message.get_timestamp(); + //sstr << " " << log_message.get_severity_str(); + //sstr << " FW_Log_Data:"; std::vector msg_data = log_message.data(); + size_t sizeMsg = msg_data.size(); for (int i = 0; i < msg_data.size(); ++i) { sstr << char2hex(msg_data[i]) << " "; From c0e4f10ea7584551a6b4b6d520fbd2e830cb2cef Mon Sep 17 00:00:00 2001 From: Noha Yassin <37175819+nohayassin@users.noreply.github.com> Date: Sun, 26 Jul 2020 14:07:08 +0300 Subject: [PATCH 2/4] FW logger bug fix --- tools/fw-logger/rs-fw-logger.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/fw-logger/rs-fw-logger.cpp b/tools/fw-logger/rs-fw-logger.cpp index 00d36b7c24..4a0662ed4c 100644 --- a/tools/fw-logger/rs-fw-logger.cpp +++ b/tools/fw-logger/rs-fw-logger.cpp @@ -128,9 +128,7 @@ int main(int argc, char* argv[]) { stringstream sstr; sstr << datetime_string() << " FW_Log_Data:"; - //sstr << log_message.get_timestamp(); //sstr << " " << log_message.get_severity_str(); - //sstr << " FW_Log_Data:"; std::vector msg_data = log_message.data(); size_t sizeMsg = msg_data.size(); for (int i = 0; i < msg_data.size(); ++i) From 5a093c0229368891c01162ee76270a6568acfbd8 Mon Sep 17 00:00:00 2001 From: Noha Yassin <37175819+nohayassin@users.noreply.github.com> Date: Wed, 29 Jul 2020 10:19:37 +0300 Subject: [PATCH 3/4] fw-logger fix --- src/firmware_logger_device.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/firmware_logger_device.cpp b/src/firmware_logger_device.cpp index 63564c52cd..c829c450e3 100644 --- a/src/firmware_logger_device.cpp +++ b/src/firmware_logger_device.cpp @@ -51,8 +51,6 @@ namespace librealsense // convert bytes to fw_logs_binary_data for (int i = 0; i < res.size() / fw_logs::BINARY_DATA_SIZE; ++i) { - if (*beginOfLogIterator == 0) - break; auto endOfLogIterator = beginOfLogIterator + fw_logs::BINARY_DATA_SIZE; std::vector resultsForOneLog; resultsForOneLog.insert(resultsForOneLog.begin(), beginOfLogIterator, endOfLogIterator); From 04e042447a28f7e2b6857f1b28ffe138a180baa1 Mon Sep 17 00:00:00 2001 From: Noha Yassin <37175819+nohayassin@users.noreply.github.com> Date: Tue, 4 Aug 2020 15:35:29 +0300 Subject: [PATCH 4/4] fixes --- tools/fw-logger/rs-fw-logger.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/fw-logger/rs-fw-logger.cpp b/tools/fw-logger/rs-fw-logger.cpp index 4a0662ed4c..5d0cb1447b 100644 --- a/tools/fw-logger/rs-fw-logger.cpp +++ b/tools/fw-logger/rs-fw-logger.cpp @@ -128,9 +128,7 @@ int main(int argc, char* argv[]) { stringstream sstr; sstr << datetime_string() << " FW_Log_Data:"; - //sstr << " " << log_message.get_severity_str(); std::vector msg_data = log_message.data(); - size_t sizeMsg = msg_data.size(); for (int i = 0; i < msg_data.size(); ++i) { sstr << char2hex(msg_data[i]) << " ";