From 33c3ebad531ae0d837fefde297213aaca477b833 Mon Sep 17 00:00:00 2001 From: Johnathon Slightham Date: Sat, 7 Feb 2026 15:05:45 -0500 Subject: [PATCH] Oled implementation (#1) --- .gitignore | 4 + CMakeLists.txt | 6 +- CMakeUserPresets.json | 2 +- examples/display/CMakeLists.txt | 19 + examples/display/CMakeUserPresets.json | 9 + examples/display/README.md | 10 + examples/display/conanfile.txt | 9 + examples/display/main.cpp | 31 ++ include/Hub.h | 25 +- include/Module.h | 66 +-- include/ModuleFactory.h | 8 +- include/actuators/Actuator.h | 21 +- .../actuators/BoundedPositionalActuator1D.h | 41 +- include/actuators/OledActuator.h | 38 ++ include/actuators/PositionalActuator1D.h | 35 +- .../flatbuffers/AngleControlMessageBuilder.h | 14 +- .../flatbuffers/RobotConfigurationBuilder.h | 35 +- include/flatbuffers/SensorMessageBuilder.h | 63 +-- include/flatbuffers/SerializedMessage.h | 4 +- .../flatbuffers/TextControlMessageBuilder.h | 27 ++ include/flatbuffers/TopologyMessageBuilder.h | 21 +- .../AngleControlMessage_generated.h | 88 ++-- .../RobotConfiguration_generated.h | 284 ++++++------ .../RobotModule_generated.h | 394 ++++++++-------- .../SensorMessage_generated.h | 421 +++++++++++------- .../TextControlMessage_generated.h | 102 +++++ .../TopologyMessage_generated.h | 286 ++++++------ include/lib_c_control.h | 6 +- include/libcontrol.h | 94 ++-- include/util/Event.h | 51 +-- include/util/Map.h | 12 +- include/util/PairHash.h | 6 +- include/util/Variant.h | 2 +- src/Hub.cpp | 23 +- src/Module.cpp | 41 +- src/ModuleFactory.cpp | 36 +- src/actuators/BoundedPositionalActuator1D.cpp | 51 ++- src/actuators/OledActuator.cpp | 38 ++ src/actuators/PositionalActuator1D.cpp | 48 +- .../AngleControlMessageBuilder.cpp | 13 +- src/flatbuffers/RobotConfigurationBuilder.cpp | 49 +- src/flatbuffers/SensorMessageBuilder.cpp | 5 +- src/flatbuffers/TextControlMessageBuilder.cpp | 21 + src/flatbuffers/TopologyMessageBuilder.cpp | 36 +- src/lib_c_control.cpp | 122 ++--- src/libcontrol.cpp | 333 +++++++------- 46 files changed, 1790 insertions(+), 1260 deletions(-) create mode 100644 examples/display/CMakeLists.txt create mode 100644 examples/display/CMakeUserPresets.json create mode 100644 examples/display/README.md create mode 100644 examples/display/conanfile.txt create mode 100644 examples/display/main.cpp create mode 100644 include/actuators/OledActuator.h create mode 100644 include/flatbuffers/TextControlMessageBuilder.h create mode 100644 include/flatbuffers_generated/TextControlMessage_generated.h create mode 100644 src/actuators/OledActuator.cpp create mode 100644 src/flatbuffers/TextControlMessageBuilder.cpp diff --git a/.gitignore b/.gitignore index c0b0372..0c7b4e1 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,7 @@ /cmake-build-debug /.cache **/.DS_Store +CMakeCache.txt +/CMakeFiles +/examples/display/build +*.log diff --git a/CMakeLists.txt b/CMakeLists.txt index 3807246..a5eda60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,10 +39,11 @@ endif() target_include_directories(c_control PUBLIC include) target_link_libraries(c_control + PUBLIC + spdlog::spdlog PRIVATE librpc::librpc Eigen3::Eigen - spdlog::spdlog sentry-native::sentry-native sentry-crashpad::sentry-crashpad ) @@ -63,10 +64,11 @@ add_library(control SHARED target_include_directories(control PUBLIC include) target_link_libraries(control + PUBLIC + spdlog::spdlog PRIVATE librpc::librpc Eigen3::Eigen - spdlog::spdlog sentry-native::sentry-native sentry-crashpad::sentry-crashpad ) diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json index 52acfdc..71aeace 100644 --- a/CMakeUserPresets.json +++ b/CMakeUserPresets.json @@ -4,6 +4,6 @@ "conan": {} }, "include": [ - "build/RelWithDebInfo/generators/CMakePresets.json" + "build/Release/generators/CMakePresets.json" ] } \ No newline at end of file diff --git a/examples/display/CMakeLists.txt b/examples/display/CMakeLists.txt new file mode 100644 index 0000000..6294b18 --- /dev/null +++ b/examples/display/CMakeLists.txt @@ -0,0 +1,19 @@ +cmake_minimum_required(VERSION 3.15) + +project(DisplayExample) + +set(CMAKE_CXX_STANDARD 23) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +find_package(libcontrol REQUIRED) +find_package(spdlog REQUIRED) +find_package(librpc REQUIRED) + +add_executable(DisplayExample main.cpp) + +target_link_libraries(DisplayExample + PRIVATE + libcontrol::libcontrol + spdlog::spdlog + librpc::librpc +) diff --git a/examples/display/CMakeUserPresets.json b/examples/display/CMakeUserPresets.json new file mode 100644 index 0000000..945b382 --- /dev/null +++ b/examples/display/CMakeUserPresets.json @@ -0,0 +1,9 @@ +{ + "version": 4, + "vendor": { + "conan": {} + }, + "include": [ + "build/CMakePresets.json" + ] +} \ No newline at end of file diff --git a/examples/display/README.md b/examples/display/README.md new file mode 100644 index 0000000..cf8e768 --- /dev/null +++ b/examples/display/README.md @@ -0,0 +1,10 @@ +# Display Example + +## Compiling +``` +conan install . --build=missing --output-folder=build -s build_type=Release +cmake -S . -B "build" -DCMAKE_TOOLCHAIN_FILE="build/conan_toolchain.cmake" -DCMAKE_BUILD_TYPE="Release" +cmake --build "./build" --config "Release" + +./build/DisplayExample +``` diff --git a/examples/display/conanfile.txt b/examples/display/conanfile.txt new file mode 100644 index 0000000..c1d715f --- /dev/null +++ b/examples/display/conanfile.txt @@ -0,0 +1,9 @@ +[requires] +libcontrol/1.0.0 +flatbuffers/24.12.23 +spdlog/1.16.0 +librpc/1.1.6 + +[generators] +CMakeDeps +CMakeToolchain diff --git a/examples/display/main.cpp b/examples/display/main.cpp new file mode 100644 index 0000000..246dabb --- /dev/null +++ b/examples/display/main.cpp @@ -0,0 +1,31 @@ +#include +#include +#include +#include + +#include "libcontrol.h" + +int main() { + + const auto controller = std::make_unique(); + + controller->fetchDirectlyConnectedModules(true); + + std::this_thread::sleep_for(std::chrono::seconds(1)); + + + std::cout << "Found " << controller->getModules().size() << " modules" << std::endl; + + for (const auto& maybe_module : controller->getModules()) { + if (const auto& module = maybe_module.lock()) { + std::cout << "Found module " << (int)module->get_device_id(); + + if (module->get_type() == ModuleType_DISPLAY) { + module->actuate(std::format("BotChain \n\n\nModule ID: {}", module->get_device_id())); + } + } + + } + + return 0; +} diff --git a/include/Hub.h b/include/Hub.h index 56c02b2..853587f 100644 --- a/include/Hub.h +++ b/include/Hub.h @@ -10,20 +10,23 @@ class Hub final : public Module { - public: - explicit Hub(uint8_t device_id) : Module(device_id) {}; +public: + explicit Hub(uint8_t device_id) : Module(device_id) {}; - Hub(uint8_t device_id, ModuleType module_type) : Module(device_id, module_type) {}; + Hub(uint8_t device_id, ModuleType module_type) + : Module(device_id, module_type) {}; - Hub(uint8_t device_id, ModuleType module_type, Messaging::ConnectionType connection_type, - uint8_t leader) - : Module(device_id, module_type, connection_type, leader) {}; + Hub(uint8_t device_id, ModuleType module_type, + Messaging::ConnectionType connection_type, uint8_t leader) + : Module(device_id, module_type, connection_type, leader) {}; - double get_position() override; - void actuate(double position) override; - void actuate(double x, double y) override; - std::vector get_actuation_message() override; - void update_sensor_data(const Flatbuffers::sensor_value &value) override; + double get_position() override; + std::string get_text() override; + void actuate(double position) override; + void actuate(double x, double y) override; + void actuate(const std::string &t) override; + std::vector get_actuation_message() override; + void update_sensor_data(const Flatbuffers::sensor_value &value) override; }; #endif // CONTROL_HUB_H diff --git a/include/Module.h b/include/Module.h index 7c88e17..57d720a 100644 --- a/include/Module.h +++ b/include/Module.h @@ -7,6 +7,7 @@ #include #include +#include #include "flatbuffers/SensorMessageBuilder.h" #include "flatbuffers_generated/RobotModule_generated.h" @@ -14,53 +15,54 @@ #include "librpc.h" struct neighbour { - uint8_t device_id; - Orientation orientation; + uint8_t device_id; + Orientation orientation; }; class Module { - public: - explicit Module(uint8_t device_id) : m_device_id(device_id) {}; +public: + explicit Module(uint8_t device_id) : m_device_id(device_id) {}; - Module(uint8_t device_id, ModuleType module_type) - : m_device_id(device_id), m_module_type(module_type) {}; + Module(uint8_t device_id, ModuleType module_type) + : m_device_id(device_id), m_module_type(module_type) {}; - Module(uint8_t device_id, ModuleType module_type, Messaging::ConnectionType connection_type, - uint8_t leader) - : m_device_id(device_id), m_module_type(module_type), m_connection_type(connection_type), - m_leader(leader) {}; + Module(uint8_t device_id, ModuleType module_type, + Messaging::ConnectionType connection_type, uint8_t leader) + : m_device_id(device_id), m_module_type(module_type), + m_connection_type(connection_type), m_leader(leader) {}; - std::vector get_neighbours(); + std::vector get_neighbours(); - uint8_t get_device_id(); + uint8_t get_device_id(); - ModuleType get_type(); + ModuleType get_type(); - Messaging::ConnectionType get_connection_type(); + Messaging::ConnectionType get_connection_type(); - uint8_t get_leader(); + uint8_t get_leader(); - std::chrono::time_point get_last_updated_time(); + std::chrono::time_point get_last_updated_time(); - virtual double get_position() = 0; - virtual void actuate(double x) = 0; + // Not all modules implement all actuation/sensor values, some are no-ops + virtual double get_position() = 0; + virtual std::string get_text() = 0; + virtual void actuate(double x) = 0; + virtual void actuate(const std::string &text) = 0; + virtual void actuate(double x, double y) = 0; - // There are no modules with 2D actuation support, this is an example of how to implement it. - virtual void actuate(double x, double y) = 0; + void update_module_metadata(const Messaging::TopologyMessage &message); - void update_module_metadata(const Messaging::TopologyMessage &message); + virtual std::vector get_actuation_message() = 0; + virtual void update_sensor_data(const Flatbuffers::sensor_value &value) = 0; - virtual std::vector get_actuation_message() = 0; - virtual void update_sensor_data(const Flatbuffers::sensor_value &value) = 0; - - private: - uint8_t m_device_id; - ModuleType m_module_type; - Messaging::ConnectionType m_connection_type; - uint8_t m_leader; - std::chrono::time_point m_last_updated; - std::vector m_neighbours; - std::shared_ptr m_messaging_interface; +private: + uint8_t m_device_id; + ModuleType m_module_type; + Messaging::ConnectionType m_connection_type; + uint8_t m_leader; + std::chrono::time_point m_last_updated; + std::vector m_neighbours; + std::shared_ptr m_messaging_interface; }; #endif // CONTROL_MODULE_H diff --git a/include/ModuleFactory.h b/include/ModuleFactory.h index 32f9ecb..0d8354b 100644 --- a/include/ModuleFactory.h +++ b/include/ModuleFactory.h @@ -5,10 +5,10 @@ #include "flatbuffers_generated/RobotModule_generated.h" class ModuleFactory { - public: - static std::shared_ptr - createModule(uint8_t device_id, ModuleType type, - std::shared_ptr &messaging_interface); +public: + static std::shared_ptr + createModule(uint8_t device_id, ModuleType type, + std::shared_ptr &messaging_interface); }; #endif // CONTROL_MODULEFACTORY_H diff --git a/include/actuators/Actuator.h b/include/actuators/Actuator.h index 90c7ddf..38cb5d6 100644 --- a/include/actuators/Actuator.h +++ b/include/actuators/Actuator.h @@ -9,20 +9,21 @@ #include "flatbuffers_generated/TopologyMessage_generated.h" class Actuator : public Module { - public: - explicit Actuator(uint8_t device_id) : Module(device_id) {}; +public: + explicit Actuator(uint8_t device_id) : Module(device_id) {}; - Actuator(uint8_t device_id, ModuleType module_type) : Module(device_id, module_type) {}; + Actuator(uint8_t device_id, ModuleType module_type) + : Module(device_id, module_type) {}; - Actuator(uint8_t device_id, ModuleType module_type, Messaging::ConnectionType connection_type, - uint8_t leader) - : Module(device_id, module_type, connection_type, leader) {}; + Actuator(uint8_t device_id, ModuleType module_type, + Messaging::ConnectionType connection_type, uint8_t leader) + : Module(device_id, module_type, connection_type, leader) {}; - protected: - virtual std::vector get_actuation_message() = 0; +protected: + virtual std::vector get_actuation_message() = 0; - private: - [[noreturn]] void actuator_tx_loop(); +private: + [[noreturn]] void actuator_tx_loop(); }; #endif // CONTROL_MODULE_H diff --git a/include/actuators/BoundedPositionalActuator1D.h b/include/actuators/BoundedPositionalActuator1D.h index af6ae40..64c87b1 100644 --- a/include/actuators/BoundedPositionalActuator1D.h +++ b/include/actuators/BoundedPositionalActuator1D.h @@ -5,33 +5,38 @@ #ifndef CONTROL_BOUNDED1DPOSITIONALACTUATOR_H #define CONTROL_BOUNDED1DPOSITIONALACTUATOR_H +#include + #include "actuators/Actuator.h" #include "flatbuffers/AngleControlMessageBuilder.h" #include "flatbuffers/SensorMessageBuilder.h" class BoundedPositionalActuator1D : public Actuator { - public: - BoundedPositionalActuator1D(uint8_t device_id, ModuleType type, double max_value, - double min_value, double initial_position) - : Actuator(device_id, type), m_target_position(initial_position), m_max_value(max_value), - m_min_value(min_value), - acm_builder(std::make_unique()) { - } +public: + BoundedPositionalActuator1D(uint8_t device_id, ModuleType type, + double max_value, double min_value, + double initial_position) + : Actuator(device_id, type), m_target_position(initial_position), + m_max_value(max_value), m_min_value(min_value), + acm_builder( + std::make_unique()) {} - double get_position() override; - void actuate(double position) override; - void actuate(double x, double y) override; // no-op + double get_position() override; + std::string get_text() override; // no-op + void actuate(double position) override; + void actuate(const std::string &text) override; // no-op + void actuate(double x, double y) override; // no-op - std::vector get_actuation_message() override; - void update_sensor_data(const Flatbuffers::sensor_value &value) override; + std::vector get_actuation_message() override; + void update_sensor_data(const Flatbuffers::sensor_value &value) override; - private: - double m_current_position = 0; - double m_target_position; - double m_max_value; - double m_min_value; - std::unique_ptr acm_builder; +private: + double m_current_position = 0; + double m_target_position; + double m_max_value; + double m_min_value; + std::unique_ptr acm_builder; }; #endif // CONTROL_1DPOSITIONALACTUATOR_H diff --git a/include/actuators/OledActuator.h b/include/actuators/OledActuator.h new file mode 100644 index 0000000..e0bf5bb --- /dev/null +++ b/include/actuators/OledActuator.h @@ -0,0 +1,38 @@ +// +// Created by Johnathon Slightham on 2025-11-13. +// + +#ifndef CONTROL_OLEDACTUATOR_H +#define CONTROL_OLEDACTUATOR_H + +#include + +#include "actuators/Actuator.h" +#include "flatbuffers/SensorMessageBuilder.h" +#include "flatbuffers/TextControlMessageBuilder.h" + +class OledActuator : public Actuator { + +public: + OledActuator(uint8_t device_id, ModuleType type) + : Actuator(device_id, type), + m_text_message_builder( + std::make_unique()) {} + + double get_position() override; + std::string get_text() override; + void actuate(double position) override; + void actuate(double x, double y) override; // no-op + void actuate(const std::string &text) override; + + std::vector get_actuation_message() override; + void update_sensor_data(const Flatbuffers::sensor_value &value) override; + +private: + std::string m_current_text = ""; + std::string m_target_text = ""; + std::unique_ptr + m_text_message_builder; +}; + +#endif // CONTROL_OLEDACTUATOR_H diff --git a/include/actuators/PositionalActuator1D.h b/include/actuators/PositionalActuator1D.h index 97128eb..9bbe9ec 100644 --- a/include/actuators/PositionalActuator1D.h +++ b/include/actuators/PositionalActuator1D.h @@ -5,30 +5,35 @@ #ifndef CONTROL_1DPOSITIONALACTUATOR_H #define CONTROL_1DPOSITIONALACTUATOR_H +#include + #include "actuators/Actuator.h" #include "flatbuffers/AngleControlMessageBuilder.h" #include "flatbuffers/SensorMessageBuilder.h" class PositionalActuator1D final : public Actuator { - public: - PositionalActuator1D(uint8_t device_id, ModuleType type) - : Actuator(device_id, type), - m_acm_builder(std::make_unique()) {}; +public: + PositionalActuator1D(uint8_t device_id, ModuleType type) + : Actuator(device_id, type), + m_acm_builder( + std::make_unique()) {}; - double get_position() override; - void actuate(double position) override; - void actuate(double x, double y) override; // no-op + double get_position() override; + std::string get_text() override; // no-op + void actuate(double position) override; + void actuate(const std::string &text) override; // no-op + void actuate(double x, double y) override; // no-op - std::vector get_actuation_message() override; - void update_sensor_data(const Flatbuffers::sensor_value &value) override; + std::vector get_actuation_message() override; + void update_sensor_data(const Flatbuffers::sensor_value &value) override; - private: - void update_loop(); - double m_target_position = 0; - double m_current_position = 0; - double m_board_target_position = 0; - std::unique_ptr m_acm_builder; +private: + void update_loop(); + double m_target_position = 0; + double m_current_position = 0; + double m_board_target_position = 0; + std::unique_ptr m_acm_builder; }; #endif // CONTROL_1DPOSITIONALACTUATOR_H diff --git a/include/flatbuffers/AngleControlMessageBuilder.h b/include/flatbuffers/AngleControlMessageBuilder.h index 291c7e1..4766c0e 100644 --- a/include/flatbuffers/AngleControlMessageBuilder.h +++ b/include/flatbuffers/AngleControlMessageBuilder.h @@ -14,15 +14,15 @@ namespace Flatbuffers { class AngleControlMessageBuilder { - public: - AngleControlMessageBuilder() : builder_(256) { - } +public: + AngleControlMessageBuilder() : builder_(256) {} - SerializedMessage build_angle_control_message(int16_t angle); - static const Messaging::AngleControlMessage *parse_angle_control_message(const uint8_t *buffer); + SerializedMessage build_angle_control_message(int16_t angle); + static const Messaging::AngleControlMessage * + parse_angle_control_message(const uint8_t *buffer); - private: - flatbuffers::FlatBufferBuilder builder_; +private: + flatbuffers::FlatBufferBuilder builder_; }; } // namespace Flatbuffers diff --git a/include/flatbuffers/RobotConfigurationBuilder.h b/include/flatbuffers/RobotConfigurationBuilder.h index 90a4fb7..d6a7406 100644 --- a/include/flatbuffers/RobotConfigurationBuilder.h +++ b/include/flatbuffers/RobotConfigurationBuilder.h @@ -12,33 +12,32 @@ namespace Flatbuffers { struct ModuleInstance { - uint8_t id; - ModuleType type; - int angle; + uint8_t id; + ModuleType type; + int angle; }; struct ModuleConnectionInstance { - uint8_t from_module_id; - uint8_t to_module_id; - uint8_t from_socket; - uint8_t to_socket; - Orientation orientation; + uint8_t from_module_id; + uint8_t to_module_id; + uint8_t from_socket; + uint8_t to_socket; + Orientation orientation; }; class RobotConfigurationBuilder { - public: - RobotConfigurationBuilder() : builder_(1024) { - } +public: + RobotConfigurationBuilder() : builder_(1024) {} - SerializedMessage - build_robot_configuration(const std::vector &modules, - const std::vector &connections); + SerializedMessage build_robot_configuration( + const std::vector &modules, + const std::vector &connections); - static const Frontend::RobotConfiguration * - parse_robot_configuration(const std::uint8_t *buffer); + static const Frontend::RobotConfiguration * + parse_robot_configuration(const std::uint8_t *buffer); - private: - flatbuffers::FlatBufferBuilder builder_; +private: + flatbuffers::FlatBufferBuilder builder_; }; } // namespace Flatbuffers diff --git a/include/flatbuffers/SensorMessageBuilder.h b/include/flatbuffers/SensorMessageBuilder.h index d712ee4..df1d77f 100644 --- a/include/flatbuffers/SensorMessageBuilder.h +++ b/include/flatbuffers/SensorMessageBuilder.h @@ -5,6 +5,7 @@ #ifndef SENSORMESSAGEBUILDER_H #define SENSORMESSAGEBUILDER_H +#include #include #include "flatbuffers_generated/SensorMessage_generated.h" @@ -12,42 +13,52 @@ namespace Flatbuffers { struct target_angle { - int16_t angle; + int16_t angle; }; struct current_angle { - int16_t angle; + int16_t angle; }; -typedef std::variant sensor_value; +struct current_text { + std::string text; +}; + +typedef std::variant sensor_value; class SensorMessageBuilder { - public: - SensorMessageBuilder() : builder_(1024) { +public: + SensorMessageBuilder() : builder_(1024) {} + + static const Messaging::SensorMessage * + parse_sensor_message(const std::uint8_t *buffer); + + template + static std::optional + build_sensor_value(Messaging::SensorValue type, T value) { + switch (type) { + case Messaging::SensorValue_TargetAngle: { + const Messaging::TargetAngle *target = + static_cast(value); + return target_angle{target->value()}; } - - static const Messaging::SensorMessage *parse_sensor_message(const std::uint8_t *buffer); - - template - static std::optional build_sensor_value(Messaging::SensorValue type, T value) { - switch (type) { - case Messaging::SensorValue_TargetAngle: { - const Messaging::TargetAngle *target = - static_cast(value); - return target_angle{target->value()}; - } - case Messaging::SensorValue_CurrentAngle: { - const Messaging::CurrentAngle *current = - static_cast(value); - return current_angle{current->value()}; - } - default: - return std::nullopt; - } + case Messaging::SensorValue_CurrentAngle: { + const Messaging::CurrentAngle *current = + static_cast(value); + return current_angle{current->value()}; } + case Messaging::SensorValue_CurrentText: { + const Messaging::CurrentText *current = + static_cast(value); + return current_text{current->value()->str()}; + } + default: + return std::nullopt; + } + } - private: - flatbuffers::FlatBufferBuilder builder_; +private: + flatbuffers::FlatBufferBuilder builder_; }; } // namespace Flatbuffers diff --git a/include/flatbuffers/SerializedMessage.h b/include/flatbuffers/SerializedMessage.h index ac51bb8..7635633 100644 --- a/include/flatbuffers/SerializedMessage.h +++ b/include/flatbuffers/SerializedMessage.h @@ -9,8 +9,8 @@ namespace Flatbuffers { struct SerializedMessage { - void *data; - size_t size; + void *data; + size_t size; }; } // namespace Flatbuffers diff --git a/include/flatbuffers/TextControlMessageBuilder.h b/include/flatbuffers/TextControlMessageBuilder.h new file mode 100644 index 0000000..aa26453 --- /dev/null +++ b/include/flatbuffers/TextControlMessageBuilder.h @@ -0,0 +1,27 @@ +// +// Created by Johnathon Slightham on 2025-06-30. +// + +#ifndef TEXTCONTROLMESSAGEBUILDER_H_ +#define TEXTCONTROLMESSAGEBUILDER_H_ + +#include +#include + +#include "SerializedMessage.h" +#include "flatbuffers/flatbuffers.h" +#include "flatbuffers_generated/TextControlMessage_generated.h" + +namespace Flatbuffers { +class TextControlMessageBuilder { +public: + TextControlMessageBuilder() : builder_(256) {} + + SerializedMessage build_text_control_message(std::string &t); + +private: + flatbuffers::FlatBufferBuilder builder_; +}; +} // namespace Flatbuffers + +#endif diff --git a/include/flatbuffers/TopologyMessageBuilder.h b/include/flatbuffers/TopologyMessageBuilder.h index d1ff220..b2bb9f0 100644 --- a/include/flatbuffers/TopologyMessageBuilder.h +++ b/include/flatbuffers/TopologyMessageBuilder.h @@ -12,20 +12,21 @@ namespace Flatbuffers { class TopologyMessageBuilder { - public: - TopologyMessageBuilder() : builder_(1024) { - } +public: + TopologyMessageBuilder() : builder_(1024) {} - SerializedMessage build_topology_message(uint8_t module_id, ModuleType module_type, - const std::vector &channel_to_module, - const std::vector &orientation_to_module); + SerializedMessage + build_topology_message(uint8_t module_id, ModuleType module_type, + const std::vector &channel_to_module, + const std::vector &orientation_to_module); - static const Messaging::TopologyMessage *parse_topology_message(const uint8_t *buffer); + static const Messaging::TopologyMessage * + parse_topology_message(const uint8_t *buffer); - static bool is_valid_topology_message(const uint8_t *buffer, size_t size); + static bool is_valid_topology_message(const uint8_t *buffer, size_t size); - private: - flatbuffers::FlatBufferBuilder builder_; +private: + flatbuffers::FlatBufferBuilder builder_; }; } // namespace Flatbuffers diff --git a/include/flatbuffers_generated/AngleControlMessage_generated.h b/include/flatbuffers_generated/AngleControlMessage_generated.h index 4724a5c..ce465ff 100644 --- a/include/flatbuffers_generated/AngleControlMessage_generated.h +++ b/include/flatbuffers_generated/AngleControlMessage_generated.h @@ -17,68 +17,76 @@ namespace Messaging { struct AngleControlMessage; struct AngleControlMessageBuilder; -struct AngleControlMessage FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { - typedef AngleControlMessageBuilder Builder; - enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ANGLE = 4 }; - int16_t angle() const { - return GetField(VT_ANGLE, 0); - } - bool Verify(::flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && VerifyField(verifier, VT_ANGLE, 2) && - verifier.EndTable(); - } +struct AngleControlMessage FLATBUFFERS_FINAL_CLASS + : private ::flatbuffers::Table { + typedef AngleControlMessageBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_ANGLE = 4 + }; + int16_t angle() const { return GetField(VT_ANGLE, 0); } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyField(verifier, VT_ANGLE, 2) && verifier.EndTable(); + } }; struct AngleControlMessageBuilder { - typedef AngleControlMessage Table; - ::flatbuffers::FlatBufferBuilder &fbb_; - ::flatbuffers::uoffset_t start_; - void add_angle(int16_t angle) { - fbb_.AddElement(AngleControlMessage::VT_ANGLE, angle, 0); - } - explicit AngleControlMessageBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { - start_ = fbb_.StartTable(); - } - ::flatbuffers::Offset Finish() { - const auto end = fbb_.EndTable(start_); - auto o = ::flatbuffers::Offset(end); - return o; - } + typedef AngleControlMessage Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_angle(int16_t angle) { + fbb_.AddElement(AngleControlMessage::VT_ANGLE, angle, 0); + } + explicit AngleControlMessageBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } }; inline ::flatbuffers::Offset -CreateAngleControlMessage(::flatbuffers::FlatBufferBuilder &_fbb, int16_t angle = 0) { - AngleControlMessageBuilder builder_(_fbb); - builder_.add_angle(angle); - return builder_.Finish(); +CreateAngleControlMessage(::flatbuffers::FlatBufferBuilder &_fbb, + int16_t angle = 0) { + AngleControlMessageBuilder builder_(_fbb); + builder_.add_angle(angle); + return builder_.Finish(); } -inline const Messaging::AngleControlMessage *GetAngleControlMessage(const void *buf) { - return ::flatbuffers::GetRoot(buf); +inline const Messaging::AngleControlMessage * +GetAngleControlMessage(const void *buf) { + return ::flatbuffers::GetRoot(buf); } -inline const Messaging::AngleControlMessage *GetSizePrefixedAngleControlMessage(const void *buf) { - return ::flatbuffers::GetSizePrefixedRoot(buf); +inline const Messaging::AngleControlMessage * +GetSizePrefixedAngleControlMessage(const void *buf) { + return ::flatbuffers::GetSizePrefixedRoot( + buf); } inline bool VerifyAngleControlMessageBuffer(::flatbuffers::Verifier &verifier) { - return verifier.VerifyBuffer(nullptr); + return verifier.VerifyBuffer(nullptr); } -inline bool VerifySizePrefixedAngleControlMessageBuffer(::flatbuffers::Verifier &verifier) { - return verifier.VerifySizePrefixedBuffer(nullptr); +inline bool +VerifySizePrefixedAngleControlMessageBuffer(::flatbuffers::Verifier &verifier) { + return verifier.VerifySizePrefixedBuffer( + nullptr); } -inline void -FinishAngleControlMessageBuffer(::flatbuffers::FlatBufferBuilder &fbb, - ::flatbuffers::Offset root) { - fbb.Finish(root); +inline void FinishAngleControlMessageBuffer( + ::flatbuffers::FlatBufferBuilder &fbb, + ::flatbuffers::Offset root) { + fbb.Finish(root); } inline void FinishSizePrefixedAngleControlMessageBuffer( ::flatbuffers::FlatBufferBuilder &fbb, ::flatbuffers::Offset root) { - fbb.FinishSizePrefixed(root); + fbb.FinishSizePrefixed(root); } } // namespace Messaging diff --git a/include/flatbuffers_generated/RobotConfiguration_generated.h b/include/flatbuffers_generated/RobotConfiguration_generated.h index 7749b05..3aa272c 100644 --- a/include/flatbuffers_generated/RobotConfiguration_generated.h +++ b/include/flatbuffers_generated/RobotConfiguration_generated.h @@ -23,177 +23,195 @@ struct RobotConfiguration; struct RobotConfigurationBuilder; struct ModuleConnection FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { - typedef ModuleConnectionBuilder Builder; - enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { - VT_FROM_MODULE_ID = 4, - VT_TO_MODULE_ID = 6, - VT_FROM_SOCKET = 8, - VT_TO_SOCKET = 10, - VT_ORIENTATION = 12 - }; - uint8_t from_module_id() const { - return GetField(VT_FROM_MODULE_ID, 0); - } - uint8_t to_module_id() const { - return GetField(VT_TO_MODULE_ID, 0); - } - uint8_t from_socket() const { - return GetField(VT_FROM_SOCKET, 0); - } - uint8_t to_socket() const { - return GetField(VT_TO_SOCKET, 0); - } - Orientation orientation() const { - return static_cast(GetField(VT_ORIENTATION, 0)); - } - bool Verify(::flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && VerifyField(verifier, VT_FROM_MODULE_ID, 1) && - VerifyField(verifier, VT_TO_MODULE_ID, 1) && - VerifyField(verifier, VT_FROM_SOCKET, 1) && - VerifyField(verifier, VT_TO_SOCKET, 1) && - VerifyField(verifier, VT_ORIENTATION, 1) && verifier.EndTable(); - } + typedef ModuleConnectionBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_FROM_MODULE_ID = 4, + VT_TO_MODULE_ID = 6, + VT_FROM_SOCKET = 8, + VT_TO_SOCKET = 10, + VT_ORIENTATION = 12 + }; + uint8_t from_module_id() const { + return GetField(VT_FROM_MODULE_ID, 0); + } + uint8_t to_module_id() const { return GetField(VT_TO_MODULE_ID, 0); } + uint8_t from_socket() const { return GetField(VT_FROM_SOCKET, 0); } + uint8_t to_socket() const { return GetField(VT_TO_SOCKET, 0); } + Orientation orientation() const { + return static_cast(GetField(VT_ORIENTATION, 0)); + } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyField(verifier, VT_FROM_MODULE_ID, 1) && + VerifyField(verifier, VT_TO_MODULE_ID, 1) && + VerifyField(verifier, VT_FROM_SOCKET, 1) && + VerifyField(verifier, VT_TO_SOCKET, 1) && + VerifyField(verifier, VT_ORIENTATION, 1) && + verifier.EndTable(); + } }; struct ModuleConnectionBuilder { - typedef ModuleConnection Table; - ::flatbuffers::FlatBufferBuilder &fbb_; - ::flatbuffers::uoffset_t start_; - void add_from_module_id(uint8_t from_module_id) { - fbb_.AddElement(ModuleConnection::VT_FROM_MODULE_ID, from_module_id, 0); - } - void add_to_module_id(uint8_t to_module_id) { - fbb_.AddElement(ModuleConnection::VT_TO_MODULE_ID, to_module_id, 0); - } - void add_from_socket(uint8_t from_socket) { - fbb_.AddElement(ModuleConnection::VT_FROM_SOCKET, from_socket, 0); - } - void add_to_socket(uint8_t to_socket) { - fbb_.AddElement(ModuleConnection::VT_TO_SOCKET, to_socket, 0); - } - void add_orientation(Orientation orientation) { - fbb_.AddElement(ModuleConnection::VT_ORIENTATION, static_cast(orientation), - 0); - } - explicit ModuleConnectionBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { - start_ = fbb_.StartTable(); - } - ::flatbuffers::Offset Finish() { - const auto end = fbb_.EndTable(start_); - auto o = ::flatbuffers::Offset(end); - return o; - } + typedef ModuleConnection Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_from_module_id(uint8_t from_module_id) { + fbb_.AddElement(ModuleConnection::VT_FROM_MODULE_ID, + from_module_id, 0); + } + void add_to_module_id(uint8_t to_module_id) { + fbb_.AddElement(ModuleConnection::VT_TO_MODULE_ID, to_module_id, + 0); + } + void add_from_socket(uint8_t from_socket) { + fbb_.AddElement(ModuleConnection::VT_FROM_SOCKET, from_socket, 0); + } + void add_to_socket(uint8_t to_socket) { + fbb_.AddElement(ModuleConnection::VT_TO_SOCKET, to_socket, 0); + } + void add_orientation(Orientation orientation) { + fbb_.AddElement(ModuleConnection::VT_ORIENTATION, + static_cast(orientation), 0); + } + explicit ModuleConnectionBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } }; inline ::flatbuffers::Offset -CreateModuleConnection(::flatbuffers::FlatBufferBuilder &_fbb, uint8_t from_module_id = 0, - uint8_t to_module_id = 0, uint8_t from_socket = 0, uint8_t to_socket = 0, +CreateModuleConnection(::flatbuffers::FlatBufferBuilder &_fbb, + uint8_t from_module_id = 0, uint8_t to_module_id = 0, + uint8_t from_socket = 0, uint8_t to_socket = 0, Orientation orientation = Orientation_Deg0) { - ModuleConnectionBuilder builder_(_fbb); - builder_.add_orientation(orientation); - builder_.add_to_socket(to_socket); - builder_.add_from_socket(from_socket); - builder_.add_to_module_id(to_module_id); - builder_.add_from_module_id(from_module_id); - return builder_.Finish(); + ModuleConnectionBuilder builder_(_fbb); + builder_.add_orientation(orientation); + builder_.add_to_socket(to_socket); + builder_.add_from_socket(from_socket); + builder_.add_to_module_id(to_module_id); + builder_.add_from_module_id(from_module_id); + return builder_.Finish(); } -struct RobotConfiguration FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { - typedef RobotConfigurationBuilder Builder; - enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { - VT_MODULES = 4, - VT_CONNECTIONS = 6 - }; - const ::flatbuffers::Vector<::flatbuffers::Offset> *modules() const { - return GetPointer> *>( - VT_MODULES); - } - const ::flatbuffers::Vector<::flatbuffers::Offset> * - connections() const { - return GetPointer< - const ::flatbuffers::Vector<::flatbuffers::Offset> *>( - VT_CONNECTIONS); - } - bool Verify(::flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_MODULES) && - verifier.VerifyVector(modules()) && verifier.VerifyVectorOfTables(modules()) && - VerifyOffset(verifier, VT_CONNECTIONS) && verifier.VerifyVector(connections()) && - verifier.VerifyVectorOfTables(connections()) && verifier.EndTable(); - } +struct RobotConfiguration FLATBUFFERS_FINAL_CLASS + : private ::flatbuffers::Table { + typedef RobotConfigurationBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_MODULES = 4, + VT_CONNECTIONS = 6 + }; + const ::flatbuffers::Vector<::flatbuffers::Offset> * + modules() const { + return GetPointer< + const ::flatbuffers::Vector<::flatbuffers::Offset> *>( + VT_MODULES); + } + const ::flatbuffers::Vector< + ::flatbuffers::Offset> * + connections() const { + return GetPointer> *>(VT_CONNECTIONS); + } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_MODULES) && + verifier.VerifyVector(modules()) && + verifier.VerifyVectorOfTables(modules()) && + VerifyOffset(verifier, VT_CONNECTIONS) && + verifier.VerifyVector(connections()) && + verifier.VerifyVectorOfTables(connections()) && verifier.EndTable(); + } }; struct RobotConfigurationBuilder { - typedef RobotConfiguration Table; - ::flatbuffers::FlatBufferBuilder &fbb_; - ::flatbuffers::uoffset_t start_; - void add_modules( - ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> modules) { - fbb_.AddOffset(RobotConfiguration::VT_MODULES, modules); - } - void add_connections(::flatbuffers::Offset< - ::flatbuffers::Vector<::flatbuffers::Offset>> - connections) { - fbb_.AddOffset(RobotConfiguration::VT_CONNECTIONS, connections); - } - explicit RobotConfigurationBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { - start_ = fbb_.StartTable(); - } - ::flatbuffers::Offset Finish() { - const auto end = fbb_.EndTable(start_); - auto o = ::flatbuffers::Offset(end); - return o; - } + typedef RobotConfiguration Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_modules(::flatbuffers::Offset< + ::flatbuffers::Vector<::flatbuffers::Offset>> + modules) { + fbb_.AddOffset(RobotConfiguration::VT_MODULES, modules); + } + void add_connections(::flatbuffers::Offset<::flatbuffers::Vector< + ::flatbuffers::Offset>> + connections) { + fbb_.AddOffset(RobotConfiguration::VT_CONNECTIONS, connections); + } + explicit RobotConfigurationBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } }; inline ::flatbuffers::Offset CreateRobotConfiguration( ::flatbuffers::FlatBufferBuilder &_fbb, - ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> modules = 0, - ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> + ::flatbuffers::Offset< + ::flatbuffers::Vector<::flatbuffers::Offset>> + modules = 0, + ::flatbuffers::Offset<::flatbuffers::Vector< + ::flatbuffers::Offset>> connections = 0) { - RobotConfigurationBuilder builder_(_fbb); - builder_.add_connections(connections); - builder_.add_modules(modules); - return builder_.Finish(); + RobotConfigurationBuilder builder_(_fbb); + builder_.add_connections(connections); + builder_.add_modules(modules); + return builder_.Finish(); } inline ::flatbuffers::Offset CreateRobotConfigurationDirect( ::flatbuffers::FlatBufferBuilder &_fbb, const std::vector<::flatbuffers::Offset> *modules = nullptr, - const std::vector<::flatbuffers::Offset> *connections = nullptr) { - auto modules__ = modules ? _fbb.CreateVector<::flatbuffers::Offset>(*modules) : 0; - auto connections__ = - connections - ? _fbb.CreateVector<::flatbuffers::Offset>(*connections) - : 0; - return Frontend::CreateRobotConfiguration(_fbb, modules__, connections__); + const std::vector<::flatbuffers::Offset> + *connections = nullptr) { + auto modules__ = + modules ? _fbb.CreateVector<::flatbuffers::Offset>(*modules) + : 0; + auto connections__ = + connections + ? _fbb.CreateVector< + ::flatbuffers::Offset>(*connections) + : 0; + return Frontend::CreateRobotConfiguration(_fbb, modules__, connections__); } -inline const Frontend::RobotConfiguration *GetRobotConfiguration(const void *buf) { - return ::flatbuffers::GetRoot(buf); +inline const Frontend::RobotConfiguration * +GetRobotConfiguration(const void *buf) { + return ::flatbuffers::GetRoot(buf); } -inline const Frontend::RobotConfiguration *GetSizePrefixedRobotConfiguration(const void *buf) { - return ::flatbuffers::GetSizePrefixedRoot(buf); +inline const Frontend::RobotConfiguration * +GetSizePrefixedRobotConfiguration(const void *buf) { + return ::flatbuffers::GetSizePrefixedRoot(buf); } inline bool VerifyRobotConfigurationBuffer(::flatbuffers::Verifier &verifier) { - return verifier.VerifyBuffer(nullptr); + return verifier.VerifyBuffer(nullptr); } -inline bool VerifySizePrefixedRobotConfigurationBuffer(::flatbuffers::Verifier &verifier) { - return verifier.VerifySizePrefixedBuffer(nullptr); +inline bool +VerifySizePrefixedRobotConfigurationBuffer(::flatbuffers::Verifier &verifier) { + return verifier.VerifySizePrefixedBuffer( + nullptr); } -inline void -FinishRobotConfigurationBuffer(::flatbuffers::FlatBufferBuilder &fbb, - ::flatbuffers::Offset root) { - fbb.Finish(root); +inline void FinishRobotConfigurationBuffer( + ::flatbuffers::FlatBufferBuilder &fbb, + ::flatbuffers::Offset root) { + fbb.Finish(root); } inline void FinishSizePrefixedRobotConfigurationBuffer( ::flatbuffers::FlatBufferBuilder &fbb, ::flatbuffers::Offset root) { - fbb.FinishSizePrefixed(root); + fbb.FinishSizePrefixed(root); } } // namespace Frontend diff --git a/include/flatbuffers_generated/RobotModule_generated.h b/include/flatbuffers_generated/RobotModule_generated.h index 823a912..56a50d3 100644 --- a/include/flatbuffers_generated/RobotModule_generated.h +++ b/include/flatbuffers_generated/RobotModule_generated.h @@ -19,200 +19,227 @@ struct RobotModule; struct RobotModuleBuilder; enum ModuleType : int8_t { - ModuleType_SPLITTER = 0, - ModuleType_SERVO_1 = 1, - ModuleType_DC_MOTOR = 2, - ModuleType_BATTERY = 3, - ModuleType_SERVO_2 = 4, - ModuleType_MIN = ModuleType_SPLITTER, - ModuleType_MAX = ModuleType_SERVO_2 + ModuleType_SPLITTER = 0, + ModuleType_SERVO_1 = 1, + ModuleType_DC_MOTOR = 2, + ModuleType_BATTERY = 3, + ModuleType_SERVO_2 = 4, + ModuleType_DISPLAY = 5, + ModuleType_GRIPPER = 6, + ModuleType_SPEAKER = 7, + ModuleType_IMU = 8, + ModuleType_DISTANCE_SENSOR = 9, + ModuleType_SPLITTER_2 = 10, + ModuleType_SPLITTER_3 = 11, + ModuleType_SPLITTER_4 = 12, + ModuleType_SPLITTER_5 = 13, + ModuleType_SPLITTER_6 = 14, + ModuleType_SPLITTER_7 = 15, + ModuleType_SPLITTER_8 = 16, + ModuleType_MIN = ModuleType_SPLITTER, + ModuleType_MAX = ModuleType_SPLITTER_8 }; -inline const ModuleType (&EnumValuesModuleType())[5] { - static const ModuleType values[] = {ModuleType_SPLITTER, ModuleType_SERVO_1, - ModuleType_DC_MOTOR, ModuleType_BATTERY, - ModuleType_SERVO_2}; - return values; +inline const ModuleType (&EnumValuesModuleType())[17] { + static const ModuleType values[] = { + ModuleType_SPLITTER, ModuleType_SERVO_1, ModuleType_DC_MOTOR, + ModuleType_BATTERY, ModuleType_SERVO_2, ModuleType_DISPLAY, + ModuleType_GRIPPER, ModuleType_SPEAKER, ModuleType_IMU, + ModuleType_DISTANCE_SENSOR, ModuleType_SPLITTER_2, ModuleType_SPLITTER_3, + ModuleType_SPLITTER_4, ModuleType_SPLITTER_5, ModuleType_SPLITTER_6, + ModuleType_SPLITTER_7, ModuleType_SPLITTER_8}; + return values; } inline const char *const *EnumNamesModuleType() { - static const char *const names[6] = {"SPLITTER", "SERVO_1", "DC_MOTOR", - "BATTERY", "SERVO_2", nullptr}; - return names; + static const char *const names[18] = { + "SPLITTER", "SERVO_1", "DC_MOTOR", "BATTERY", "SERVO_2", + "DISPLAY", "GRIPPER", "SPEAKER", "IMU", "DISTANCE_SENSOR", + "SPLITTER_2", "SPLITTER_3", "SPLITTER_4", "SPLITTER_5", "SPLITTER_6", + "SPLITTER_7", "SPLITTER_8", nullptr}; + return names; } inline const char *EnumNameModuleType(ModuleType e) { - if (::flatbuffers::IsOutRange(e, ModuleType_SPLITTER, ModuleType_SERVO_2)) - return ""; - const size_t index = static_cast(e); - return EnumNamesModuleType()[index]; + if (::flatbuffers::IsOutRange(e, ModuleType_SPLITTER, ModuleType_SPLITTER_8)) + return ""; + const size_t index = static_cast(e); + return EnumNamesModuleType()[index]; } enum Orientation : int8_t { - Orientation_Deg0 = 0, - Orientation_Deg90 = 1, - Orientation_Deg180 = 2, - Orientation_Deg270 = 3, - Orientation_MIN = Orientation_Deg0, - Orientation_MAX = Orientation_Deg270 + Orientation_Deg0 = 0, + Orientation_Deg90 = 1, + Orientation_Deg180 = 2, + Orientation_Deg270 = 3, + Orientation_MIN = Orientation_Deg0, + Orientation_MAX = Orientation_Deg270 }; inline const Orientation (&EnumValuesOrientation())[4] { - static const Orientation values[] = {Orientation_Deg0, Orientation_Deg90, Orientation_Deg180, - Orientation_Deg270}; - return values; + static const Orientation values[] = {Orientation_Deg0, Orientation_Deg90, + Orientation_Deg180, Orientation_Deg270}; + return values; } inline const char *const *EnumNamesOrientation() { - static const char *const names[5] = {"Deg0", "Deg90", "Deg180", "Deg270", nullptr}; - return names; + static const char *const names[5] = {"Deg0", "Deg90", "Deg180", "Deg270", + nullptr}; + return names; } inline const char *EnumNameOrientation(Orientation e) { - if (::flatbuffers::IsOutRange(e, Orientation_Deg0, Orientation_Deg270)) - return ""; - const size_t index = static_cast(e); - return EnumNamesOrientation()[index]; + if (::flatbuffers::IsOutRange(e, Orientation_Deg0, Orientation_Deg270)) + return ""; + const size_t index = static_cast(e); + return EnumNamesOrientation()[index]; } enum ModuleState : uint8_t { - ModuleState_NONE = 0, - ModuleState_MotorState = 1, - ModuleState_MIN = ModuleState_NONE, - ModuleState_MAX = ModuleState_MotorState + ModuleState_NONE = 0, + ModuleState_MotorState = 1, + ModuleState_MIN = ModuleState_NONE, + ModuleState_MAX = ModuleState_MotorState }; inline const ModuleState (&EnumValuesModuleState())[2] { - static const ModuleState values[] = {ModuleState_NONE, ModuleState_MotorState}; - return values; + static const ModuleState values[] = {ModuleState_NONE, + ModuleState_MotorState}; + return values; } inline const char *const *EnumNamesModuleState() { - static const char *const names[3] = {"NONE", "MotorState", nullptr}; - return names; + static const char *const names[3] = {"NONE", "MotorState", nullptr}; + return names; } inline const char *EnumNameModuleState(ModuleState e) { - if (::flatbuffers::IsOutRange(e, ModuleState_NONE, ModuleState_MotorState)) - return ""; - const size_t index = static_cast(e); - return EnumNamesModuleState()[index]; + if (::flatbuffers::IsOutRange(e, ModuleState_NONE, ModuleState_MotorState)) + return ""; + const size_t index = static_cast(e); + return EnumNamesModuleState()[index]; } template struct ModuleStateTraits { - static const ModuleState enum_value = ModuleState_NONE; + static const ModuleState enum_value = ModuleState_NONE; }; template <> struct ModuleStateTraits { - static const ModuleState enum_value = ModuleState_MotorState; + static const ModuleState enum_value = ModuleState_MotorState; }; -bool VerifyModuleState(::flatbuffers::Verifier &verifier, const void *obj, ModuleState type); -bool VerifyModuleStateVector(::flatbuffers::Verifier &verifier, - const ::flatbuffers::Vector<::flatbuffers::Offset> *values, - const ::flatbuffers::Vector *types); +bool VerifyModuleState(::flatbuffers::Verifier &verifier, const void *obj, + ModuleState type); +bool VerifyModuleStateVector( + ::flatbuffers::Verifier &verifier, + const ::flatbuffers::Vector<::flatbuffers::Offset> *values, + const ::flatbuffers::Vector *types); struct MotorState FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { - typedef MotorStateBuilder Builder; - enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ANGLE = 4 }; - int32_t angle() const { - return GetField(VT_ANGLE, 0); - } - bool Verify(::flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && VerifyField(verifier, VT_ANGLE, 4) && - verifier.EndTable(); - } + typedef MotorStateBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_ANGLE = 4 + }; + int32_t angle() const { return GetField(VT_ANGLE, 0); } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyField(verifier, VT_ANGLE, 4) && verifier.EndTable(); + } }; struct MotorStateBuilder { - typedef MotorState Table; - ::flatbuffers::FlatBufferBuilder &fbb_; - ::flatbuffers::uoffset_t start_; - void add_angle(int32_t angle) { - fbb_.AddElement(MotorState::VT_ANGLE, angle, 0); - } - explicit MotorStateBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { - start_ = fbb_.StartTable(); - } - ::flatbuffers::Offset Finish() { - const auto end = fbb_.EndTable(start_); - auto o = ::flatbuffers::Offset(end); - return o; - } + typedef MotorState Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_angle(int32_t angle) { + fbb_.AddElement(MotorState::VT_ANGLE, angle, 0); + } + explicit MotorStateBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } }; -inline ::flatbuffers::Offset CreateMotorState(::flatbuffers::FlatBufferBuilder &_fbb, - int32_t angle = 0) { - MotorStateBuilder builder_(_fbb); - builder_.add_angle(angle); - return builder_.Finish(); +inline ::flatbuffers::Offset +CreateMotorState(::flatbuffers::FlatBufferBuilder &_fbb, int32_t angle = 0) { + MotorStateBuilder builder_(_fbb); + builder_.add_angle(angle); + return builder_.Finish(); } struct RobotModule FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { - typedef RobotModuleBuilder Builder; - enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { - VT_ID = 4, - VT_MODULE_TYPE = 6, - VT_CONFIGURATION_TYPE = 8, - VT_CONFIGURATION = 10 - }; - uint8_t id() const { - return GetField(VT_ID, 0); - } - ModuleType module_type() const { - return static_cast(GetField(VT_MODULE_TYPE, 0)); - } - ModuleState configuration_type() const { - return static_cast(GetField(VT_CONFIGURATION_TYPE, 0)); - } - const void *configuration() const { - return GetPointer(VT_CONFIGURATION); - } - template const T *configuration_as() const; - const MotorState *configuration_as_MotorState() const { - return configuration_type() == ModuleState_MotorState - ? static_cast(configuration()) - : nullptr; - } - bool Verify(::flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && VerifyField(verifier, VT_ID, 1) && - VerifyField(verifier, VT_MODULE_TYPE, 1) && - VerifyField(verifier, VT_CONFIGURATION_TYPE, 1) && - VerifyOffset(verifier, VT_CONFIGURATION) && - VerifyModuleState(verifier, configuration(), configuration_type()) && - verifier.EndTable(); - } + typedef RobotModuleBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_ID = 4, + VT_MODULE_TYPE = 6, + VT_CONFIGURATION_TYPE = 8, + VT_CONFIGURATION = 10 + }; + uint8_t id() const { return GetField(VT_ID, 0); } + ModuleType module_type() const { + return static_cast(GetField(VT_MODULE_TYPE, 0)); + } + ModuleState configuration_type() const { + return static_cast( + GetField(VT_CONFIGURATION_TYPE, 0)); + } + const void *configuration() const { + return GetPointer(VT_CONFIGURATION); + } + template const T *configuration_as() const; + const MotorState *configuration_as_MotorState() const { + return configuration_type() == ModuleState_MotorState + ? static_cast(configuration()) + : nullptr; + } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyField(verifier, VT_ID, 1) && + VerifyField(verifier, VT_MODULE_TYPE, 1) && + VerifyField(verifier, VT_CONFIGURATION_TYPE, 1) && + VerifyOffset(verifier, VT_CONFIGURATION) && + VerifyModuleState(verifier, configuration(), configuration_type()) && + verifier.EndTable(); + } }; -template <> inline const MotorState *RobotModule::configuration_as() const { - return configuration_as_MotorState(); +template <> +inline const MotorState *RobotModule::configuration_as() const { + return configuration_as_MotorState(); } struct RobotModuleBuilder { - typedef RobotModule Table; - ::flatbuffers::FlatBufferBuilder &fbb_; - ::flatbuffers::uoffset_t start_; - void add_id(uint8_t id) { - fbb_.AddElement(RobotModule::VT_ID, id, 0); - } - void add_module_type(ModuleType module_type) { - fbb_.AddElement(RobotModule::VT_MODULE_TYPE, static_cast(module_type), 0); - } - void add_configuration_type(ModuleState configuration_type) { - fbb_.AddElement(RobotModule::VT_CONFIGURATION_TYPE, - static_cast(configuration_type), 0); - } - void add_configuration(::flatbuffers::Offset configuration) { - fbb_.AddOffset(RobotModule::VT_CONFIGURATION, configuration); - } - explicit RobotModuleBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { - start_ = fbb_.StartTable(); - } - ::flatbuffers::Offset Finish() { - const auto end = fbb_.EndTable(start_); - auto o = ::flatbuffers::Offset(end); - return o; - } + typedef RobotModule Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_id(uint8_t id) { + fbb_.AddElement(RobotModule::VT_ID, id, 0); + } + void add_module_type(ModuleType module_type) { + fbb_.AddElement(RobotModule::VT_MODULE_TYPE, + static_cast(module_type), 0); + } + void add_configuration_type(ModuleState configuration_type) { + fbb_.AddElement(RobotModule::VT_CONFIGURATION_TYPE, + static_cast(configuration_type), 0); + } + void add_configuration(::flatbuffers::Offset configuration) { + fbb_.AddOffset(RobotModule::VT_CONFIGURATION, configuration); + } + explicit RobotModuleBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } }; inline ::flatbuffers::Offset @@ -220,69 +247,72 @@ CreateRobotModule(::flatbuffers::FlatBufferBuilder &_fbb, uint8_t id = 0, ModuleType module_type = ModuleType_SPLITTER, ModuleState configuration_type = ModuleState_NONE, ::flatbuffers::Offset configuration = 0) { - RobotModuleBuilder builder_(_fbb); - builder_.add_configuration(configuration); - builder_.add_configuration_type(configuration_type); - builder_.add_module_type(module_type); - builder_.add_id(id); - return builder_.Finish(); + RobotModuleBuilder builder_(_fbb); + builder_.add_configuration(configuration); + builder_.add_configuration_type(configuration_type); + builder_.add_module_type(module_type); + builder_.add_id(id); + return builder_.Finish(); } -inline bool VerifyModuleState(::flatbuffers::Verifier &verifier, const void *obj, - ModuleState type) { - switch (type) { - case ModuleState_NONE: { - return true; - } - case ModuleState_MotorState: { - auto ptr = reinterpret_cast(obj); - return verifier.VerifyTable(ptr); - } - default: - return true; - } -} - -inline bool -VerifyModuleStateVector(::flatbuffers::Verifier &verifier, - const ::flatbuffers::Vector<::flatbuffers::Offset> *values, - const ::flatbuffers::Vector *types) { - if (!values || !types) - return !values && !types; - if (values->size() != types->size()) - return false; - for (::flatbuffers::uoffset_t i = 0; i < values->size(); ++i) { - if (!VerifyModuleState(verifier, values->Get(i), types->GetEnum(i))) { - return false; - } - } +inline bool VerifyModuleState(::flatbuffers::Verifier &verifier, + const void *obj, ModuleState type) { + switch (type) { + case ModuleState_NONE: { return true; + } + case ModuleState_MotorState: { + auto ptr = reinterpret_cast(obj); + return verifier.VerifyTable(ptr); + } + default: + return true; + } +} + +inline bool VerifyModuleStateVector( + ::flatbuffers::Verifier &verifier, + const ::flatbuffers::Vector<::flatbuffers::Offset> *values, + const ::flatbuffers::Vector *types) { + if (!values || !types) + return !values && !types; + if (values->size() != types->size()) + return false; + for (::flatbuffers::uoffset_t i = 0; i < values->size(); ++i) { + if (!VerifyModuleState(verifier, values->Get(i), + types->GetEnum(i))) { + return false; + } + } + return true; } inline const RobotModule *GetRobotModule(const void *buf) { - return ::flatbuffers::GetRoot(buf); + return ::flatbuffers::GetRoot(buf); } inline const RobotModule *GetSizePrefixedRobotModule(const void *buf) { - return ::flatbuffers::GetSizePrefixedRoot(buf); + return ::flatbuffers::GetSizePrefixedRoot(buf); } inline bool VerifyRobotModuleBuffer(::flatbuffers::Verifier &verifier) { - return verifier.VerifyBuffer(nullptr); + return verifier.VerifyBuffer(nullptr); } -inline bool VerifySizePrefixedRobotModuleBuffer(::flatbuffers::Verifier &verifier) { - return verifier.VerifySizePrefixedBuffer(nullptr); +inline bool +VerifySizePrefixedRobotModuleBuffer(::flatbuffers::Verifier &verifier) { + return verifier.VerifySizePrefixedBuffer(nullptr); } inline void FinishRobotModuleBuffer(::flatbuffers::FlatBufferBuilder &fbb, ::flatbuffers::Offset root) { - fbb.Finish(root); + fbb.Finish(root); } -inline void FinishSizePrefixedRobotModuleBuffer(::flatbuffers::FlatBufferBuilder &fbb, - ::flatbuffers::Offset root) { - fbb.FinishSizePrefixed(root); +inline void +FinishSizePrefixedRobotModuleBuffer(::flatbuffers::FlatBufferBuilder &fbb, + ::flatbuffers::Offset root) { + fbb.FinishSizePrefixed(root); } #endif // FLATBUFFERS_GENERATED_ROBOTMODULE_H_ diff --git a/include/flatbuffers_generated/SensorMessage_generated.h b/include/flatbuffers_generated/SensorMessage_generated.h index 29920a7..7edb5ec 100644 --- a/include/flatbuffers_generated/SensorMessage_generated.h +++ b/include/flatbuffers_generated/SensorMessage_generated.h @@ -8,15 +8,18 @@ // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. // static_assert(FLATBUFFERS_VERSION_MAJOR == 25 && -// FLATBUFFERS_VERSION_MINOR == 2 && -// FLATBUFFERS_VERSION_REVISION == 10, -// "Non-compatible flatbuffers version included"); +// FLATBUFFERS_VERSION_MINOR == 2 && +// FLATBUFFERS_VERSION_REVISION == 10, +// "Non-compatible flatbuffers version included"); namespace Messaging { struct TargetAngle; struct TargetAngleBuilder; +struct CurrentText; +struct CurrentTextBuilder; + struct CurrentAngle; struct CurrentAngleBuilder; @@ -24,240 +27,316 @@ struct SensorMessage; struct SensorMessageBuilder; enum SensorValue : uint8_t { - SensorValue_NONE = 0, - SensorValue_TargetAngle = 1, - SensorValue_CurrentAngle = 2, - SensorValue_MIN = SensorValue_NONE, - SensorValue_MAX = SensorValue_CurrentAngle + SensorValue_NONE = 0, + SensorValue_TargetAngle = 1, + SensorValue_CurrentAngle = 2, + SensorValue_CurrentText = 3, + SensorValue_MIN = SensorValue_NONE, + SensorValue_MAX = SensorValue_CurrentText }; -inline const SensorValue (&EnumValuesSensorValue())[3] { - static const SensorValue values[] = {SensorValue_NONE, SensorValue_TargetAngle, - SensorValue_CurrentAngle}; - return values; +inline const SensorValue (&EnumValuesSensorValue())[4] { + static const SensorValue values[] = { + SensorValue_NONE, SensorValue_TargetAngle, SensorValue_CurrentAngle, + SensorValue_CurrentText}; + return values; } inline const char *const *EnumNamesSensorValue() { - static const char *const names[4] = {"NONE", "TargetAngle", "CurrentAngle", nullptr}; - return names; + static const char *const names[5] = {"NONE", "TargetAngle", "CurrentAngle", + "CurrentText", nullptr}; + return names; } inline const char *EnumNameSensorValue(SensorValue e) { - if (::flatbuffers::IsOutRange(e, SensorValue_NONE, SensorValue_CurrentAngle)) - return ""; - const size_t index = static_cast(e); - return EnumNamesSensorValue()[index]; + if (::flatbuffers::IsOutRange(e, SensorValue_NONE, SensorValue_CurrentText)) + return ""; + const size_t index = static_cast(e); + return EnumNamesSensorValue()[index]; } template struct SensorValueTraits { - static const SensorValue enum_value = SensorValue_NONE; + static const SensorValue enum_value = SensorValue_NONE; }; template <> struct SensorValueTraits { - static const SensorValue enum_value = SensorValue_TargetAngle; + static const SensorValue enum_value = SensorValue_TargetAngle; }; template <> struct SensorValueTraits { - static const SensorValue enum_value = SensorValue_CurrentAngle; + static const SensorValue enum_value = SensorValue_CurrentAngle; }; -bool VerifySensorValue(::flatbuffers::Verifier &verifier, const void *obj, SensorValue type); -bool VerifySensorValueVector(::flatbuffers::Verifier &verifier, - const ::flatbuffers::Vector<::flatbuffers::Offset> *values, - const ::flatbuffers::Vector *types); +template <> struct SensorValueTraits { + static const SensorValue enum_value = SensorValue_CurrentText; +}; + +bool VerifySensorValue(::flatbuffers::Verifier &verifier, const void *obj, + SensorValue type); +bool VerifySensorValueVector( + ::flatbuffers::Verifier &verifier, + const ::flatbuffers::Vector<::flatbuffers::Offset> *values, + const ::flatbuffers::Vector *types); struct TargetAngle FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { - typedef TargetAngleBuilder Builder; - enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_VALUE = 4 }; - int16_t value() const { - return GetField(VT_VALUE, 0); - } - bool Verify(::flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && VerifyField(verifier, VT_VALUE, 2) && - verifier.EndTable(); - } + typedef TargetAngleBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_VALUE = 4 + }; + int16_t value() const { return GetField(VT_VALUE, 0); } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyField(verifier, VT_VALUE, 2) && verifier.EndTable(); + } }; struct TargetAngleBuilder { - typedef TargetAngle Table; - ::flatbuffers::FlatBufferBuilder &fbb_; - ::flatbuffers::uoffset_t start_; - void add_value(int16_t value) { - fbb_.AddElement(TargetAngle::VT_VALUE, value, 0); - } - explicit TargetAngleBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { - start_ = fbb_.StartTable(); - } - ::flatbuffers::Offset Finish() { - const auto end = fbb_.EndTable(start_); - auto o = ::flatbuffers::Offset(end); - return o; - } + typedef TargetAngle Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_value(int16_t value) { + fbb_.AddElement(TargetAngle::VT_VALUE, value, 0); + } + explicit TargetAngleBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } }; -inline ::flatbuffers::Offset CreateTargetAngle(::flatbuffers::FlatBufferBuilder &_fbb, - int16_t value = 0) { - TargetAngleBuilder builder_(_fbb); - builder_.add_value(value); - return builder_.Finish(); +inline ::flatbuffers::Offset +CreateTargetAngle(::flatbuffers::FlatBufferBuilder &_fbb, int16_t value = 0) { + TargetAngleBuilder builder_(_fbb); + builder_.add_value(value); + return builder_.Finish(); +} + +struct CurrentText FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { + typedef CurrentTextBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_VALUE = 4 + }; + const ::flatbuffers::String *value() const { + return GetPointer(VT_VALUE); + } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_VALUE) && + verifier.VerifyString(value()) && verifier.EndTable(); + } +}; + +struct CurrentTextBuilder { + typedef CurrentText Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_value(::flatbuffers::Offset<::flatbuffers::String> value) { + fbb_.AddOffset(CurrentText::VT_VALUE, value); + } + explicit CurrentTextBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } +}; + +inline ::flatbuffers::Offset +CreateCurrentText(::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> value = 0) { + CurrentTextBuilder builder_(_fbb); + builder_.add_value(value); + return builder_.Finish(); +} + +inline ::flatbuffers::Offset +CreateCurrentTextDirect(::flatbuffers::FlatBufferBuilder &_fbb, + const char *value = nullptr) { + auto value__ = value ? _fbb.CreateString(value) : 0; + return Messaging::CreateCurrentText(_fbb, value__); } struct CurrentAngle FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { - typedef CurrentAngleBuilder Builder; - enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_VALUE = 4 }; - int16_t value() const { - return GetField(VT_VALUE, 0); - } - bool Verify(::flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && VerifyField(verifier, VT_VALUE, 2) && - verifier.EndTable(); - } + typedef CurrentAngleBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_VALUE = 4 + }; + int16_t value() const { return GetField(VT_VALUE, 0); } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyField(verifier, VT_VALUE, 2) && verifier.EndTable(); + } }; struct CurrentAngleBuilder { - typedef CurrentAngle Table; - ::flatbuffers::FlatBufferBuilder &fbb_; - ::flatbuffers::uoffset_t start_; - void add_value(int16_t value) { - fbb_.AddElement(CurrentAngle::VT_VALUE, value, 0); - } - explicit CurrentAngleBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { - start_ = fbb_.StartTable(); - } - ::flatbuffers::Offset Finish() { - const auto end = fbb_.EndTable(start_); - auto o = ::flatbuffers::Offset(end); - return o; - } + typedef CurrentAngle Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_value(int16_t value) { + fbb_.AddElement(CurrentAngle::VT_VALUE, value, 0); + } + explicit CurrentAngleBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } }; inline ::flatbuffers::Offset CreateCurrentAngle(::flatbuffers::FlatBufferBuilder &_fbb, int16_t value = 0) { - CurrentAngleBuilder builder_(_fbb); - builder_.add_value(value); - return builder_.Finish(); + CurrentAngleBuilder builder_(_fbb); + builder_.add_value(value); + return builder_.Finish(); } struct SensorMessage FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { - typedef SensorMessageBuilder Builder; - enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { - VT_VALUES_TYPE = 4, - VT_VALUES = 6 - }; - const ::flatbuffers::Vector *values_type() const { - return GetPointer *>(VT_VALUES_TYPE); - } - const ::flatbuffers::Vector<::flatbuffers::Offset> *values() const { - return GetPointer> *>(VT_VALUES); - } - bool Verify(::flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_VALUES_TYPE) && - verifier.VerifyVector(values_type()) && VerifyOffset(verifier, VT_VALUES) && - verifier.VerifyVector(values()) && - VerifySensorValueVector(verifier, values(), values_type()) && verifier.EndTable(); - } + typedef SensorMessageBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_VALUES_TYPE = 4, + VT_VALUES = 6 + }; + const ::flatbuffers::Vector *values_type() const { + return GetPointer *>(VT_VALUES_TYPE); + } + const ::flatbuffers::Vector<::flatbuffers::Offset> *values() const { + return GetPointer< + const ::flatbuffers::Vector<::flatbuffers::Offset> *>(VT_VALUES); + } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyOffset(verifier, VT_VALUES_TYPE) && + verifier.VerifyVector(values_type()) && + VerifyOffset(verifier, VT_VALUES) && + verifier.VerifyVector(values()) && + VerifySensorValueVector(verifier, values(), values_type()) && + verifier.EndTable(); + } }; struct SensorMessageBuilder { - typedef SensorMessage Table; - ::flatbuffers::FlatBufferBuilder &fbb_; - ::flatbuffers::uoffset_t start_; - void add_values_type(::flatbuffers::Offset<::flatbuffers::Vector> values_type) { - fbb_.AddOffset(SensorMessage::VT_VALUES_TYPE, values_type); - } - void - add_values(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> values) { - fbb_.AddOffset(SensorMessage::VT_VALUES, values); - } - explicit SensorMessageBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { - start_ = fbb_.StartTable(); - } - ::flatbuffers::Offset Finish() { - const auto end = fbb_.EndTable(start_); - auto o = ::flatbuffers::Offset(end); - return o; - } + typedef SensorMessage Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_values_type( + ::flatbuffers::Offset<::flatbuffers::Vector> values_type) { + fbb_.AddOffset(SensorMessage::VT_VALUES_TYPE, values_type); + } + void add_values( + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> + values) { + fbb_.AddOffset(SensorMessage::VT_VALUES, values); + } + explicit SensorMessageBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } }; inline ::flatbuffers::Offset CreateSensorMessage( ::flatbuffers::FlatBufferBuilder &_fbb, ::flatbuffers::Offset<::flatbuffers::Vector> values_type = 0, - ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> values = 0) { - SensorMessageBuilder builder_(_fbb); - builder_.add_values(values); - builder_.add_values_type(values_type); - return builder_.Finish(); + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> + values = 0) { + SensorMessageBuilder builder_(_fbb); + builder_.add_values(values); + builder_.add_values_type(values_type); + return builder_.Finish(); } -inline ::flatbuffers::Offset -CreateSensorMessageDirect(::flatbuffers::FlatBufferBuilder &_fbb, - const std::vector *values_type = nullptr, - const std::vector<::flatbuffers::Offset> *values = nullptr) { - auto values_type__ = values_type ? _fbb.CreateVector(*values_type) : 0; - auto values__ = values ? _fbb.CreateVector<::flatbuffers::Offset>(*values) : 0; - return Messaging::CreateSensorMessage(_fbb, values_type__, values__); +inline ::flatbuffers::Offset CreateSensorMessageDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const std::vector *values_type = nullptr, + const std::vector<::flatbuffers::Offset> *values = nullptr) { + auto values_type__ = + values_type ? _fbb.CreateVector(*values_type) : 0; + auto values__ = + values ? _fbb.CreateVector<::flatbuffers::Offset>(*values) : 0; + return Messaging::CreateSensorMessage(_fbb, values_type__, values__); } -inline bool VerifySensorValue(::flatbuffers::Verifier &verifier, const void *obj, - SensorValue type) { - switch (type) { - case SensorValue_NONE: { - return true; - } - case SensorValue_TargetAngle: { - auto ptr = reinterpret_cast(obj); - return verifier.VerifyTable(ptr); - } - case SensorValue_CurrentAngle: { - auto ptr = reinterpret_cast(obj); - return verifier.VerifyTable(ptr); - } - default: - return true; - } -} - -inline bool -VerifySensorValueVector(::flatbuffers::Verifier &verifier, - const ::flatbuffers::Vector<::flatbuffers::Offset> *values, - const ::flatbuffers::Vector *types) { - if (!values || !types) - return !values && !types; - if (values->size() != types->size()) - return false; - for (::flatbuffers::uoffset_t i = 0; i < values->size(); ++i) { - if (!VerifySensorValue(verifier, values->Get(i), types->GetEnum(i))) { - return false; - } - } +inline bool VerifySensorValue(::flatbuffers::Verifier &verifier, + const void *obj, SensorValue type) { + switch (type) { + case SensorValue_NONE: { return true; + } + case SensorValue_TargetAngle: { + auto ptr = reinterpret_cast(obj); + return verifier.VerifyTable(ptr); + } + case SensorValue_CurrentAngle: { + auto ptr = reinterpret_cast(obj); + return verifier.VerifyTable(ptr); + } + case SensorValue_CurrentText: { + auto ptr = reinterpret_cast(obj); + return verifier.VerifyTable(ptr); + } + default: + return true; + } +} + +inline bool VerifySensorValueVector( + ::flatbuffers::Verifier &verifier, + const ::flatbuffers::Vector<::flatbuffers::Offset> *values, + const ::flatbuffers::Vector *types) { + if (!values || !types) + return !values && !types; + if (values->size() != types->size()) + return false; + for (::flatbuffers::uoffset_t i = 0; i < values->size(); ++i) { + if (!VerifySensorValue(verifier, values->Get(i), + types->GetEnum(i))) { + return false; + } + } + return true; } inline const Messaging::SensorMessage *GetSensorMessage(const void *buf) { - return ::flatbuffers::GetRoot(buf); + return ::flatbuffers::GetRoot(buf); } -inline const Messaging::SensorMessage *GetSizePrefixedSensorMessage(const void *buf) { - return ::flatbuffers::GetSizePrefixedRoot(buf); +inline const Messaging::SensorMessage * +GetSizePrefixedSensorMessage(const void *buf) { + return ::flatbuffers::GetSizePrefixedRoot(buf); } inline bool VerifySensorMessageBuffer(::flatbuffers::Verifier &verifier) { - return verifier.VerifyBuffer(nullptr); + return verifier.VerifyBuffer(nullptr); } -inline bool VerifySizePrefixedSensorMessageBuffer(::flatbuffers::Verifier &verifier) { - return verifier.VerifySizePrefixedBuffer(nullptr); +inline bool +VerifySizePrefixedSensorMessageBuffer(::flatbuffers::Verifier &verifier) { + return verifier.VerifySizePrefixedBuffer(nullptr); } -inline void FinishSensorMessageBuffer(::flatbuffers::FlatBufferBuilder &fbb, - ::flatbuffers::Offset root) { - fbb.Finish(root); +inline void FinishSensorMessageBuffer( + ::flatbuffers::FlatBufferBuilder &fbb, + ::flatbuffers::Offset root) { + fbb.Finish(root); } -inline void -FinishSizePrefixedSensorMessageBuffer(::flatbuffers::FlatBufferBuilder &fbb, - ::flatbuffers::Offset root) { - fbb.FinishSizePrefixed(root); +inline void FinishSizePrefixedSensorMessageBuffer( + ::flatbuffers::FlatBufferBuilder &fbb, + ::flatbuffers::Offset root) { + fbb.FinishSizePrefixed(root); } } // namespace Messaging diff --git a/include/flatbuffers_generated/TextControlMessage_generated.h b/include/flatbuffers_generated/TextControlMessage_generated.h new file mode 100644 index 0000000..7501b6e --- /dev/null +++ b/include/flatbuffers_generated/TextControlMessage_generated.h @@ -0,0 +1,102 @@ +// automatically generated by the FlatBuffers compiler, do not modify + +#ifndef FLATBUFFERS_GENERATED_TEXTCONTROLMESSAGE_MESSAGING_H_ +#define FLATBUFFERS_GENERATED_TEXTCONTROLMESSAGE_MESSAGING_H_ + +#include "flatbuffers/flatbuffers.h" + +// Ensure the included flatbuffers.h is the same version as when this file was +// generated, otherwise it may not be compatible. +// static_assert(FLATBUFFERS_VERSION_MAJOR == 25 && +// FLATBUFFERS_VERSION_MINOR == 2 && +// FLATBUFFERS_VERSION_REVISION == 10, +// "Non-compatible flatbuffers version included"); + +namespace Messaging { + +struct TextControlMessage; +struct TextControlMessageBuilder; + +struct TextControlMessage FLATBUFFERS_FINAL_CLASS + : private ::flatbuffers::Table { + typedef TextControlMessageBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_MESSAGE = 4 + }; + const ::flatbuffers::String *message() const { + return GetPointer(VT_MESSAGE); + } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_MESSAGE) && + verifier.VerifyString(message()) && verifier.EndTable(); + } +}; + +struct TextControlMessageBuilder { + typedef TextControlMessage Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_message(::flatbuffers::Offset<::flatbuffers::String> message) { + fbb_.AddOffset(TextControlMessage::VT_MESSAGE, message); + } + explicit TextControlMessageBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } +}; + +inline ::flatbuffers::Offset CreateTextControlMessage( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> message = 0) { + TextControlMessageBuilder builder_(_fbb); + builder_.add_message(message); + return builder_.Finish(); +} + +inline ::flatbuffers::Offset +CreateTextControlMessageDirect(::flatbuffers::FlatBufferBuilder &_fbb, + const char *message = nullptr) { + auto message__ = message ? _fbb.CreateString(message) : 0; + return Messaging::CreateTextControlMessage(_fbb, message__); +} + +inline const Messaging::TextControlMessage * +GetTextControlMessage(const void *buf) { + return ::flatbuffers::GetRoot(buf); +} + +inline const Messaging::TextControlMessage * +GetSizePrefixedTextControlMessage(const void *buf) { + return ::flatbuffers::GetSizePrefixedRoot(buf); +} + +inline bool VerifyTextControlMessageBuffer(::flatbuffers::Verifier &verifier) { + return verifier.VerifyBuffer(nullptr); +} + +inline bool +VerifySizePrefixedTextControlMessageBuffer(::flatbuffers::Verifier &verifier) { + return verifier.VerifySizePrefixedBuffer( + nullptr); +} + +inline void FinishTextControlMessageBuffer( + ::flatbuffers::FlatBufferBuilder &fbb, + ::flatbuffers::Offset root) { + fbb.Finish(root); +} + +inline void FinishSizePrefixedTextControlMessageBuffer( + ::flatbuffers::FlatBufferBuilder &fbb, + ::flatbuffers::Offset root) { + fbb.FinishSizePrefixed(root); +} + +} // namespace Messaging + +#endif // FLATBUFFERS_GENERATED_TEXTCONTROLMESSAGE_MESSAGING_H_ diff --git a/include/flatbuffers_generated/TopologyMessage_generated.h b/include/flatbuffers_generated/TopologyMessage_generated.h index 47898bb..728bbd7 100644 --- a/include/flatbuffers_generated/TopologyMessage_generated.h +++ b/include/flatbuffers_generated/TopologyMessage_generated.h @@ -20,182 +20,192 @@ struct TopologyMessage; struct TopologyMessageBuilder; enum ConnectionType : int8_t { - ConnectionType_DIRECT = 0, - ConnectionType_HOP = 1, - ConnectionType_MIN = ConnectionType_DIRECT, - ConnectionType_MAX = ConnectionType_HOP + ConnectionType_DIRECT = 0, + ConnectionType_HOP = 1, + ConnectionType_MIN = ConnectionType_DIRECT, + ConnectionType_MAX = ConnectionType_HOP }; inline const ConnectionType (&EnumValuesConnectionType())[2] { - static const ConnectionType values[] = {ConnectionType_DIRECT, ConnectionType_HOP}; - return values; + static const ConnectionType values[] = {ConnectionType_DIRECT, + ConnectionType_HOP}; + return values; } inline const char *const *EnumNamesConnectionType() { - static const char *const names[3] = {"DIRECT", "HOP", nullptr}; - return names; + static const char *const names[3] = {"DIRECT", "HOP", nullptr}; + return names; } inline const char *EnumNameConnectionType(ConnectionType e) { - if (::flatbuffers::IsOutRange(e, ConnectionType_DIRECT, ConnectionType_HOP)) - return ""; - const size_t index = static_cast(e); - return EnumNamesConnectionType()[index]; + if (::flatbuffers::IsOutRange(e, ConnectionType_DIRECT, ConnectionType_HOP)) + return ""; + const size_t index = static_cast(e); + return EnumNamesConnectionType()[index]; } struct TopologyMessage FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { - typedef TopologyMessageBuilder Builder; - enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { - VT_MODULE_ID = 4, - VT_MODULE_TYPE = 6, - VT_NUM_CHANNELS = 8, - VT_CHANNEL_TO_MODULE = 10, - VT_CHANNEL_TO_ORIENTATION = 12, - VT_CONNECTION = 14, - VT_LEADER = 16, - VT_FIRMWARE = 18 - }; - uint8_t module_id() const { - return GetField(VT_MODULE_ID, 0); - } - ModuleType module_type() const { - return static_cast(GetField(VT_MODULE_TYPE, 0)); - } - uint8_t num_channels() const { - return GetField(VT_NUM_CHANNELS, 0); - } - const ::flatbuffers::Vector *channel_to_module() const { - return GetPointer *>(VT_CHANNEL_TO_MODULE); - } - const ::flatbuffers::Vector *channel_to_orientation() const { - return GetPointer *>(VT_CHANNEL_TO_ORIENTATION); - } - Messaging::ConnectionType connection() const { - return static_cast(GetField(VT_CONNECTION, 0)); - } - uint8_t leader() const { - return GetField(VT_LEADER, 0); - } - const ::flatbuffers::String *firmware() const { - return GetPointer(VT_FIRMWARE); - } - bool Verify(::flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && VerifyField(verifier, VT_MODULE_ID, 1) && - VerifyField(verifier, VT_MODULE_TYPE, 1) && - VerifyField(verifier, VT_NUM_CHANNELS, 1) && - VerifyOffset(verifier, VT_CHANNEL_TO_MODULE) && - verifier.VerifyVector(channel_to_module()) && - VerifyOffset(verifier, VT_CHANNEL_TO_ORIENTATION) && - verifier.VerifyVector(channel_to_orientation()) && - VerifyField(verifier, VT_CONNECTION, 1) && - VerifyField(verifier, VT_LEADER, 1) && - VerifyOffset(verifier, VT_FIRMWARE) && verifier.VerifyString(firmware()) && - verifier.EndTable(); - } + typedef TopologyMessageBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_MODULE_ID = 4, + VT_MODULE_TYPE = 6, + VT_NUM_CHANNELS = 8, + VT_CHANNEL_TO_MODULE = 10, + VT_CHANNEL_TO_ORIENTATION = 12, + VT_CONNECTION = 14, + VT_LEADER = 16, + VT_FIRMWARE = 18 + }; + uint8_t module_id() const { return GetField(VT_MODULE_ID, 0); } + ModuleType module_type() const { + return static_cast(GetField(VT_MODULE_TYPE, 0)); + } + uint8_t num_channels() const { return GetField(VT_NUM_CHANNELS, 0); } + const ::flatbuffers::Vector *channel_to_module() const { + return GetPointer *>( + VT_CHANNEL_TO_MODULE); + } + const ::flatbuffers::Vector *channel_to_orientation() const { + return GetPointer *>( + VT_CHANNEL_TO_ORIENTATION); + } + Messaging::ConnectionType connection() const { + return static_cast( + GetField(VT_CONNECTION, 0)); + } + uint8_t leader() const { return GetField(VT_LEADER, 0); } + const ::flatbuffers::String *firmware() const { + return GetPointer(VT_FIRMWARE); + } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyField(verifier, VT_MODULE_ID, 1) && + VerifyField(verifier, VT_MODULE_TYPE, 1) && + VerifyField(verifier, VT_NUM_CHANNELS, 1) && + VerifyOffset(verifier, VT_CHANNEL_TO_MODULE) && + verifier.VerifyVector(channel_to_module()) && + VerifyOffset(verifier, VT_CHANNEL_TO_ORIENTATION) && + verifier.VerifyVector(channel_to_orientation()) && + VerifyField(verifier, VT_CONNECTION, 1) && + VerifyField(verifier, VT_LEADER, 1) && + VerifyOffset(verifier, VT_FIRMWARE) && + verifier.VerifyString(firmware()) && verifier.EndTable(); + } }; struct TopologyMessageBuilder { - typedef TopologyMessage Table; - ::flatbuffers::FlatBufferBuilder &fbb_; - ::flatbuffers::uoffset_t start_; - void add_module_id(uint8_t module_id) { - fbb_.AddElement(TopologyMessage::VT_MODULE_ID, module_id, 0); - } - void add_module_type(ModuleType module_type) { - fbb_.AddElement(TopologyMessage::VT_MODULE_TYPE, static_cast(module_type), - 0); - } - void add_num_channels(uint8_t num_channels) { - fbb_.AddElement(TopologyMessage::VT_NUM_CHANNELS, num_channels, 0); - } - void - add_channel_to_module(::flatbuffers::Offset<::flatbuffers::Vector> channel_to_module) { - fbb_.AddOffset(TopologyMessage::VT_CHANNEL_TO_MODULE, channel_to_module); - } - void add_channel_to_orientation( - ::flatbuffers::Offset<::flatbuffers::Vector> channel_to_orientation) { - fbb_.AddOffset(TopologyMessage::VT_CHANNEL_TO_ORIENTATION, channel_to_orientation); - } - void add_connection(Messaging::ConnectionType connection) { - fbb_.AddElement(TopologyMessage::VT_CONNECTION, static_cast(connection), 0); - } - void add_leader(uint8_t leader) { - fbb_.AddElement(TopologyMessage::VT_LEADER, leader, 0); - } - void add_firmware(::flatbuffers::Offset<::flatbuffers::String> firmware) { - fbb_.AddOffset(TopologyMessage::VT_FIRMWARE, firmware); - } - explicit TopologyMessageBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { - start_ = fbb_.StartTable(); - } - ::flatbuffers::Offset Finish() { - const auto end = fbb_.EndTable(start_); - auto o = ::flatbuffers::Offset(end); - return o; - } + typedef TopologyMessage Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_module_id(uint8_t module_id) { + fbb_.AddElement(TopologyMessage::VT_MODULE_ID, module_id, 0); + } + void add_module_type(ModuleType module_type) { + fbb_.AddElement(TopologyMessage::VT_MODULE_TYPE, + static_cast(module_type), 0); + } + void add_num_channels(uint8_t num_channels) { + fbb_.AddElement(TopologyMessage::VT_NUM_CHANNELS, num_channels, 0); + } + void add_channel_to_module( + ::flatbuffers::Offset<::flatbuffers::Vector> channel_to_module) { + fbb_.AddOffset(TopologyMessage::VT_CHANNEL_TO_MODULE, channel_to_module); + } + void add_channel_to_orientation( + ::flatbuffers::Offset<::flatbuffers::Vector> + channel_to_orientation) { + fbb_.AddOffset(TopologyMessage::VT_CHANNEL_TO_ORIENTATION, + channel_to_orientation); + } + void add_connection(Messaging::ConnectionType connection) { + fbb_.AddElement(TopologyMessage::VT_CONNECTION, + static_cast(connection), 0); + } + void add_leader(uint8_t leader) { + fbb_.AddElement(TopologyMessage::VT_LEADER, leader, 0); + } + void add_firmware(::flatbuffers::Offset<::flatbuffers::String> firmware) { + fbb_.AddOffset(TopologyMessage::VT_FIRMWARE, firmware); + } + explicit TopologyMessageBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } }; inline ::flatbuffers::Offset CreateTopologyMessage( ::flatbuffers::FlatBufferBuilder &_fbb, uint8_t module_id = 0, ModuleType module_type = ModuleType_SPLITTER, uint8_t num_channels = 0, ::flatbuffers::Offset<::flatbuffers::Vector> channel_to_module = 0, - ::flatbuffers::Offset<::flatbuffers::Vector> channel_to_orientation = 0, - Messaging::ConnectionType connection = Messaging::ConnectionType_DIRECT, uint8_t leader = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> + channel_to_orientation = 0, + Messaging::ConnectionType connection = Messaging::ConnectionType_DIRECT, + uint8_t leader = 0, ::flatbuffers::Offset<::flatbuffers::String> firmware = 0) { - TopologyMessageBuilder builder_(_fbb); - builder_.add_firmware(firmware); - builder_.add_channel_to_orientation(channel_to_orientation); - builder_.add_channel_to_module(channel_to_module); - builder_.add_leader(leader); - builder_.add_connection(connection); - builder_.add_num_channels(num_channels); - builder_.add_module_type(module_type); - builder_.add_module_id(module_id); - return builder_.Finish(); + TopologyMessageBuilder builder_(_fbb); + builder_.add_firmware(firmware); + builder_.add_channel_to_orientation(channel_to_orientation); + builder_.add_channel_to_module(channel_to_module); + builder_.add_leader(leader); + builder_.add_connection(connection); + builder_.add_num_channels(num_channels); + builder_.add_module_type(module_type); + builder_.add_module_id(module_id); + return builder_.Finish(); } -inline ::flatbuffers::Offset -CreateTopologyMessageDirect(::flatbuffers::FlatBufferBuilder &_fbb, uint8_t module_id = 0, - ModuleType module_type = ModuleType_SPLITTER, uint8_t num_channels = 0, - const std::vector *channel_to_module = nullptr, - const std::vector *channel_to_orientation = nullptr, - Messaging::ConnectionType connection = Messaging::ConnectionType_DIRECT, - uint8_t leader = 0, const char *firmware = nullptr) { - auto channel_to_module__ = - channel_to_module ? _fbb.CreateVector(*channel_to_module) : 0; - auto channel_to_orientation__ = - channel_to_orientation ? _fbb.CreateVector(*channel_to_orientation) : 0; - auto firmware__ = firmware ? _fbb.CreateString(firmware) : 0; - return Messaging::CreateTopologyMessage(_fbb, module_id, module_type, num_channels, - channel_to_module__, channel_to_orientation__, - connection, leader, firmware__); +inline ::flatbuffers::Offset CreateTopologyMessageDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint8_t module_id = 0, + ModuleType module_type = ModuleType_SPLITTER, uint8_t num_channels = 0, + const std::vector *channel_to_module = nullptr, + const std::vector *channel_to_orientation = nullptr, + Messaging::ConnectionType connection = Messaging::ConnectionType_DIRECT, + uint8_t leader = 0, const char *firmware = nullptr) { + auto channel_to_module__ = + channel_to_module ? _fbb.CreateVector(*channel_to_module) : 0; + auto channel_to_orientation__ = + channel_to_orientation + ? _fbb.CreateVector(*channel_to_orientation) + : 0; + auto firmware__ = firmware ? _fbb.CreateString(firmware) : 0; + return Messaging::CreateTopologyMessage( + _fbb, module_id, module_type, num_channels, channel_to_module__, + channel_to_orientation__, connection, leader, firmware__); } inline const Messaging::TopologyMessage *GetTopologyMessage(const void *buf) { - return ::flatbuffers::GetRoot(buf); + return ::flatbuffers::GetRoot(buf); } -inline const Messaging::TopologyMessage *GetSizePrefixedTopologyMessage(const void *buf) { - return ::flatbuffers::GetSizePrefixedRoot(buf); +inline const Messaging::TopologyMessage * +GetSizePrefixedTopologyMessage(const void *buf) { + return ::flatbuffers::GetSizePrefixedRoot(buf); } inline bool VerifyTopologyMessageBuffer(::flatbuffers::Verifier &verifier) { - return verifier.VerifyBuffer(nullptr); + return verifier.VerifyBuffer(nullptr); } -inline bool VerifySizePrefixedTopologyMessageBuffer(::flatbuffers::Verifier &verifier) { - return verifier.VerifySizePrefixedBuffer(nullptr); +inline bool +VerifySizePrefixedTopologyMessageBuffer(::flatbuffers::Verifier &verifier) { + return verifier.VerifySizePrefixedBuffer(nullptr); } -inline void FinishTopologyMessageBuffer(::flatbuffers::FlatBufferBuilder &fbb, - ::flatbuffers::Offset root) { - fbb.Finish(root); +inline void FinishTopologyMessageBuffer( + ::flatbuffers::FlatBufferBuilder &fbb, + ::flatbuffers::Offset root) { + fbb.Finish(root); } -inline void -FinishSizePrefixedTopologyMessageBuffer(::flatbuffers::FlatBufferBuilder &fbb, - ::flatbuffers::Offset root) { - fbb.FinishSizePrefixed(root); +inline void FinishSizePrefixedTopologyMessageBuffer( + ::flatbuffers::FlatBufferBuilder &fbb, + ::flatbuffers::Offset root) { + fbb.FinishSizePrefixed(root); } } // namespace Messaging diff --git a/include/lib_c_control.h b/include/lib_c_control.h index 0eba421..9585f69 100644 --- a/include/lib_c_control.h +++ b/include/lib_c_control.h @@ -17,8 +17,10 @@ LIB_API void cleanup(); LIB_API int send_angle_control(int module_id, int angle); LIB_API char *get_configuration(int *size_out); -LIB_API bool control_sentry_init(const char *dsn, const char *environment, const char *release); -LIB_API void control_sentry_set_app_info(const char *app_name, const char *app_version, +LIB_API bool control_sentry_init(const char *dsn, const char *environment, + const char *release); +LIB_API void control_sentry_set_app_info(const char *app_name, + const char *app_version, const char *build_number); LIB_API void control_sentry_shutdown(void); } diff --git a/include/libcontrol.h b/include/libcontrol.h index 4aff73f..55adb62 100644 --- a/include/libcontrol.h +++ b/include/libcontrol.h @@ -27,28 +27,29 @@ */ class RobotController { - public: - /** +public: + /** * \brief Creates a new RobotController. * * Each RobotController will establish unique connections to accessible * BotChain modules. */ - RobotController() - : m_messaging_interface(std::make_unique()), - m_metadata_loop(std::thread(&RobotController::metadata_loop, this)), - m_transmit_loop(std::thread(&RobotController::transmit_loop, this)), - m_configuration_loop(std::thread(&RobotController::configuration_loop, this)), - m_sensor_loop(std::thread(&RobotController::sensor_loop, this)), - m_expiry_looop(std::thread(&RobotController::expiry_loop, this)) { - m_logger = spdlog::basic_logger_mt("default_logger", "libcontrol.log"); - spdlog::flush_on(spdlog::level::info); - spdlog::set_default_logger(m_logger); - } + RobotController() + : m_messaging_interface(std::make_unique()), + m_metadata_loop(std::thread(&RobotController::metadata_loop, this)), + m_transmit_loop(std::thread(&RobotController::transmit_loop, this)), + m_configuration_loop( + std::thread(&RobotController::configuration_loop, this)), + m_sensor_loop(std::thread(&RobotController::sensor_loop, this)), + m_expiry_looop(std::thread(&RobotController::expiry_loop, this)) { + m_logger = spdlog::basic_logger_mt("default_logger", "libcontrol.log"); + spdlog::flush_on(spdlog::level::info); + spdlog::set_default_logger(m_logger); + } - ~RobotController(); + ~RobotController(); - /** + /** * \brief Get a list of accessible modules * * Returns a std::vector containing robotic modules. This list includes @@ -57,9 +58,9 @@ class RobotController { * commands can be sent by calling the "as" function for the correct * type (can be identified through the ModuleType). */ - std::vector> getModules(); + std::vector> getModules(); - /** + /** * \brief Get a module by ID * * Returns a std::vector containing robotic modules. This list includes @@ -68,59 +69,60 @@ class RobotController { * commands can be sent by calling the "as" function for the correct * type (can be identified through the ModuleType). */ - std::optional> getModule(uint8_t device_id); + std::optional> getModule(uint8_t device_id); - /** + /** * \brief Get a list of all connections. * * Returns a list containing all connections between modules. */ - std::vector getConnections(); + std::vector getConnections(); - /** + /** * \brief Get a list of accessible modules. * * Returns a list containing ID and types of each module. */ - std::vector getModuleList(); + std::vector getModuleList(); - /** + /** * \brief Reset the list of modules. * * Reset the internal list containing known modules. Note: This list is * automatically updated, only call this function when you need to update the * list faster than the internal refresh logic. */ - void resetModules(); + void resetModules(); - /** + /** * \brief Poll for devices accessible to the PC. * * Manually trigger a poll for devices accessible to the PC. */ - void fetchDirectlyConnectedModules(bool block); + void fetchDirectlyConnectedModules(bool block); - private: - std::shared_ptr m_logger; - std::unordered_map> m_id_to_module{}; - std::unordered_map> - m_connection_map{}; - std::shared_mutex m_module_lock{}; - std::shared_mutex m_connection_lock{}; - std::shared_ptr m_messaging_interface; - std::atomic m_stop_thread{false}; // todo: make sure threads stop if we - // dont get any messages (timeouts) - std::thread m_metadata_loop; - std::thread m_transmit_loop; - std::thread m_configuration_loop; - std::thread m_sensor_loop; - std::thread m_expiry_looop; +private: + std::shared_ptr m_logger; + std::unordered_map> m_id_to_module{}; + std::unordered_map> + m_connection_map{}; + std::shared_mutex m_module_lock{}; + std::shared_mutex m_connection_lock{}; + std::shared_ptr m_messaging_interface; + std::atomic m_stop_thread{false}; // todo: make sure threads stop if we + // dont get any messages (timeouts) + std::thread m_metadata_loop; + std::thread m_transmit_loop; + std::thread m_configuration_loop; + std::thread m_sensor_loop; + std::thread m_expiry_looop; - void metadata_loop(); - void transmit_loop(); - void configuration_loop(); - void sensor_loop(); - void expiry_loop(); + void metadata_loop(); + void transmit_loop(); + void configuration_loop(); + void sensor_loop(); + void expiry_loop(); }; #endif // CONTROL_LIBCONTROL_H diff --git a/include/util/Event.h b/include/util/Event.h index c2d84c7..8263eab 100644 --- a/include/util/Event.h +++ b/include/util/Event.h @@ -7,44 +7,41 @@ class Event; class CallbackHandle { - public: - CallbackHandle(Event *evt, int id) : evt(evt), id(id) { - } - ~CallbackHandle(); +public: + CallbackHandle(Event *evt, int id) : evt(evt), id(id) {} + ~CallbackHandle(); - private: - Event *evt; - int id; +private: + Event *evt; + int id; }; class Event { - public: - using Callback = std::function; +public: + using Callback = std::function; - CallbackHandle addListener(Callback cb) { - int id = nextId++; - callbacks[id] = std::move(cb); - return CallbackHandle(this, id); - } + CallbackHandle addListener(Callback cb) { + int id = nextId++; + callbacks[id] = std::move(cb); + return CallbackHandle(this, id); + } - void remove(int id) { - callbacks.erase(id); - } + void remove(int id) { callbacks.erase(id); } - void fire() { - for (auto &kv : callbacks) - kv.second(); - } + void fire() { + for (auto &kv : callbacks) + kv.second(); + } - private: - friend class CallbackHandle; - std::unordered_map callbacks; - int nextId = 0; +private: + friend class CallbackHandle; + std::unordered_map callbacks; + int nextId = 0; }; CallbackHandle::~CallbackHandle() { - if (evt) - evt->remove(id); + if (evt) + evt->remove(id); } #endif // CONTROL_EVENT_H diff --git a/include/util/Map.h b/include/util/Map.h index cd59f6c..6f362c2 100644 --- a/include/util/Map.h +++ b/include/util/Map.h @@ -7,12 +7,12 @@ template std::vector map_to_values(const std::unordered_map &map) { - std::vector out; - out.reserve(map.size()); - for (auto const &[key, value] : map) { - out.push_back(value); - } - return out; + std::vector out; + out.reserve(map.size()); + for (auto const &[key, value] : map) { + out.push_back(value); + } + return out; } #endif // CONTROL_MAP_H diff --git a/include/util/PairHash.h b/include/util/PairHash.h index 779db90..17da7bc 100644 --- a/include/util/PairHash.h +++ b/include/util/PairHash.h @@ -6,9 +6,9 @@ // Custom hash function for std::pair template struct pair_hash { - std::size_t operator()(const std::pair &p) const { - return std::hash()(p.first) ^ (std::hash()(p.second) << 1); - } + std::size_t operator()(const std::pair &p) const { + return std::hash()(p.first) ^ (std::hash()(p.second) << 1); + } }; #endif // CONTROL_PAIRHASH_H diff --git a/include/util/Variant.h b/include/util/Variant.h index 8cd6dda..24167e9 100644 --- a/include/util/Variant.h +++ b/include/util/Variant.h @@ -5,7 +5,7 @@ #include // NOLINT template struct overloaded : Ts... { - using Ts::operator()...; + using Ts::operator()...; }; template overloaded(Ts...) -> overloaded; diff --git a/src/Hub.cpp b/src/Hub.cpp index ae99bcc..49281b0 100644 --- a/src/Hub.cpp +++ b/src/Hub.cpp @@ -2,23 +2,32 @@ #include "flatbuffers/SensorMessageBuilder.h" double Hub::get_position() { - // no-op - return 0; + // no-op + return 0; +} + +std::string Hub::get_text() { + // no-op + return ""; } void Hub::actuate(double /* position */) { - // no-op + // no-op } void Hub::actuate(double /* x */, double /* y */) { - // no-op + // no-op +} + +void Hub::actuate(const std::string &text) { + // no-op } std::vector Hub::get_actuation_message() { - // no-op - return {}; + // no-op + return {}; } void Hub::update_sensor_data(const Flatbuffers::sensor_value & /* value */) { - // no-op + // no-op } diff --git a/src/Module.cpp b/src/Module.cpp index 8955aba..fa44991 100644 --- a/src/Module.cpp +++ b/src/Module.cpp @@ -4,40 +4,33 @@ #include "Module.h" -std::vector Module::get_neighbours() { - return m_neighbours; -} +std::vector Module::get_neighbours() { return m_neighbours; } -uint8_t Module::get_device_id() { - return m_device_id; -} +uint8_t Module::get_device_id() { return m_device_id; } -ModuleType Module::get_type() { - return m_module_type; -} +ModuleType Module::get_type() { return m_module_type; } Messaging::ConnectionType Module::get_connection_type() { - return m_connection_type; + return m_connection_type; } -uint8_t Module::get_leader() { - return m_leader; -} +uint8_t Module::get_leader() { return m_leader; } -std::chrono::time_point Module::get_last_updated_time() { - return m_last_updated; +std::chrono::time_point +Module::get_last_updated_time() { + return m_last_updated; } void Module::update_module_metadata(const Messaging::TopologyMessage &message) { - m_module_type = message.module_type(); - m_connection_type = message.connection(); - m_leader = message.leader(); + m_module_type = message.module_type(); + m_connection_type = message.connection(); + m_leader = message.leader(); - m_last_updated = std::chrono::system_clock::now(); + m_last_updated = std::chrono::system_clock::now(); - m_neighbours.clear(); - for (auto [id, ori] : - std::views::zip(*message.channel_to_module(), *message.channel_to_orientation())) { - m_neighbours.emplace_back(neighbour{id, static_cast(ori)}); - } + m_neighbours.clear(); + for (auto [id, ori] : std::views::zip(*message.channel_to_module(), + *message.channel_to_orientation())) { + m_neighbours.emplace_back(neighbour{id, static_cast(ori)}); + } } diff --git a/src/ModuleFactory.cpp b/src/ModuleFactory.cpp index 633fcfd..ae3ba79 100644 --- a/src/ModuleFactory.cpp +++ b/src/ModuleFactory.cpp @@ -2,6 +2,7 @@ #include "ModuleFactory.h" #include "Hub.h" #include "actuators/BoundedPositionalActuator1D.h" +#include "actuators/OledActuator.h" #include "actuators/PositionalActuator1D.h" #include "flatbuffers_generated/RobotModule_generated.h" @@ -9,20 +10,25 @@ #define SERVO1_MIN_ANGLE 0 #define SERVO1_DEFAULT_ANGLE 90 -std::shared_ptr -ModuleFactory::createModule(uint8_t device_id, ModuleType type, - std::shared_ptr &messaging_interface) { - switch (type) { - case ModuleType_SPLITTER: - return std::make_shared(device_id, type); - case ModuleType_BATTERY: - return std::make_shared(device_id, type); - case ModuleType_SERVO_1: - case ModuleType_SERVO_2: - return std::make_shared( - device_id, type, SERVO1_MAX_ANGLE, SERVO1_MIN_ANGLE, SERVO1_DEFAULT_ANGLE); - case ModuleType_DC_MOTOR: - return std::make_shared(device_id, type); - } +std::shared_ptr ModuleFactory::createModule( + uint8_t device_id, ModuleType type, + std::shared_ptr &messaging_interface) { + switch (type) { + case ModuleType_SPLITTER: + return std::make_shared(device_id, type); + case ModuleType_BATTERY: + return std::make_shared(device_id, type); + case ModuleType_SERVO_1: + case ModuleType_SERVO_2: + return std::make_shared( + device_id, type, SERVO1_MAX_ANGLE, SERVO1_MIN_ANGLE, + SERVO1_DEFAULT_ANGLE); + case ModuleType_DC_MOTOR: + return std::make_shared(device_id, type); + case ModuleType_DISPLAY: + return std::make_shared(device_id, type); + default: return nullptr; + } + return nullptr; } diff --git a/src/actuators/BoundedPositionalActuator1D.cpp b/src/actuators/BoundedPositionalActuator1D.cpp index 8de39ad..9f94da0 100644 --- a/src/actuators/BoundedPositionalActuator1D.cpp +++ b/src/actuators/BoundedPositionalActuator1D.cpp @@ -7,37 +7,46 @@ #include "util/Variant.h" double BoundedPositionalActuator1D::get_position() { - return m_current_position; + return m_current_position; } +std::string BoundedPositionalActuator1D::get_text() { return ""; } + void BoundedPositionalActuator1D::actuate(double position) { - if (position < m_min_value || position > m_max_value) { - return; - } + if (position < m_min_value || position > m_max_value) { + return; + } - m_target_position = position; + m_target_position = position; } -void BoundedPositionalActuator1D::actuate(double x, double y) { -} +void BoundedPositionalActuator1D::actuate(double x, double y) {} + +void BoundedPositionalActuator1D::actuate(const std::string &text) {} std::vector BoundedPositionalActuator1D::get_actuation_message() { - std::vector message{}; + std::vector message{}; - if (m_target_position == m_current_position) { - return message; - } - - auto [data, size] = acm_builder->build_angle_control_message(m_target_position); - message.resize(size); - memcpy(message.data(), data, size); + if (m_target_position == m_current_position) { return message; + } + + auto [data, size] = + acm_builder->build_angle_control_message(m_target_position); + message.resize(size); + memcpy(message.data(), data, size); + return message; } -void BoundedPositionalActuator1D::update_sensor_data(const Flatbuffers::sensor_value &value) { - std::visit(overloaded{ - [this](Flatbuffers::target_angle a) { m_current_position = a.angle; }, - [this](Flatbuffers::current_angle a) { m_current_position = a.angle; }, - }, - value); +void BoundedPositionalActuator1D::update_sensor_data( + const Flatbuffers::sensor_value &value) { + std::visit( + overloaded{ + [this](Flatbuffers::target_angle a) { m_current_position = a.angle; }, + [this](Flatbuffers::current_angle a) { + m_current_position = a.angle; + }, + [this](Flatbuffers::current_text /*t*/) {}, + }, + value); } diff --git a/src/actuators/OledActuator.cpp b/src/actuators/OledActuator.cpp new file mode 100644 index 0000000..15880bb --- /dev/null +++ b/src/actuators/OledActuator.cpp @@ -0,0 +1,38 @@ +#include "actuators/OledActuator.h" +#include "flatbuffers/SensorMessageBuilder.h" +#include "util/Variant.h" +#include + +double OledActuator::get_position() { return 0.0; } + +std::string OledActuator::get_text() { return m_current_text; } + +void OledActuator::actuate(double /* position */) {} + +void OledActuator::actuate(double /* x */, double /* y */) {} + +void OledActuator::actuate(const std::string &text) { m_target_text = text; } + +std::vector OledActuator::get_actuation_message() { + std::vector message{}; + + if (m_target_text == m_current_text) { + return message; + } + + auto [data, size] = + m_text_message_builder->build_text_control_message(m_target_text); + message.resize(size); + memcpy(message.data(), data, size); + return message; +} + +void OledActuator::update_sensor_data(const Flatbuffers::sensor_value &value) { + std::visit( + overloaded{ + [this](Flatbuffers::target_angle /* a */) {}, + [this](Flatbuffers::current_angle /* a */) {}, + [this](Flatbuffers::current_text t) { m_current_text = t.text; }, + }, + value); +} diff --git a/src/actuators/PositionalActuator1D.cpp b/src/actuators/PositionalActuator1D.cpp index f228c96..9991a20 100644 --- a/src/actuators/PositionalActuator1D.cpp +++ b/src/actuators/PositionalActuator1D.cpp @@ -3,34 +3,42 @@ #include "util/Variant.h" #include -double PositionalActuator1D::get_position() { - return m_current_position; -} +double PositionalActuator1D::get_position() { return m_current_position; } + +std::string PositionalActuator1D::get_text() { return ""; } void PositionalActuator1D::actuate(double position) { - m_target_position = position; + m_target_position = position; } -void PositionalActuator1D::actuate(double /* x */, double /* y */) { -} +void PositionalActuator1D::actuate(double /* x */, double /* y */) {} + +void PositionalActuator1D::actuate(const std::string &text) {} std::vector PositionalActuator1D::get_actuation_message() { - std::vector message{}; + std::vector message{}; - if (m_target_position == m_board_target_position) { - return message; - } - - auto [data, size] = m_acm_builder->build_angle_control_message(m_target_position); - message.resize(size); - memcpy(message.data(), data, size); + if (m_target_position == m_board_target_position) { return message; + } + + auto [data, size] = + m_acm_builder->build_angle_control_message(m_target_position); + message.resize(size); + memcpy(message.data(), data, size); + return message; } -void PositionalActuator1D::update_sensor_data(const Flatbuffers::sensor_value &value) { - std::visit(overloaded{ - [this](Flatbuffers::target_angle a) { m_board_target_position = a.angle; }, - [this](Flatbuffers::current_angle a) { m_current_position = a.angle; }, - }, - value); +void PositionalActuator1D::update_sensor_data( + const Flatbuffers::sensor_value &value) { + std::visit(overloaded{ + [this](Flatbuffers::target_angle a) { + m_board_target_position = a.angle; + }, + [this](Flatbuffers::current_angle a) { + m_current_position = a.angle; + }, + [this](Flatbuffers::current_text /*t*/) {}, + }, + value); } diff --git a/src/flatbuffers/AngleControlMessageBuilder.cpp b/src/flatbuffers/AngleControlMessageBuilder.cpp index 763d8eb..40ea5a0 100644 --- a/src/flatbuffers/AngleControlMessageBuilder.cpp +++ b/src/flatbuffers/AngleControlMessageBuilder.cpp @@ -7,16 +7,17 @@ namespace Flatbuffers { const Messaging::AngleControlMessage * AngleControlMessageBuilder::parse_angle_control_message(const uint8_t *buffer) { - return flatbuffers::GetRoot(buffer); + return flatbuffers::GetRoot(buffer); } -SerializedMessage AngleControlMessageBuilder::build_angle_control_message(const int16_t angle) { - builder_.Clear(); +SerializedMessage +AngleControlMessageBuilder::build_angle_control_message(const int16_t angle) { + builder_.Clear(); - const auto message = Messaging::CreateAngleControlMessage(builder_, angle); + const auto message = Messaging::CreateAngleControlMessage(builder_, angle); - builder_.Finish(message); + builder_.Finish(message); - return {builder_.GetBufferPointer(), builder_.GetSize()}; + return {builder_.GetBufferPointer(), builder_.GetSize()}; } } // namespace Flatbuffers diff --git a/src/flatbuffers/RobotConfigurationBuilder.cpp b/src/flatbuffers/RobotConfigurationBuilder.cpp index 8c3e935..aaacdac 100644 --- a/src/flatbuffers/RobotConfigurationBuilder.cpp +++ b/src/flatbuffers/RobotConfigurationBuilder.cpp @@ -12,38 +12,41 @@ namespace Flatbuffers { SerializedMessage RobotConfigurationBuilder::build_robot_configuration( const std::vector &modules, const std::vector &connections) { - builder_.Clear(); + builder_.Clear(); - std::vector> module_vector; - std::vector> connection_vector; + std::vector> module_vector; + std::vector> + connection_vector; - for (const auto &connection : connections) { - connection_vector.push_back(Frontend::CreateModuleConnection( - builder_, connection.from_module_id, connection.to_module_id, connection.from_socket, - connection.to_socket, connection.orientation)); - } + for (const auto &connection : connections) { + connection_vector.push_back(Frontend::CreateModuleConnection( + builder_, connection.from_module_id, connection.to_module_id, + connection.from_socket, connection.to_socket, connection.orientation)); + } - for (const auto &module : modules) { - // todo: this only works for motors right now - auto motor_state = CreateMotorState(builder_, module.angle); - const flatbuffers::Offset config_union = motor_state.Union(); - module_vector.push_back(CreateRobotModule(builder_, module.id, module.type, - ModuleState_MotorState, config_union)); - } + for (const auto &module : modules) { + // todo: this only works for motors right now + auto motor_state = CreateMotorState(builder_, module.angle); + const flatbuffers::Offset config_union = motor_state.Union(); + module_vector.push_back(CreateRobotModule(builder_, module.id, module.type, + ModuleState_MotorState, + config_union)); + } - const auto connection_vector_fb = builder_.CreateVector(connection_vector); - const auto module_vector_fb = builder_.CreateVector(module_vector); + const auto connection_vector_fb = builder_.CreateVector(connection_vector); + const auto module_vector_fb = builder_.CreateVector(module_vector); - const auto message = - Frontend::CreateRobotConfiguration(builder_, module_vector_fb, connection_vector_fb); + const auto message = Frontend::CreateRobotConfiguration( + builder_, module_vector_fb, connection_vector_fb); - builder_.Finish(message); + builder_.Finish(message); - return {builder_.GetBufferPointer(), builder_.GetSize()}; + return {builder_.GetBufferPointer(), builder_.GetSize()}; } const Frontend::RobotConfiguration * -RobotConfigurationBuilder::parse_robot_configuration(const std::uint8_t *buffer) { - return flatbuffers::GetRoot(buffer); +RobotConfigurationBuilder::parse_robot_configuration( + const std::uint8_t *buffer) { + return flatbuffers::GetRoot(buffer); } } // namespace Flatbuffers diff --git a/src/flatbuffers/SensorMessageBuilder.cpp b/src/flatbuffers/SensorMessageBuilder.cpp index 3b7f47e..d866d6e 100644 --- a/src/flatbuffers/SensorMessageBuilder.cpp +++ b/src/flatbuffers/SensorMessageBuilder.cpp @@ -3,8 +3,9 @@ namespace Flatbuffers { -const Messaging::SensorMessage *SensorMessageBuilder::parse_sensor_message(const uint8_t *buffer) { - return flatbuffers::GetRoot(buffer); +const Messaging::SensorMessage * +SensorMessageBuilder::parse_sensor_message(const uint8_t *buffer) { + return flatbuffers::GetRoot(buffer); } } // namespace Flatbuffers diff --git a/src/flatbuffers/TextControlMessageBuilder.cpp b/src/flatbuffers/TextControlMessageBuilder.cpp new file mode 100644 index 0000000..8bddeae --- /dev/null +++ b/src/flatbuffers/TextControlMessageBuilder.cpp @@ -0,0 +1,21 @@ +// +// Created by Johnathon Slightham on 2025-06-30. +// + +#include "flatbuffers/TextControlMessageBuilder.h" + +namespace Flatbuffers { + +SerializedMessage +TextControlMessageBuilder::build_text_control_message(std::string &t) { + builder_.Clear(); + + auto text_offset = builder_.CreateString(t); + const auto message = + Messaging::CreateTextControlMessage(builder_, text_offset); + + builder_.Finish(message); + + return {builder_.GetBufferPointer(), builder_.GetSize()}; +} +} // namespace Flatbuffers diff --git a/src/flatbuffers/TopologyMessageBuilder.cpp b/src/flatbuffers/TopologyMessageBuilder.cpp index 4c6c60e..47d097e 100644 --- a/src/flatbuffers/TopologyMessageBuilder.cpp +++ b/src/flatbuffers/TopologyMessageBuilder.cpp @@ -7,32 +7,34 @@ #include "flatbuffers/SerializedMessage.h" namespace Flatbuffers { -SerializedMessage -TopologyMessageBuilder::build_topology_message(const uint8_t module_id, - const ModuleType module_type, - const std::vector &channel_to_module, - const std::vector &orientation_to_module) { - builder_.Clear(); +SerializedMessage TopologyMessageBuilder::build_topology_message( + const uint8_t module_id, const ModuleType module_type, + const std::vector &channel_to_module, + const std::vector &orientation_to_module) { + builder_.Clear(); - const auto orientation_to_module_vector = builder_.CreateVector(orientation_to_module); - const auto channel_to_module_vector = builder_.CreateVector(channel_to_module); + const auto orientation_to_module_vector = + builder_.CreateVector(orientation_to_module); + const auto channel_to_module_vector = + builder_.CreateVector(channel_to_module); - const auto message = - Messaging::CreateTopologyMessage(builder_, module_id, module_type, channel_to_module.size(), - channel_to_module_vector, orientation_to_module_vector); + const auto message = Messaging::CreateTopologyMessage( + builder_, module_id, module_type, channel_to_module.size(), + channel_to_module_vector, orientation_to_module_vector); - builder_.Finish(message); + builder_.Finish(message); - return {builder_.GetBufferPointer(), builder_.GetSize()}; + return {builder_.GetBufferPointer(), builder_.GetSize()}; } const Messaging::TopologyMessage * TopologyMessageBuilder::parse_topology_message(const uint8_t *buffer) { - return flatbuffers::GetRoot(buffer); + return flatbuffers::GetRoot(buffer); } -bool TopologyMessageBuilder::is_valid_topology_message(const uint8_t *buffer, size_t size) { - flatbuffers::Verifier verifier(buffer, size); - return Messaging::VerifyTopologyMessageBuffer(verifier); +bool TopologyMessageBuilder::is_valid_topology_message(const uint8_t *buffer, + size_t size) { + flatbuffers::Verifier verifier(buffer, size); + return Messaging::VerifyTopologyMessageBuffer(verifier); } } // namespace Flatbuffers diff --git a/src/lib_c_control.cpp b/src/lib_c_control.cpp index b2adf74..dba4a85 100644 --- a/src/lib_c_control.cpp +++ b/src/lib_c_control.cpp @@ -14,89 +14,93 @@ extern "C" { const auto robot_controller = std::make_unique(); -const auto acm_builder = std::make_unique(); +const auto acm_builder = + std::make_unique(); -const auto robot_configuration_builder = std::make_unique(); +const auto robot_configuration_builder = + std::make_unique(); LIB_API void init() { - spdlog::info("[c_control] Initializing"); - robot_controller->fetchDirectlyConnectedModules(false); + spdlog::info("[c_control] Initializing"); + robot_controller->fetchDirectlyConnectedModules(false); } -LIB_API void cleanup() { - spdlog::info("[c_control] Cleanup"); -} +LIB_API void cleanup() { spdlog::info("[c_control] Cleanup"); } LIB_API int send_angle_control(int module_id, int angle) { - if (const auto maybe_module = robot_controller->getModule(module_id)) { - const auto module = (*maybe_module).lock(); - module->actuate(angle); - } - return 0; + if (const auto maybe_module = robot_controller->getModule(module_id)) { + const auto module = (*maybe_module).lock(); + module->actuate(angle); + } + return 0; } LIB_API char *get_configuration(int *size_out) { - std::vector modules_vec{}; - std::vector connections_vec{}; + std::vector modules_vec{}; + std::vector connections_vec{}; - for (const auto &module : robot_controller->getModuleList()) { - modules_vec.emplace_back(module); - } + for (const auto &module : robot_controller->getModuleList()) { + modules_vec.emplace_back(module); + } - for (const auto &connection : robot_controller->getConnections()) { - connections_vec.emplace_back(connection); - } + for (const auto &connection : robot_controller->getConnections()) { + connections_vec.emplace_back(connection); + } - const auto [data, size] = - robot_configuration_builder->build_robot_configuration(modules_vec, connections_vec); - *size_out = size; - return reinterpret_cast(data); + const auto [data, size] = + robot_configuration_builder->build_robot_configuration(modules_vec, + connections_vec); + *size_out = size; + return reinterpret_cast(data); } -LIB_API bool control_sentry_init(const char *dsn, const char *environment, const char *release) { - sentry_options_t *options = sentry_options_new(); - sentry_options_set_dsn(options, dsn); - sentry_options_set_environment(options, environment); - sentry_options_set_release(options, release); - sentry_options_set_auto_session_tracking(options, 1); +LIB_API bool control_sentry_init(const char *dsn, const char *environment, + const char *release) { + sentry_options_t *options = sentry_options_new(); + sentry_options_set_dsn(options, dsn); + sentry_options_set_environment(options, environment); + sentry_options_set_release(options, release); + sentry_options_set_auto_session_tracking(options, 1); - sentry_init(options); - return true; + sentry_init(options); + return true; } -LIB_API void control_sentry_shutdown(void) { - sentry_close(); -} +LIB_API void control_sentry_shutdown(void) { sentry_close(); } -LIB_API void control_sentry_set_app_info(const char *app_name, const char *app_version, +LIB_API void control_sentry_set_app_info(const char *app_name, + const char *app_version, const char *build_number) { - sentry_value_t app = sentry_value_new_object(); + sentry_value_t app = sentry_value_new_object(); - if (app_name && *app_name) { - sentry_value_set_by_key(app, "name", sentry_value_new_string(app_name)); - } + if (app_name && *app_name) { + sentry_value_set_by_key(app, "name", sentry_value_new_string(app_name)); + } - if (app_version && *app_version) { - sentry_value_set_by_key(app, "version", sentry_value_new_string(app_version)); - } + if (app_version && *app_version) { + sentry_value_set_by_key(app, "version", + sentry_value_new_string(app_version)); + } + if (build_number && *build_number) { + sentry_value_set_by_key(app, "build", + sentry_value_new_string(build_number)); + } + + sentry_set_context("app", app); + + if (app_version && *app_version) { if (build_number && *build_number) { - sentry_value_set_by_key(app, "build", sentry_value_new_string(build_number)); - } - - sentry_set_context("app", app); - - if (app_version && *app_version) { - if (build_number && *build_number) { - char release[256]; - snprintf(release, sizeof(release), "%s@%s+%s", app_name && *app_name ? app_name : "app", - app_version, build_number); - } else { - // Example: mygame@1.2.3 - char release[256]; - snprintf(release, sizeof(release), "%s@%s", app_name && *app_name ? app_name : "app", - app_version); - } + char release[256]; + snprintf(release, sizeof(release), "%s@%s+%s", + app_name && *app_name ? app_name : "app", app_version, + build_number); + } else { + // Example: mygame@1.2.3 + char release[256]; + snprintf(release, sizeof(release), "%s@%s", + app_name && *app_name ? app_name : "app", app_version); } + } } } diff --git a/src/libcontrol.cpp b/src/libcontrol.cpp index 83f6076..1f4e9e1 100644 --- a/src/libcontrol.cpp +++ b/src/libcontrol.cpp @@ -29,221 +29,232 @@ #define SENSOR_BUFFER_SIZE 1024 #define NETWORK_CONFIG_FETCH_RATE 3s #define MODULE_EXPIRE_TIME 3s -#define CONTROL_MESSAGE_FREQUENCY 33ms +#define CONTROL_MESSAGE_FREQUENCY 50ms using namespace std::chrono_literals; RobotController::~RobotController() { - m_stop_thread = true; - m_metadata_loop.join(); - m_transmit_loop.join(); - m_configuration_loop.join(); - m_sensor_loop.join(); - m_expiry_looop.join(); + m_stop_thread = true; + m_metadata_loop.join(); + m_transmit_loop.join(); + m_configuration_loop.join(); + m_sensor_loop.join(); + m_expiry_looop.join(); } std::vector> RobotController::getModules() { - std::vector> out; - std::shared_lock lock(m_module_lock); - out.reserve(m_id_to_module.size()); - for (const auto m : map_to_values(m_id_to_module)) { - out.emplace_back(m); - } - return out; + std::vector> out; + std::shared_lock lock(m_module_lock); + out.reserve(m_id_to_module.size()); + for (const auto m : map_to_values(m_id_to_module)) { + out.emplace_back(m); + } + return out; } -std::vector RobotController::getConnections() { - std::vector out; - std::shared_lock lock(m_connection_lock); +std::vector +RobotController::getConnections() { + std::vector out; + std::shared_lock lock(m_connection_lock); - for (auto const &[_, value] : m_connection_map) { - for (const auto conn : value) { - out.push_back(conn); - } + for (auto const &[_, value] : m_connection_map) { + for (const auto conn : value) { + out.push_back(conn); } - return out; + } + return out; } std::vector RobotController::getModuleList() { - std::vector out; - std::shared_lock lock(m_module_lock); - for (auto const &[key, value] : m_id_to_module) { - out.push_back({key, value->get_type()}); - } - return out; + std::vector out; + std::shared_lock lock(m_module_lock); + for (auto const &[key, value] : m_id_to_module) { + out.push_back({key, value->get_type()}); + } + return out; } -std::optional> RobotController::getModule(uint8_t device_id) { - std::shared_lock lock(m_module_lock); - if (m_id_to_module.contains(device_id)) { - return m_id_to_module[device_id]; - } else { - return std::nullopt; - } +std::optional> +RobotController::getModule(uint8_t device_id) { + std::shared_lock lock(m_module_lock); + if (m_id_to_module.contains(device_id)) { + return m_id_to_module[device_id]; + } else { + return std::nullopt; + } } void RobotController::resetModules() { - std::unique_lock module_lock(m_module_lock); - std::unique_lock conn_lock(m_connection_lock); - m_id_to_module.erase(m_id_to_module.begin(), m_id_to_module.end()); - m_connection_map.erase(m_connection_map.begin(), m_connection_map.end()); + std::unique_lock module_lock(m_module_lock); + std::unique_lock conn_lock(m_connection_lock); + m_id_to_module.erase(m_id_to_module.begin(), m_id_to_module.end()); + m_connection_map.erase(m_connection_map.begin(), m_connection_map.end()); } void RobotController::fetchDirectlyConnectedModules(bool block) { - spdlog::info("[Control] Fetching modules from network"); - auto t = std::thread([&] { - auto out = m_messaging_interface->find_connected_modules( - std::chrono::milliseconds(SCAN_DURATION_MS)); - spdlog::info("[Control] Found {} modules on the network", out.size()); - }); + spdlog::info("[Control] Fetching modules from network"); + auto t = std::thread([&] { + auto out = m_messaging_interface->find_connected_modules( + std::chrono::milliseconds(SCAN_DURATION_MS)); + spdlog::info("[Control] Found {} modules on the network", out.size()); + }); - if (block) { - t.join(); - } else { - t.detach(); - } + if (block) { + t.join(); + } else { + t.detach(); + } } void RobotController::metadata_loop() { - unsigned char buf[TOPOLOGY_BUFFER_SIZE]; - const auto builder = std::make_unique(); - while (!m_stop_thread) { - if (auto result = - m_messaging_interface->recv(buf, TOPOLOGY_BUFFER_SIZE, TOPOLOGY_CMD_TAG)) { - const auto &[rx_size, from] = *result; + unsigned char buf[TOPOLOGY_BUFFER_SIZE]; + const auto builder = std::make_unique(); + while (!m_stop_thread) { + if (auto result = m_messaging_interface->recv(buf, TOPOLOGY_BUFFER_SIZE, + TOPOLOGY_CMD_TAG)) { + const auto &[rx_size, from] = *result; - flatbuffers::Verifier verifier(buf, rx_size); - if (!Messaging::VerifyTopologyMessageBuffer(verifier)) { - continue; - } + flatbuffers::Verifier verifier(buf, rx_size); + if (!Messaging::VerifyTopologyMessageBuffer(verifier)) { + continue; + } - const auto metadata = builder->parse_topology_message(reinterpret_cast(buf)); - std::unique_lock lock(m_module_lock); - if (!m_id_to_module.contains(metadata->module_id())) { - spdlog::info("[Control] Creating module entry for {}", metadata->module_id()); - m_id_to_module.insert( - {metadata->module_id(), - ModuleFactory::createModule(metadata->module_id(), metadata->module_type(), - m_messaging_interface)}); - } + const auto metadata = + builder->parse_topology_message(reinterpret_cast(buf)); + std::unique_lock lock(m_module_lock); + if (!m_id_to_module.contains(metadata->module_id())) { + spdlog::info("[Control] Creating module entry for {}", + metadata->module_id()); + m_id_to_module.insert( + {metadata->module_id(), + ModuleFactory::createModule(metadata->module_id(), + metadata->module_type(), + m_messaging_interface)}); + } - m_id_to_module[metadata->module_id()]->update_module_metadata(*metadata); + m_id_to_module[metadata->module_id()]->update_module_metadata(*metadata); - std::unique_lock conn_lock(m_connection_lock); - std::vector conns; - for (uint8_t i = 1; i < NUM_CHANNELS; i++) { - if (metadata->channel_to_module()->Get(i) > 0) { - conns.push_back(Flatbuffers::ModuleConnectionInstance{ - .from_module_id = metadata->module_id(), - .to_module_id = metadata->channel_to_module()->Get(i), - .from_socket = i, - .to_socket = 0, - .orientation = - static_cast(metadata->channel_to_orientation()->Get(i))}); - } - } - - m_connection_map[metadata->module_id()] = conns; + std::unique_lock conn_lock(m_connection_lock); + std::vector conns; + for (uint8_t i = 1; i < NUM_CHANNELS; i++) { + if (metadata->channel_to_module()->Get(i) > 0) { + conns.push_back(Flatbuffers::ModuleConnectionInstance{ + .from_module_id = metadata->module_id(), + .to_module_id = metadata->channel_to_module()->Get(i), + .from_socket = i, + .to_socket = 0, + .orientation = static_cast( + metadata->channel_to_orientation()->Get(i))}); } + } + + m_connection_map[metadata->module_id()] = conns; } + } } void RobotController::transmit_loop() { - const auto builder = std::make_unique(); - while (!m_stop_thread) { - std::this_thread::sleep_for(CONTROL_MESSAGE_FREQUENCY); - std::shared_lock lock(m_module_lock); - for (const auto [id, module] : m_id_to_module) { - auto out = module->get_actuation_message(); + const auto builder = std::make_unique(); + while (!m_stop_thread) { + std::this_thread::sleep_for(CONTROL_MESSAGE_FREQUENCY); + std::shared_lock lock(m_module_lock); + for (const auto [id, module] : m_id_to_module) { + auto out = module->get_actuation_message(); - if (out.size() > 0) { - m_messaging_interface->send(out.data(), out.size(), id, ACTUATOR_CMD_TAG, false); - } - } + if (out.size() > 0) { + m_messaging_interface->send(out.data(), out.size(), id, + ACTUATOR_CMD_TAG, false); + } } + } } void RobotController::configuration_loop() { - while (!m_stop_thread) { - std::this_thread::sleep_for(NETWORK_CONFIG_FETCH_RATE); - fetchDirectlyConnectedModules(true); - } + while (!m_stop_thread) { + std::this_thread::sleep_for(NETWORK_CONFIG_FETCH_RATE); + fetchDirectlyConnectedModules(true); + } } void RobotController::expiry_loop() { - while (!m_stop_thread) { - std::this_thread::sleep_for(MODULE_EXPIRE_TIME); + while (!m_stop_thread) { + std::this_thread::sleep_for(MODULE_EXPIRE_TIME); - std::unordered_set delete_modules{}; + std::unordered_set delete_modules{}; - std::unique_lock module_lock(m_module_lock); - std::unique_lock connection_lock(m_connection_lock); + std::unique_lock module_lock(m_module_lock); + std::unique_lock connection_lock(m_connection_lock); - for (auto it = m_id_to_module.begin(); it != m_id_to_module.end();) { - if (it->second->get_last_updated_time() < - std::chrono::system_clock::now() - MODULE_EXPIRE_TIME) { - delete_modules.emplace(it->first); - it = m_id_to_module.erase(it); - } else { - ++it; - } - } - - // todo - // Remove connections - // for (auto it = m_connection_map.begin(); it != m_connection_map.end();) { - // // Remove it->x connections - // if (delete_modules.contains(it->first)) { - // it = m_connection_map.erase(it); - // } else { - // ++it; - // } - - // // Remove x->it connections - // for (auto it2 = it->second.begin(); it2 != it->second.end();) { - // if (delete_modules.contains(it2->to_module_id)) { - // it2 = it->second.erase(it2); - // } else { - // ++it2; - // } - // } - // } + for (auto it = m_id_to_module.begin(); it != m_id_to_module.end();) { + if (it->second->get_last_updated_time() < + std::chrono::system_clock::now() - MODULE_EXPIRE_TIME) { + delete_modules.emplace(it->first); + it = m_id_to_module.erase(it); + } else { + ++it; + } } + + // todo + // Remove connections + // for (auto it = m_connection_map.begin(); it != m_connection_map.end();) { + // // Remove it->x connections + // if (delete_modules.contains(it->first)) { + // it = m_connection_map.erase(it); + // } else { + // ++it; + // } + + // // Remove x->it connections + // for (auto it2 = it->second.begin(); it2 != it->second.end();) { + // if (delete_modules.contains(it2->to_module_id)) { + // it2 = it->second.erase(it2); + // } else { + // ++it2; + // } + // } + // } + } } void RobotController::sensor_loop() { - unsigned char buf[SENSOR_BUFFER_SIZE]; - const auto builder = std::make_unique(); - while (!m_stop_thread) { - if (auto result = m_messaging_interface->recv(buf, SENSOR_BUFFER_SIZE, SENSOR_CMD_TAG)) { - const auto &[rx_size, from] = *result; + unsigned char buf[SENSOR_BUFFER_SIZE]; + const auto builder = std::make_unique(); + while (!m_stop_thread) { + if (auto result = m_messaging_interface->recv(buf, SENSOR_BUFFER_SIZE, + SENSOR_CMD_TAG)) { + const auto &[rx_size, from] = *result; - flatbuffers::Verifier verifier(buf, rx_size); - if (!Messaging::VerifySensorMessageBuffer(verifier)) { - continue; - } + flatbuffers::Verifier verifier(buf, rx_size); + if (!Messaging::VerifySensorMessageBuffer(verifier)) { + continue; + } - const auto sensor_message = - builder->parse_sensor_message(reinterpret_cast(buf)); - if (sensor_message->values()->size() != sensor_message->values_type()->size()) { - spdlog::error( - "[Control] Got a sensor message with different value ({}) and type ({}) sizes", - sensor_message->values()->size(), sensor_message->values_type()->size()); - continue; - } + const auto sensor_message = + builder->parse_sensor_message(reinterpret_cast(buf)); + if (sensor_message->values()->size() != + sensor_message->values_type()->size()) { + spdlog::error("[Control] Got a sensor message with different value " + "({}) and type ({}) sizes", + sensor_message->values()->size(), + sensor_message->values_type()->size()); + continue; + } - std::shared_lock module_lock(m_module_lock); - if (!m_id_to_module.contains(from)) { - continue; - } + std::shared_lock module_lock(m_module_lock); + if (!m_id_to_module.contains(from)) { + continue; + } - for (int i = 0; i < sensor_message->values()->size(); i++) { - if (auto maybe_value = Flatbuffers::SensorMessageBuilder::build_sensor_value( - static_cast(sensor_message->values_type()->Get(i)), - sensor_message->values()->Get(i))) { - m_id_to_module[from]->update_sensor_data(*maybe_value); - } - } + for (int i = 0; i < sensor_message->values()->size(); i++) { + if (auto maybe_value = + Flatbuffers::SensorMessageBuilder::build_sensor_value( + static_cast( + sensor_message->values_type()->Get(i)), + sensor_message->values()->Get(i))) { + m_id_to_module[from]->update_sensor_data(*maybe_value); } + } } + } }