Merge branch 'master' into enstabre

lebarsfa · Mar 14, 2023 · cbccda2 · cbccda2
2 parents 486b909 + bdb783f
commit cbccda2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/custom_baudrate/main.cpp b/app/custom_baudrate/main.cpp
@@ -66,7 +66,7 @@ void print_usage(int argc, const char* argv[])
         " %s <com port> [baudrate]\n"
         " The baudrate can be ANY possible values between 115200 to 512000.\n"
 
-        , "SL_LIDAR_SDK_VERSION", argv[0], argv[0]);
+        , "SL_LIDAR_SDK_VERSION", argv[0]);
 }
 
 

diff --git a/app/simple_grabber/main.cpp b/app/simple_grabber/main.cpp
@@ -206,7 +206,7 @@ int main(int argc, const char * argv[]) {
 						, opt_channel_param_first);
 					break;
 				case CHANNEL_TYPE_UDP:
-					fprintf(stderr, "Error, cannot connect to the ip addr  %s with the udp port %s.\n"
+					fprintf(stderr, "Error, cannot connect to the ip addr  %s with the udp port %u.\n"
 						, opt_channel_param_first, opt_channel_param_second);
 					break;
 			}

diff --git a/sdk/src/sl_tcp_channel.cpp b/sdk/src/sl_tcp_channel.cpp
@@ -54,7 +54,7 @@ namespace sl {
 
         bool open()
         {
-            if(SL_IS_FAIL(bind(_ip, _port)))
+            if(bind(_ip, _port))
                 return false;
             return IS_OK(_binded_socket->connect(_socket));
 

diff --git a/sdk/src/sl_udp_channel.cpp b/sdk/src/sl_udp_channel.cpp
@@ -53,7 +53,7 @@ namespace sl {
 
         bool open()
         {
-            if(SL_IS_FAIL(bind(_ip, _port)))
+            if(bind(_ip, _port))
                 return false;
             return SL_IS_OK(_binded_socket->setPairAddress(&_socket));         
         }