Merge branch 'OSX_merge_cleaned'

This merge:
- fixes issues with invalid mutex
- moves tests to Python 3
- allows to compile the code natively under Visual Studio with CMake
- allows to compile under QtCreator under MS Windows
- fixes some issues with test suite
- allows to run tests under Windows
- allows to compile using QMake (and easy adding to Qt projects)
- decreases delays between sending commands thus increasing 2x
communication speed

1 files changed, 3 insertions, 3 deletions

diff --git a/device.cc b/device.cc
index 5f1c9a0..2fc55c7 100644
--- a/device.cc
+++ b/device.cc
@@ -27,7 +27,7 @@ Device::Device(const uint16_t vid, const uint16_t pid, const DeviceModel model,
       m_vid(vid),
       m_pid(pid),
       m_model(model),
-      m_retry_sending_count(3),
+      m_retry_sending_count(1),
       m_retry_receiving_count(retry_receiving_count),
       m_retry_timeout(retry_timeout),
       m_send_receive_delay(send_receive_delay),
@@ -93,7 +93,7 @@ int Device::send(const void *packet) {
         mp_devhandle, (const unsigned char *)(packet), HID_REPORT_SIZE);
     if (send_feature_report < 0) _reconnect();
     //add thread sleep?
-    LOG(std::string("Sending attempt: ")+std::to_string(i) + " / 3" , Loglevel::DEBUG_L2);
+    LOG(std::string("Sending attempt: ")+std::to_string(i+1) + " / 3" , Loglevel::DEBUG_L2);
   }
   return send_feature_report;
 }
@@ -200,7 +200,7 @@ Stick10::Stick10():
 
 
 Stick20::Stick20():
-  Device(0x20a0, 0x4109, DeviceModel::STORAGE, 20ms, 20, 20ms)
+  Device(0x20a0, 0x4109, DeviceModel::STORAGE, 20ms, 10, 20ms)
   {
     setDefaultDelay();
   }