auto generation of protobuf files

Author: darki-31

CMakeLists.txt

@@ -6,9 +6,10 @@ cmake_minimum_required (VERSION 3.8)
 project ("LabNet")
 
 # Include sub-projects.
+add_subdirectory(proto)
 add_subdirectory("LabNet")
 
 add_subdirectory(vendor/sobjectizer/dev sobjectizer)
 
 set(GATTLIB_BUILD_DOCS OFF)
-add_subdirectory(vendor/gattlib gattlib)
+add_subdirectory(vendor/gattlib gattlib)

LabNet/CMakeLists.txt

@@ -9,8 +9,7 @@ find_path(BOOST_ASIO_INCLUDE_DIRS "boost/asio.hpp")
 add_executable(LabNet LabNet.cpp
                log/easylogging++.cc log/easylogging++.h log/logging_facility.h log/standard_output_logger.h log/easy_logger.h log/logger_factory.h               
                network/connection.cpp network/connection.h network/connection_manager.cpp network/connection_manager.h network/server.cpp network/server.h
-               network/LabNet.pb.h network/LabNetClient.pb.h network/LabNetServer.pb.h network/LabNet.pb.cc network/LabNetClient.pb.cc
-               network/LabNetServer.pb.cc network/protocol_all.h network/shared_buffer.h
+               network/protocol_all.h network/shared_buffer.h
                network/server_messages.h network/server_actor.h network/server_actor.cpp
                interface/uart/serial_port.cpp interface/uart/serial_port.h  interface/uart/serial_ports_manager.h
                interface/uart/serial_ports_manager.cpp interface/uart/private_messages.h interface/uart/digital_input.h interface/uart/digital_output.h 
@@ -45,7 +44,7 @@ target_include_directories(LabNet PRIVATE ../vendor/sobjectizer/dev)
 target_include_directories(LabNet PRIVATE ../vendor/gattlib/include)
 target_include_directories(LabNet PRIVATE log)
 
-target_link_libraries(LabNet PRIVATE so.5.7.3 gattlib atomic pthread boost_system wiringPi protobuf sfml-system sfml-audio)
+target_link_libraries(LabNet PRIVATE so.5.7.3 gattlib atomic pthread boost_system wiringPi protobuf sfml-system sfml-audio proto)
 
 add_compile_definitions(ELPP_THREAD_SAFE)
 add_compile_definitions(ELPP_NO_DEFAULT_LOG_FILE)

LabNet/interface/ble_uart/ble_uart_actor.h

@@ -5,7 +5,7 @@
 #include <logging_facility.h>
 #include "connection.h"
 
-#include "../../network/LabNetClient.pb.h"
+#include <LabNetClient.pb.h>
 
 namespace LabNet::interface::ble_uart
 {
@@ -35,4 +35,4 @@ namespace LabNet::interface::ble_uart
 
         Connection connection_;
     };
-}
+}

LabNet/interface/ble_uart/ble_uart_main.h

@@ -6,7 +6,7 @@
 #include <logging_facility.h>
 #include <map>
 
-#include "../../network/LabNetClient.pb.h"
+#include <LabNetClient.pb.h>
 
 namespace LabNet::interface::ble_uart
 {
@@ -37,4 +37,4 @@ namespace LabNet::interface::ble_uart
         // coop for each device
         std::map<std::string, so_5::coop_handle_t> m_coop;
     };
-};
+};

LabNet/interface/chi_bio/chi_bio_main_actor.cpp

@@ -1,7 +1,7 @@
 #include "chi_bio_main_actor.h"
-#include "../../network/LabNet.pb.h"
-#include "../../network/LabNetClient.pb.h"
-#include "../../network/LabNetServer.pb.h"
+#include <LabNet.pb.h>
+#include <LabNetClient.pb.h>
+#include <LabNetServer.pb.h>
 #include "../interface_messages.h"
 #include "../resources/resources_actor.h"
 #include <cmath>
@@ -291,4 +291,4 @@ namespace LabNet::interface::chi_bio
     {
         return wiringPiI2CWriteReg8(mux_handle_, 0, 1 << boardNbr);
     }
-};
+};

LabNet/interface/gpio_wiring/gpio_manager.cpp

@@ -1,8 +1,8 @@
 #include "gpio_manager.h"
 #include "../digital_messages.h"
 #include "../interface_messages.h"
-#include "../../network/LabNet.pb.h"
-#include "../../network/LabNetClient.pb.h"
+#include <LabNet.pb.h>
+#include <LabNetClient.pb.h>
 #include "resource_request_helper.h"
 #include <chrono>
 #include <wiringPi.h>
@@ -190,4 +190,4 @@ namespace LabNet::interface::gpio_wiring
                     this >>= running_state_;
                 });
     }
-};
+};

LabNet/interface/io_board/board_actor.cpp

@@ -1,6 +1,6 @@
 #include "board_actor.h"
-#include "../../network/LabNet.pb.h"
-#include "../../network/LabNetClient.pb.h"
+#include <LabNet.pb.h>
+#include <LabNetClient.pb.h>
 #include "../../network/server_messages.h"
 #include "../digital_messages.h"
 #include "../interface_messages.h"

LabNet/interface/manage_interfaces.cpp

@@ -2,8 +2,8 @@
 #include <memory>
 
 #include "../helper/reset_msg.h"
-#include "../network/LabNet.pb.h"
-#include "../network/LabNetClient.pb.h"
+#include <LabNet.pb.h>
+#include <LabNetClient.pb.h>
 #include "../network/server_messages.h"
 #include "digital_messages.h"
 #include "interface_messages.h"
@@ -479,4 +479,4 @@ namespace LabNet::interface
 
         return true;
     }
-};
+};

LabNet/interface/rfid_board/rfid_main_actor.cpp

@@ -1,6 +1,6 @@
 #include "rfid_main_actor.h"
-#include "../../network/LabNet.pb.h"
-#include "../../network/LabNetClient.pb.h"
+#include <LabNet.pb.h>
+#include <LabNetClient.pb.h>
 #include "../interface_messages.h"
 #include "../resources/resources_actor.h"
 
@@ -105,4 +105,4 @@ void RfidBoardMainActor::so_define_agent()
                 worker_ = std::make_unique<DataReadWorker>(device_);
                 this >>= running_state_;
             });
-}
+}

LabNet/interface/sound/signal_generator.cpp

@@ -6,8 +6,8 @@
 #include <math.h>
 #include <random>
 
-#include "../../network/LabNet.pb.h"
-#include "../../network/LabNetClient.pb.h"
+#include <LabNet.pb.h>
+#include <LabNetClient.pb.h>
 #include "../digital_messages.h"
 #include "../interface_messages.h"
 #include "signal_generator.h"