perf: use new serial port impl

Author: shuai132

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "third_party/asio"]
 	path = third_party/asio
 	url = [email protected]:chriskohlhoff/asio.git
+[submodule "modules/asio_net"]
+	path = modules/asio_net
+	url = [email protected]:shuai132/asio_net

App/App.cpp

@@ -1,16 +1,19 @@
 #include "App.h"
+
+#include <memory>
 #include "imgui.h"
 #include "ui/commondef.h"
 
 using namespace ImGui;
 
 App::App()
-    : comm_(std::unique_ptr<Comm>(new Comm(this)))
+    : comm_(std::make_unique<Comm>((AppContext*)this))
     , uiComm_(comm_.get())
     , uiCmd_(comm_.get())
     , uiVol_(comm_.get())
     , uiFFT_(comm_.get())
     {
+    comm_->init();
     initGUI();
 }
 
@@ -49,6 +52,10 @@ void App::post(const std::function<void()>& task) {
     uiContext_.post(task);
 }
 
+void* App::nativeHandle() {
+    return &uiContext_;
+}
+
 void App::initGUI() {
     windowFlags_ |= ImGuiWindowFlags_NoMove;
     windowFlags_ |= ImGuiWindowFlags_NoResize;

App/App.h

@@ -19,6 +19,8 @@ class App : UI, AppContext {
 
     void post(const std::function<void()>& task) override;
 
+    void *nativeHandle() override;
+
 private:
     void initGUI();
 
@@ -28,10 +30,10 @@ class App : UI, AppContext {
     static const char* MainWindowTitle;
 
 private:
-    std::unique_ptr<Comm> comm_;
     asio::io_context uiContext_;
+    std::unique_ptr<Comm> comm_;
 
-    uint32_t windowFlags_ = 0;
+    int windowFlags_ = 0;
 
     UIComm uiComm_;
     UICmd uiCmd_;

App/AppContext.h

@@ -5,4 +5,5 @@ class AppContext {
     virtual ~AppContext() = default;
     virtual void runOnUiThread(const std::function<void()>& task) = 0;
     virtual void post(const std::function<void()>& task) = 0;
+    virtual void* nativeHandle() = 0;
 };

App/comm/Comm.cpp

@@ -4,20 +4,24 @@
 #include "log.h"
 
 Comm::Comm(AppContext* context)
-    : scopeGui_(this), appContext_(context) {
+    : scopeGui_(this), appContext_(context) {}
+
+void Comm::init() {
+    serialPort_ = std::make_unique<asio_net::serial_port>(*(asio::io_context*)appContext_->nativeHandle());
     initSerial();
 }
 
 void Comm::setPortName(const std::string& name) {
-    smartSerial_.setPortName(name);
+    serialPort_->close();
+    serialPort_->open(name);
 }
 
 std::string Comm::getPortName() {
-    return smartSerial_.getPortName();
+    return serialPort_->config().device;
 }
 
 bool Comm::isOpen() {
-    return smartSerial_.isOpen();
+    return serialPort_->is_open();
 }
 
 void Comm::setRecvEnable(bool enable) {
@@ -33,30 +37,29 @@ void Comm::sendCmd(Cmd::Type type, Cmd::Data data) {
     cmdLastTime_ = now;
     cmdRespond_ = false;
 
-    if (not smartSerial_.isOpen()) {
+    if (not serialPort_->is_open()) {
         LOGD("not open, cmd ignored!");
         return;
     }
     scopeGui_.sendCmd(type, data);
 }
 
 void Comm::initSerial() {
-    smartSerial_.setOnOpenHandle([this](bool isOpen) {
-        if (isOpen) {
-            sendCmd(Cmd::SOFTWARE_TRIGGER);
-        }
+    serialPort_->set_reconnect(1000);
+    serialPort_->on_open = ([this]() {
+      sendCmd(Cmd::SOFTWARE_TRIGGER);
     });
+    serialPort_->open();
+//    serialPort_->setVidPid(PORT_VID, PORT_PID);
 
-    smartSerial_.setVidPid(PORT_VID, PORT_PID);
-
-    smartSerial_.setOnReadHandle([this](const uint8_t* data, size_t size) {
+    serialPort_->on_data = [this](const std::string& data) {
         if (not recvEnabled_) return;
-        scopeGui_.onMcuData(data, size);
-    });
+        scopeGui_.onMcuData((uint8_t*)data.data(), data.size());
+    };
 }
 
 void Comm::sendToMcu(const uint8_t* data, size_t size) {
-    smartSerial_.write(data, size);
+    serialPort_->send(std::string((char*)data, size));
 }
 
 void Comm::onMessage(Message* message, size_t size) {

App/comm/Comm.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "base/noncopyable.h"
-#include "SmartSerial.h"
+#include "asio_net/serial_port.hpp"
 #include "algorithm/MsgAnalyzer.h"
 #include "AppContext.h"
 #include "ScopeGUI.h"
@@ -19,6 +19,8 @@ class Comm : noncopyable, private ScopeGUI::Comm {
     void onMessage(Message* message, size_t size) override;
 
 public:
+    void init();
+
     void setPortName(const std::string& name);
 
     std::string getPortName();
@@ -39,9 +41,9 @@ class Comm : noncopyable, private ScopeGUI::Comm {
     ScopeGUI scopeGui_;
 
     // Serial Port
-    SmartSerial smartSerial_;
-    const char* PORT_VID = "1234";
-    const char* PORT_PID = "5740";
+    std::unique_ptr<asio_net::serial_port> serialPort_;
+//    const char* PORT_VID = "1234";
+//    const char* PORT_PID = "5740";
 
     std::atomic_bool recvEnabled_ {true};
 

App/ui/UIComm.cpp

@@ -1,5 +1,6 @@
 #include "UIComm.h"
 #include "imgui.h"
+#include "serial/serial.h"
 
 using namespace ImGui;
 

CMakeLists.txt

@@ -37,6 +37,10 @@ link_libraries(imgui)
 add_subdirectory(modules/SmartSerial)
 link_libraries(smartserial)
 
+# asio_net
+add_subdirectory(modules/asio_net)
+link_libraries(asio_net)
+
 # log
 include_directories(modules/log)