summaryrefslogtreecommitdiff
path: root/device.cc
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-09-20 12:54:01 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2017-09-20 12:54:01 +0200
commit7a04ee7dd3fad10e30581d22956234aeff2b2f3a (patch)
tree99770ff5bebd0816fd74e830e4308276b960dc9f /device.cc
parent8f7435e4553916e6cc431e4b5316cc5861fd9063 (diff)
parenta83419fe4a13bc77005d455dd89685b8c1443d96 (diff)
downloadlibnitrokey-7a04ee7dd3fad10e30581d22956234aeff2b2f3a.tar.gz
libnitrokey-7a04ee7dd3fad10e30581d22956234aeff2b2f3a.tar.bz2
Merge branch 'osx-communication_issues' into OSX_merge_cleaned
Diffstat (limited to 'device.cc')
-rw-r--r--device.cc6
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();
}