fix 串口

ClangTools · Oct 13, 2023 · 50d22a6 · 50d22a6
1 parent cde8d06
commit 50d22a6
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 8 deletions.
diff --git a/.clwb/.blaze/modules/.project-data-dir.iml b/.clwb/.blaze/modules/.project-data-dir.iml
@@ -2,8 +2,8 @@
 <module external.system.id="Blaze" type="BLAZE_CPP_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$/../..">
-      <excludeFolder url="file://$MODULE_DIR$/../../.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.." />
+      <excludeFolder url="file://$MODULE_DIR$/../../.idea" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/.clwb/.blaze/modules/.workspace.iml b/.clwb/.blaze/modules/.workspace.iml
@@ -3,12 +3,58 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$/../../..">
       <sourceFolder url="file://$MODULE_DIR$/../../.." isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/../.." />
+      <excludeFolder url="file://$MODULE_DIR$/../../CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../CMakeFiles" />
       <excludeFolder url="file://$MODULE_DIR$/../../../bazel-bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../bazel-clangTools" />
       <excludeFolder url="file://$MODULE_DIR$/../../../bazel-genfiles" />
       <excludeFolder url="file://$MODULE_DIR$/../../../bazel-out" />
       <excludeFolder url="file://$MODULE_DIR$/../../../bazel-testlogs" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../bazel-clangTools" />
-      <excludeFolder url="file://$MODULE_DIR$/../.." />
+      <excludeFolder url="file://$MODULE_DIR$/../../../cmake-build-debug" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/core-net/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/core/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/event-libs/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/event-libs/poll/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/misc/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/plat/unix/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/h1/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/h2/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/http/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/raw-file/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/raw-skt/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/ws/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/system/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/system/metrics/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/system/smd/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lwsws/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/plugins/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../cmake-build-debug" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/core-net/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/core/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/event-libs/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/event-libs/poll/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/misc/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/plat/unix/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/h1/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/h2/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/http/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/raw-file/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/raw-skt/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/roles/ws/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/system/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/system/metrics/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lib/system/smd/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/lwsws/CMakeFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../src/libwebsokcets/plugins/CMakeFiles" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/src/serialport/serialportUnix.cpp b/src/serialport/serialportUnix.cpp
@@ -72,7 +72,7 @@ serialport *serialportUnix::set_baud_rate(serialport::BaudRate baud_rate) {
     }
     struct termios new_tio{};
     cfmakeraw(&new_tio);
-    tcsetattr(hCom, TCSAFLUSH, &new_tio);
+    tcgetattr(hCom, &new_tio);
     unsigned long _baud_rate = B0;
     switch (baud_rate) {
         case BaudRate::BR50:
@@ -181,7 +181,7 @@ serialport *serialportUnix::set_data_bits(serialport::DataBits data_bits) {
     }
     struct termios new_tio{};
     cfmakeraw(&new_tio);
-    tcsetattr(hCom, TCSAFLUSH, &new_tio);
+    tcgetattr(hCom, &new_tio);
 
 
     int _data_bits[] = {0x00, 0x00, 0x00, 0x00, CS5, CS6, CS7, CS8};
@@ -201,7 +201,7 @@ serialport *serialportUnix::set_stop_bits(serialport::StopBits stop_bits) {
     }
     struct termios new_tio{};
     cfmakeraw(&new_tio);
-    tcsetattr(hCom, TCSAFLUSH, &new_tio);
+    tcgetattr(hCom, &new_tio);
 
     // stop bits
     if (stop_bits == StopBits2) {
@@ -223,7 +223,7 @@ serialport *serialportUnix::set_parity(serialport::Parity parity) {
     }
     struct termios new_tio{};
     cfmakeraw(&new_tio);
-    tcsetattr(hCom, TCSAFLUSH, &new_tio);
+    tcgetattr(hCom, &new_tio);
 
     // parity
     if (parity == ParityNone) {
@@ -256,7 +256,7 @@ serialport *serialportUnix::set_XON_OFF_ANY(int xon, int xoff, int xany) {
     }
     struct termios new_tio{};
     cfmakeraw(&new_tio);
-    tcsetattr(hCom, TCSAFLUSH, &new_tio);
+    tcgetattr(hCom, &new_tio);
 
     new_tio.c_iflag |= (xon ? IXON : 0)
                        | (xoff ? IXOFF : 0)