fix error when com greater than nine

packages/rhsplib/RHSPlib/arch/includes/RHSPlib_serial.h

@@ -113,6 +113,12 @@ int RHSPlib_serial_write(RHSPlib_Serial_T *serial, const uint8_t *buffer, size_t
  * */
 void RHSPlib_serial_close(RHSPlib_Serial_T *serial);
 
+/**
+ * @brief Get the last error code from the OS.
+ * This is errno on unix, and GetLastError on windows.
+ * */
+int RHSPlib_getLastOsError(void);
+
 #ifdef __cplusplus
 }
 #endif

packages/rhsplib/RHSPlib/arch/linux/RHSPlib_serial.c

@@ -10,6 +10,7 @@
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
+#include <errno.h>
 
 //#include "RHSPlib_compiler.h"
 #include "RHSPlib_serial.h"
@@ -330,4 +331,6 @@ static int baudrateToBits(uint32_t baudrate) {
     }
 }
 
-
+int RHSPlib_getLastOsError(void) {
+    return (int) GetLastError();
+}

packages/rhsplib/RHSPlib/arch/mac/RHSPlib_serial.c

@@ -10,6 +10,7 @@
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
+#include <errno.h>
 
 //#include "RHSPlib_compiler.h"
 #include "RHSPlib_serial.h"
@@ -232,3 +233,6 @@ void RHSPlib_serial_close(RHSPlib_Serial_T *serial)
     serial->fd = -1;
 }
 
+int RHSPlib_getLastOsError(void) {
+    return errno;
+}

packages/rhsplib/RHSPlib/arch/win/RHSPlib_serial.c

@@ -107,9 +107,12 @@ int RHSPlib_serial_open(RHSPlib_Serial_T* serial, const char* serialPortName,
     {
         return RHSPLIB_SERIAL_ERROR;
     }
+
+    char modifiedSerialPortName[20];
+    snprintf(modifiedSerialPortName, 20, "\\\\.\\%s", serialPortName);
 
     /* Try to open specified COM-port */
-    serial->handle = CreateFile(serialPortName,
+    serial->handle = CreateFile(modifiedSerialPortName,
                                 GENERIC_READ | GENERIC_WRITE,
                                 0,      //  must be opened with exclusive-access
                                 NULL,   //  default security attributes
@@ -240,3 +243,7 @@ void RHSPlib_serial_close(RHSPlib_Serial_T* serial)
         }
     }
 }
+
+int RHSPlib_getLastOsError(void) {
+    return (int) GetLastError();
+}

packages/rhsplib/src/RHSPlibWorker.h

@@ -21,7 +21,7 @@
  */
 #define CREATE_WORKER(NAME, ENV, RETURN, FUNCTION_BODY) \
     auto NAME = new RHSPlibWorker<RETURN>(ENV, [=         \
-    ](int &_code, RETURN &_data, uint8_t &_nackCode) mutable FUNCTION_BODY)
+    ](int &_code, RETURN &_data, uint8_t &_nackCode, int &_osErrorCode) mutable FUNCTION_BODY)
 
 /**
  * @brief Create a worker whose work function does not return a value (void).
@@ -33,7 +33,7 @@
  */
 #define CREATE_VOID_WORKER(NAME, ENV, FUNCTION_BODY) \
     auto NAME = new RHSPlibWorker<void>(               \
-        ENV, [=](int &_code, uint8_t &_nackCode) mutable FUNCTION_BODY)
+        ENV, [=](int &_code, uint8_t &_nackCode, int &_osErrorCode) mutable FUNCTION_BODY)
 
 /**
  * @brief Set the callback function for a worker.
@@ -118,7 +118,7 @@ class RHSPlibWorker : public Napi::AsyncWorker, public RHSPlibWorkerBase {
      */
     void Execute() override {
         std::scoped_lock<std::mutex> lock{m_mutex};
-        workFunction(resultCode, returnData, nackCode);
+        workFunction(resultCode, returnData, nackCode, osErrorCode);
     }
 
     /**
@@ -147,12 +147,13 @@ class RHSPlibWorker : public Napi::AsyncWorker, public RHSPlibWorkerBase {
     void OnError(const Napi::Error &e) override { deferred.Reject(e.Value()); }
 
   private:
-    std::function<void(int &, TReturn &, uint8_t &)> workFunction;
+    std::function<void(int &, TReturn &, uint8_t &, int &)> workFunction;
     std::function<Napi::Value(Napi::Env, int &, TReturn &)> callbackFunction;
     Napi::Promise::Deferred deferred;
     TReturn returnData;
     int resultCode;
     uint8_t nackCode;
+    int osErrorCode;
 };
 
 /**
@@ -194,7 +195,7 @@ class RHSPlibWorker<void> : public Napi::AsyncWorker, public RHSPlibWorkerBase {
      */
     void Execute() override {
         std::scoped_lock<std::mutex> lock{m_mutex};
-        workFunction(resultCode, nackCode);
+        workFunction(resultCode, nackCode, osErrorCode);
     }
 
     /**
@@ -210,6 +211,9 @@ class RHSPlibWorker<void> : public Napi::AsyncWorker, public RHSPlibWorkerBase {
             if (resultCode == RHSPLIB_ERROR_NACK_RECEIVED) {
                 errorObj.Set("nackCode", nackCode);
             }
+            if(resultCode != 0) {
+                errorObj.Set("osErrorCode", osErrorCode);
+            }
             deferred.Reject(errorObj);
         }
     }
@@ -222,10 +226,11 @@ class RHSPlibWorker<void> : public Napi::AsyncWorker, public RHSPlibWorkerBase {
     void OnError(const Napi::Error &e) override { deferred.Reject(e.Value()); }
 
   private:
-    std::function<void(int &, uint8_t &)> workFunction;
+    std::function<void(int &, uint8_t &, int&)> workFunction;
     Napi::Promise::Deferred deferred;
     int resultCode;
     uint8_t nackCode;
+    int osErrorCode;
 };
 
 #endif

packages/rhsplib/src/serialWrapper.cc

@@ -49,6 +49,10 @@ Napi::Value Serial::open(const Napi::CallbackInfo &info) {
         const char *serialPortName = serialPortNameStr.c_str();
         _code = RHSPlib_serial_open(&this->serialPort, serialPortName, baudrate,
                                     databits, parity, stopbits, flowControl);
+
+        if(_code != 0) {
+            _osErrorCode = RHSPlib_getLastOsError();
+        }
     });
 
     QUEUE_WORKER(worker);