rename ser to usb

Author: KingRichord

example/ZMQ/zmq_main.cpp

@@ -8,8 +8,8 @@ int main() {
    使用网口连接
    synchronizer.SetNetLink("192.168.1.188", 8888);
   */
-  // 使用USB连接
-  synchronizer.SetSerialLink("/dev/ttyACM0", 460800);
+  synchronizer.SetUsbLink("/dev/ttyACM0", 460800);
+
   /*
     如使用工业相机, 需要指定 相机名称 和 同步板的触发端口
     std::map<std::string, TriggerDevice> params;

infinite_sense_core/CMakeLists.txt

@@ -23,7 +23,7 @@ add_subdirectory(third_party/udp)
 add_library(${PROJECT_NAME} SHARED
   src/infinite_sense.cpp
   src/trigger.cpp
-  src/ser.cpp
+  src/usb.cpp
   src/cam.cpp
   src/image.cpp
   src/net.cpp

infinite_sense_core/include/infinite_sense.h

@@ -6,7 +6,7 @@
 namespace infinite_sense {
 
 class NetManager;
-class SerialManager;
+class UsbManager;
 class CamManger;
 class TriggerManger;
 class Messenger;
@@ -48,7 +48,7 @@ class Synchronizer {
    * @param serial_dev 串口设备名称（如 "/dev/ttyUSB0"）。
    * @param serial_baud_rate 波特率（如 115200）。
    */
-  void SetSerialLink(std::string serial_dev, int serial_baud_rate);
+  void SetUsbLink(std::string serial_dev, int serial_baud_rate);
 
   /**
    * @brief 配置网络连接参数。
@@ -97,7 +97,7 @@ class Synchronizer {
   std::shared_ptr<NetManager> net_manager_{nullptr};
 
   /// 串口管理器
-  std::shared_ptr<SerialManager> serial_manager_{nullptr};
+  std::shared_ptr<UsbManager> serial_manager_{nullptr};
 
   /// 相机管理器
   std::shared_ptr<CamManger> cam_manager_{nullptr};

infinite_sense_core/include/ptp.h

@@ -1,14 +1,14 @@
 #pragma once
 #include <json.hpp>
-#include "ser.h"
+#include "usb.h"
 #include <practical_socket.h>
 namespace infinite_sense {
 class Ptp {
  public:
   Ptp() = default;
   void ReceivePtpData(const nlohmann::json &data);
   void SendPtpData() const;
-  void SetSerialPtr(const std::shared_ptr<serial::Serial> &serial_ptr);
+  void SetUsbPtr(const std::shared_ptr<serial::Serial> &serial_ptr);
   void SetNetPtr(const std::shared_ptr<UDPSocket> &net_ptr, const std::string &target_ip, unsigned short port);
 
  private:

infinite_sense_core/include/ser.h infinite_sense_core/include/usb.hinfinite_sense_core/include/ser.h renamed to infinite_sense_core/include/usb.h

@@ -1,16 +1,16 @@
 #pragma once
-#include "ser.h"
+#include "usb.h"
 #include "serial.h"
 #include <thread>
 #include <memory>
 
 namespace infinite_sense {
 class Ptp;
-class SerialManager {
+class UsbManager {
  public:
-  explicit SerialManager(const std::string &port, int baud_rate);
+  explicit UsbManager(const std::string &port, int baud_rate);
 
-  ~SerialManager();
+  ~UsbManager();
 
   [[nodiscard]] bool IsAvailable() const { return serial_ptr_->isOpen(); }
 

infinite_sense_core/src/infinite_sense.cpp

@@ -2,7 +2,7 @@
 
 #include "trigger.h"
 #include "net.h"
-#include "ser.h"
+#include "usb.h"
 #include "cam.h"
 #include "messenger.h"
 #include "log.h"
@@ -21,10 +21,10 @@ void Synchronizer::SetNetLink(std::string net_dev, const unsigned int port) {
   net_port_ = port;
   net_manager_ = std::make_shared<NetManager>(net_ip_, net_port_);
 }
-void Synchronizer::SetSerialLink(std::string serial_dev, const int serial_baud_rate) {
+void Synchronizer::SetUsbLink(std::string serial_dev, const int serial_baud_rate) {
   serial_dev_ = std::move(serial_dev);
   serial_baud_rate_ = serial_baud_rate;
-  serial_manager_ = std::make_shared<SerialManager>(serial_dev_, serial_baud_rate_);
+  serial_manager_ = std::make_shared<UsbManager>(serial_dev_, serial_baud_rate_);
   net_manager_ = nullptr;
 }
 void Synchronizer::UseMvCam(const std::map<string, TriggerDevice>& params) {

infinite_sense_core/src/ptp.cpp

@@ -1,8 +1,8 @@
 #include "ptp.h"
-#include <ser.h>
+#include <usb.h>
 #include <thread>
 namespace infinite_sense {
-void Ptp::SetSerialPtr(const std::shared_ptr<serial::Serial> &serial_ptr) { serial_ptr_ = serial_ptr; }
+void Ptp::SetUsbPtr(const std::shared_ptr<serial::Serial> &serial_ptr) { serial_ptr_ = serial_ptr; }
 void Ptp::SetNetPtr(const std::shared_ptr<UDPSocket> &net_ptr, const std::string &target_ip,
                     const unsigned short port) {
   port_ = port;

infinite_sense_core/src/ser.cpp infinite_sense_core/src/usb.cppinfinite_sense_core/src/ser.cpp renamed to infinite_sense_core/src/usb.cpp

@@ -1,10 +1,10 @@
 
-#include "ser.h"
+#include "usb.h"
 #include "infinite_sense.h"
 #include "ptp.h"
 #include "sensor.h"
 namespace infinite_sense {
-SerialManager::SerialManager(const std::string &port, const int baud_rate) {
+UsbManager::UsbManager(const std::string &port, const int baud_rate) {
   port_ = port;
   serial_ptr_ = std::make_unique<serial::Serial>();
   try {
@@ -25,10 +25,10 @@ SerialManager::SerialManager(const std::string &port, const int baud_rate) {
     LOG(ERROR) << "Serial port: " << serial_ptr_->getPort() << " initialized and opened.";
   }
   ptp_ = std::make_unique<Ptp>();
-  ptp_->SetSerialPtr(serial_ptr_);
+  ptp_->SetUsbPtr(serial_ptr_);
 }
 
-SerialManager::~SerialManager() {
+UsbManager::~UsbManager() {
   if (serial_ptr_->isOpen()) {
     serial_ptr_->close();
     LOG(ERROR) << "Serial port: " << serial_ptr_->getPort() << " closed.";
@@ -37,14 +37,14 @@ SerialManager::~SerialManager() {
   tx_thread_.join();
 }
 
-void SerialManager::Start() {
+void UsbManager::Start() {
   started_ = true;
   rx_thread_ = std::thread([this] { Receive(); });
   tx_thread_ = std::thread([this] { TimeStampSynchronization(); });
   LOG(INFO) << "Serial manager started";
 }
 
-void SerialManager::Stop() {
+void UsbManager::Stop() {
   started_ = false;
   if (serial_ptr_->isOpen()) {
     serial_ptr_->close();
@@ -54,7 +54,7 @@ void SerialManager::Stop() {
   tx_thread_.join();
   LOG(INFO) << "Serial manager stopped";
 }
-void SerialManager::Receive() const {
+void UsbManager::Receive() const {
   while (started_) {
     if (serial_ptr_->available()) {
       std::string serial_recv = serial_ptr_->readline();
@@ -81,7 +81,7 @@ void SerialManager::Receive() const {
     std::this_thread::sleep_for(std::chrono::microseconds{10});
   }
 }
-void SerialManager::TimeStampSynchronization() const {
+void UsbManager::TimeStampSynchronization() const {
   while (started_) {
     ptp_->SendPtpData();
   }