libevents: update submodule

And remove obsolete libevents_definitions.h
PX4 · Apr 29, 2024 · 547209e · 547209e
1 parent 9dc7719
commit 547209e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 58 deletions.
diff --git a/platforms/common/include/libevents_definitions.h b/platforms/common/include/libevents_definitions.h
diff --git a/platforms/common/include/px4_platform_common/events.h b/platforms/common/include/px4_platform_common/events.h
@@ -45,7 +45,7 @@
 #endif
 
 #include <events/events_generated.h>
-#include <libevents_definitions.h>
+#include <uORB/topics/event.h>
 
 #include <stdint.h>
 
@@ -93,7 +93,7 @@ constexpr unsigned sizeofArguments(const T &t, const Args &... args)
 /**
  * publish/send an event
  */
-void send(EventType &event);
+void send(event_s &event);
 
 /**
  * Generate event ID from an event name
@@ -109,7 +109,7 @@ constexpr uint32_t ID(const char (&name)[N])
 template<typename... Args>
 inline void send(uint32_t id, const LogLevels &log_levels, const char *message, Args... args)
 {
-	EventType e{};
+	event_s e{};
 	e.log_levels = ((uint8_t)log_levels.internal << 4) | (uint8_t)log_levels.external;
 	e.id = id;
 	static_assert(util::sizeofArguments(args...) <= sizeof(e.arguments), "Too many arguments");
@@ -120,7 +120,7 @@ inline void send(uint32_t id, const LogLevels &log_levels, const char *message,
 
 inline void send(uint32_t id, const LogLevels &log_levels, const char *message)
 {
-	EventType e{};
+	event_s e{};
 	e.log_levels = ((uint8_t)log_levels.internal << 4) | (uint8_t)log_levels.external;
 	e.id = id;
 	CONSOLE_PRINT_EVENT(e.log_level_external, e.id, message);

diff --git a/src/lib/events/events.cpp b/src/lib/events/events.cpp
@@ -45,7 +45,7 @@ static uint16_t event_sequence{events::initial_event_sequence};
 namespace events
 {
 
-void send(EventType &event)
+void send(event_s &event)
 {
 	event.timestamp = hrt_absolute_time();
 

diff --git a/src/lib/events/events_ioctl.h b/src/lib/events/events_ioctl.h
@@ -47,5 +47,5 @@
 
 #define EVENTSIOCSEND _EVENTSIOC(1)
 typedef struct eventiocsend {
-	events::EventType &event;
+	event_s &event;
 } eventiocsend_t;
diff --git a/src/lib/events/libevents b/src/lib/events/libevents
diff --git a/src/lib/events/usr_events.cpp b/src/lib/events/usr_events.cpp
@@ -44,7 +44,7 @@
 namespace events
 {
 
-void send(EventType &event)
+void send(event_s &event)
 {
 	eventiocsend_t data = {event};
 	boardctl(EVENTSIOCSEND, reinterpret_cast<unsigned long>(&data));

diff --git a/src/modules/commander/HealthAndArmingChecks/Common.cpp b/src/modules/commander/HealthAndArmingChecks/Common.cpp
@@ -284,7 +284,7 @@ bool Report::report(bool is_armed, bool force)
 
 	// send all events
 	int offset = 0;
-	events::EventType event;
+	event_s event;
 
 	for (int i = 0; i < max_num_events && offset < _next_buffer_idx; ++i) {
 		EventBufferHeader *header = (EventBufferHeader *)(_event_buffer + offset);

diff --git a/src/modules/commander/HealthAndArmingChecks/Common.hpp b/src/modules/commander/HealthAndArmingChecks/Common.hpp
@@ -376,7 +376,7 @@ bool Report::addEvent(uint32_t event_id, const events::LogLevels &log_levels, co
 		      Args... args)
 {
 	constexpr unsigned args_size = events::util::sizeofArguments(modes, args...);
-	static_assert(args_size <= sizeof(events::EventType::arguments), "Too many arguments");
+	static_assert(args_size <= sizeof(event_s::arguments), "Too many arguments");
 	unsigned total_size = sizeof(EventBufferHeader) + args_size;
 
 	if (total_size > sizeof(_event_buffer) - _next_buffer_idx) {
+71 −2		README.md
+33 −5		libs/cpp/CMakeLists.txt
+4 −0		libs/cpp/Config.cmake.in
+11 −0		libs/cpp/common/CMakeLists.txt
+24 −0		libs/cpp/common/event_type.h
+0 −0		libs/cpp/empty.cpp
+28 −16		libs/cpp/generated/events_generated.h
+0 −30		libs/cpp/include/libevents_definitions.h
+22 −0		libs/cpp/parse/CMakeLists.txt
+1 −2		libs/cpp/parse/health_and_arming_checks.h
+1 −1		libs/cpp/parse/parser.cpp
+2 −3		libs/cpp/parse/parser.h
+8 −10		libs/cpp/protocol/CMakeLists.txt
+0 −184		libs/cpp/protocol/receive.cpp
+180 −13		libs/cpp/protocol/receive.h
+8 −8		libs/cpp/templates/events_generated.h.jinja
+16 −14		libs/cpp/tests/parser.cpp