From e9c165399bc87e9d283845efdd2d667061b1e323 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Fri, 5 Aug 2016 19:50:46 +0200
Subject: Autodetect inserted stick and connect to it

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
 NitrokeyManager.cc | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'NitrokeyManager.cc')

diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index ed9c7b4..79efc49 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -1,5 +1,6 @@
 #include <cassert>
 #include <cstring>
+#include <iostream>
 #include "include/NitrokeyManager.h"
 
 namespace nitrokey{
@@ -35,7 +36,24 @@ namespace nitrokey{
     NitrokeyManager::NitrokeyManager(): device(nullptr) {
         set_debug(true);
     }
-    NitrokeyManager::~NitrokeyManager() {delete _instance; delete device;}
+    NitrokeyManager::~NitrokeyManager() {
+        delete device;
+    }
+
+    bool NitrokeyManager::connect() {
+        device = nullptr;
+        vector<Device*> devices = { new Stick10(), new Stick20() };
+        for( auto d : devices ){
+            if (device != nullptr){
+                delete d;
+            }
+            if (device == nullptr && d->connect()){
+                device = d;
+            }
+        }
+        return device != nullptr;
+    }
+
 
     bool NitrokeyManager::connect(const char *device_model) {
         switch (device_model[0]){
-- 
cgit v1.2.1