Browse Source

logger and uORBTest_UnitTest astyle

sbg
Daniel Agar 9 years ago committed by Lorenz Meier
parent
commit
3de7fbb0a9
  1. 2
      src/modules/logger/logger.cpp
  2. 6
      src/modules/uORB/uORB_tests/uORBTest_UnitTest.hpp

2
src/modules/logger/logger.cpp

@ -504,7 +504,7 @@ void Logger::run()
*/ */
for (uint8_t instance = 0; instance < ORB_MULTI_MAX_INSTANCES; instance++) { for (uint8_t instance = 0; instance < ORB_MULTI_MAX_INSTANCES; instance++) {
if (copy_if_updated_multi(sub.metadata, instance, &sub.fd[instance], buffer + sizeof(message_data_header_s), if (copy_if_updated_multi(sub.metadata, instance, &sub.fd[instance], buffer + sizeof(message_data_header_s),
&sub.time_tried_subscribe)) { &sub.time_tried_subscribe)) {
message_data_header_s *header = reinterpret_cast<message_data_header_s *>(buffer); message_data_header_s *header = reinterpret_cast<message_data_header_s *>(buffer);
header->msg_type = static_cast<uint8_t>(MessageType::DATA); header->msg_type = static_cast<uint8_t>(MessageType::DATA);

6
src/modules/uORB/uORB_tests/uORBTest_UnitTest.hpp

@ -51,9 +51,9 @@ struct orb_test_medium {
char junk[64]; char junk[64];
}; };
ORB_DEFINE(orb_test_medium, struct orb_test_medium, sizeof(orb_test_medium), ORB_DEFINE(orb_test_medium, struct orb_test_medium, sizeof(orb_test_medium),
"ORB_TEST_MEDIUM:int val;hrt_abstime time;char[64] junk;"); "ORB_TEST_MEDIUM:int val;hrt_abstime time;char[64] junk;");
ORB_DEFINE(orb_test_medium_multi, struct orb_test_medium, sizeof(orb_test_medium), ORB_DEFINE(orb_test_medium_multi, struct orb_test_medium, sizeof(orb_test_medium),
"ORB_TEST_MEDIUM_MULTI:int val;hrt_abstime time;char[64] junk;"); "ORB_TEST_MEDIUM_MULTI:int val;hrt_abstime time;char[64] junk;");
struct orb_test_large { struct orb_test_large {
@ -62,7 +62,7 @@ struct orb_test_large {
char junk[512]; char junk[512];
}; };
ORB_DEFINE(orb_test_large, struct orb_test_large, sizeof(orb_test_large), ORB_DEFINE(orb_test_large, struct orb_test_large, sizeof(orb_test_large),
"ORB_TEST_LARGE:int val;hrt_abstime time;char[512] junk;"); "ORB_TEST_LARGE:int val;hrt_abstime time;char[512] junk;");
namespace uORBTest namespace uORBTest

Loading…
Cancel
Save