From 8b3815b909bbcb2b9cd240386c8503e831b223cf Mon Sep 17 00:00:00 2001 From: Andrey Vukolov Date: Mon, 29 Mar 2021 11:56:21 +0200 Subject: [PATCH 1/2] Type/value fix --- rplidar-binary-logic-fix.patch | 26 ++++++++++++++++++++++++++ sdk/sdk/src/arch/linux/net_socket.cpp | 2 +- sdk/sdk/src/hal/event.h | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 rplidar-binary-logic-fix.patch diff --git a/rplidar-binary-logic-fix.patch b/rplidar-binary-logic-fix.patch new file mode 100644 index 0000000..cf5bf4a --- /dev/null +++ b/rplidar-binary-logic-fix.patch @@ -0,0 +1,26 @@ +diff --git a/sdk/sdk/src/arch/linux/net_socket.cpp b/rplidar/sdk/src/arch/linux/net_socket.cpp +index 0124a13..f188b4c 100644 +--- a/sdk/sdk/src/arch/linux/net_socket.cpp ++++ b/sdk/sdk/src/arch/linux/net_socket.cpp +@@ -167,7 +167,7 @@ u_result SocketAddress::getAddressAsString(char * buffer, size_t buffersize) con + + break; + } +- return ans<=0?RESULT_OPERATION_FAIL:RESULT_OK; ++ return (reinterpret_cast(ans)) <= 0 ? RESULT_OPERATION_FAIL:RESULT_OK; + } + + +diff --git a/sdk/sdk/src/hal/event.h b/rplidar/sdk/src/hal/event.h +index 5e05234..0ab2ef7 100644 +--- a/sdk/sdk/src/hal/event.h ++++ b/sdk/sdk/src/hal/event.h +@@ -42,7 +42,7 @@ public: + enum + { + EVENT_OK = 1, +- EVENT_TIMEOUT = -1, ++ EVENT_TIMEOUT = 0xFF, + EVENT_FAILED = 0, + }; + diff --git a/sdk/sdk/src/arch/linux/net_socket.cpp b/sdk/sdk/src/arch/linux/net_socket.cpp index 0124a13..f188b4c 100644 --- a/sdk/sdk/src/arch/linux/net_socket.cpp +++ b/sdk/sdk/src/arch/linux/net_socket.cpp @@ -167,7 +167,7 @@ u_result SocketAddress::getAddressAsString(char * buffer, size_t buffersize) con break; } - return ans<=0?RESULT_OPERATION_FAIL:RESULT_OK; + return (reinterpret_cast(ans)) <= 0 ? RESULT_OPERATION_FAIL:RESULT_OK; } diff --git a/sdk/sdk/src/hal/event.h b/sdk/sdk/src/hal/event.h index 5e05234..0ab2ef7 100644 --- a/sdk/sdk/src/hal/event.h +++ b/sdk/sdk/src/hal/event.h @@ -42,7 +42,7 @@ class Event enum { EVENT_OK = 1, - EVENT_TIMEOUT = -1, + EVENT_TIMEOUT = 0xFF, EVENT_FAILED = 0, }; From 4447f8709219a981f2210fa37885c2c0447b664e Mon Sep 17 00:00:00 2001 From: Andrey Vukolov Date: Mon, 29 Mar 2021 11:56:49 +0200 Subject: [PATCH 2/2] Redundant file removal --- rplidar-binary-logic-fix.patch | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 rplidar-binary-logic-fix.patch diff --git a/rplidar-binary-logic-fix.patch b/rplidar-binary-logic-fix.patch deleted file mode 100644 index cf5bf4a..0000000 --- a/rplidar-binary-logic-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/sdk/sdk/src/arch/linux/net_socket.cpp b/rplidar/sdk/src/arch/linux/net_socket.cpp -index 0124a13..f188b4c 100644 ---- a/sdk/sdk/src/arch/linux/net_socket.cpp -+++ b/sdk/sdk/src/arch/linux/net_socket.cpp -@@ -167,7 +167,7 @@ u_result SocketAddress::getAddressAsString(char * buffer, size_t buffersize) con - - break; - } -- return ans<=0?RESULT_OPERATION_FAIL:RESULT_OK; -+ return (reinterpret_cast(ans)) <= 0 ? RESULT_OPERATION_FAIL:RESULT_OK; - } - - -diff --git a/sdk/sdk/src/hal/event.h b/rplidar/sdk/src/hal/event.h -index 5e05234..0ab2ef7 100644 ---- a/sdk/sdk/src/hal/event.h -+++ b/sdk/sdk/src/hal/event.h -@@ -42,7 +42,7 @@ public: - enum - { - EVENT_OK = 1, -- EVENT_TIMEOUT = -1, -+ EVENT_TIMEOUT = 0xFF, - EVENT_FAILED = 0, - }; -