Merge branch 'develop'

Author: hevake

README.md

@@ -18,8 +18,9 @@
 
 See projects:
 
-- [cpp-socks5](https://github.com/cpp-main/cpp-socks5);
-- [protocal-adapter](https://github.com/cpp-main/protocal-adapter)；
+- [cpp-socks5](https://github.com/cpp-main/cpp-socks5), learn how to use TCP and how to organize the project;
+- [protocal-adapter](https://github.com/cpp-main/protocal-adapter), learn how to use TCP, UDP, MQTT, UART;
+- [cpp-tbox-for-ros](https://github.com/cpp-main/cpp-tbox-for-ros), learn how to how to integrate into the ROS 2 development environment, and how to use `rclcpp`;
 
 # Features
 

README_CN.md

@@ -18,8 +18,9 @@
 
 参考项目:  
 
-- [cpp-socks5](https://gitee.com/cpp-master/cpp-socks5)；
-- [protocal-adapter](https://gitee.com/cpp-master/protocal-adapter)；
+- [cpp-socks5](https://gitee.com/cpp-master/cpp-socks5)，参考如何进行TCP通信，以及如何组织工程；
+- [protocal-adapter](https://gitee.com/cpp-master/protocal-adapter)，参考如何进行 TCP, UDP, MQTT, UART 通信；
+- [cpp-tbox-for-ros](https://gitee.com/cpp-master/cpp-tbox-for-ros)，参考如何集成到ROS2开发环境，以及如何例用 rclcpp 进行通信；
 
 # 特点
 

examples/main/02_more_than_one_apps/app2/app.cpp

@@ -34,7 +34,7 @@ App::~App()
     LogTag();
 }
 
-void App::onFillDefaultConfig(tbox::Json &cfg)
+void App::onFillDefaultConfig(tbox::Json &cfg) const
 {
     cfg["ok"] = true;
 }

examples/main/02_more_than_one_apps/app2/app.h

@@ -31,7 +31,7 @@ class App : public tbox::main::Module
     ~App();
 
   protected:
-    virtual void onFillDefaultConfig(tbox::Json &cfg) override;
+    virtual void onFillDefaultConfig(tbox::Json &cfg) const override;
     virtual bool onInit(const tbox::Json &cfg) override;
     virtual bool onStart() override;
     virtual void onStop() override;

examples/main/03_nc_client_and_echo_server/echo_server/app.cpp

@@ -39,7 +39,7 @@ App::~App()
     CHECK_DELETE_RESET_OBJ(server_);
 }
 
-void App::onFillDefaultConfig(Json &cfg)
+void App::onFillDefaultConfig(Json &cfg) const
 {
     cfg["bind"] = "127.0.0.1:12345";
 }

examples/main/03_nc_client_and_echo_server/echo_server/app.h

@@ -33,7 +33,7 @@ class App : public main::Module
     App(main::Context &ctx);
     virtual ~App() override;
 
-    virtual void onFillDefaultConfig(Json &cfg) override;
+    virtual void onFillDefaultConfig(Json &cfg) const override;
     virtual bool onInit(const tbox::Json &cfg) override;
     virtual bool onStart() override;
     virtual void onStop() override;

examples/main/03_nc_client_and_echo_server/nc_client/app.cpp

@@ -41,7 +41,7 @@ App::~App()
     CHECK_DELETE_RESET_OBJ(client_);
 }
 
-void App::onFillDefaultConfig(Json &cfg)
+void App::onFillDefaultConfig(Json &cfg) const
 {
     cfg["server"] = "127.0.0.1:12345";
 }

examples/main/03_nc_client_and_echo_server/nc_client/app.h

@@ -34,7 +34,7 @@ class App : public main::Module
     App(tbox::main::Context &ctx);
     virtual ~App() override;
 
-    virtual void onFillDefaultConfig(Json &cfg) override;
+    virtual void onFillDefaultConfig(Json &cfg) const override;
     virtual bool onInit(const tbox::Json &cfg) override;
     virtual bool onStart() override;
     virtual void onStop() override;

examples/run/echo_server/echo_server.cpp

@@ -39,7 +39,7 @@ App::~App()
     CHECK_DELETE_RESET_OBJ(server_);
 }
 
-void App::onFillDefaultConfig(Json &cfg)
+void App::onFillDefaultConfig(Json &cfg) const
 {
     cfg["bind"] = "127.0.0.1:12345";
 }

examples/run/echo_server/echo_server.h

@@ -33,7 +33,7 @@ class App : public main::Module
     App(main::Context &ctx);
     virtual ~App() override;
 
-    virtual void onFillDefaultConfig(Json &cfg) override;
+    virtual void onFillDefaultConfig(Json &cfg) const override;
     virtual bool onInit(const tbox::Json &cfg) override;
     virtual bool onStart() override;
     virtual void onStop() override;