test

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@63 47cf9a05-e0a8-4ed5-9e9b-101a649bc004

diff --git a/WidgetKeyboard/WidgetKeyboard.pro b/WidgetKeyboard/WidgetKeyboard.pro
index 09702bd8a426cc75f30160358ccc236adb0f26fd..bf2b266955e9330c80d8a4d45fbba1b3632af064 100644 (file)
--- a/WidgetKeyboard/WidgetKeyboard.pro
+++ b/WidgetKeyboard/WidgetKeyboard.pro
@@ -3,3 +3,5 @@ CONFIG += ordered
 include(common.pri)\r
 WidgetKeyboard-uselib:SUBDIRS=buildlib\r
 SUBDIRS+=example\r
+INCLUDEPATH = ../../ ../../DynamicKeyboardLib/DynamicKeyboardLibrary/\r
+LIBS += libDynamicKeyboardLibrary.dylib\r

diff --git a/WidgetKeyboard/example/DynaKeyboardHaptic.cpp b/WidgetKeyboard/example/DynaKeyboardHaptic.cpp
index 195c7d07be2ba045c74f17cf99538df9d1cd42bc..23d8d51c1775c45a29c2931fe1fb6c3a81ccefca 100644 (file)
--- a/WidgetKeyboard/example/DynaKeyboardHaptic.cpp
+++ b/WidgetKeyboard/example/DynaKeyboardHaptic.cpp
@@ -2,13 +2,33 @@
 #include "DynaKeyboard.h"
 
 
-DynaKeyboardHaptic::DynaKeyboardHaptic(DynaKeyboard *dyna){
-    dynaKeyboard = dyna;
+DynaKeyboardHaptic::DynaKeyboardHaptic(DynaKeyboard *dyna)
+:dynaKeyboard(dyna)
+{
+    try
+    {
+        _dynamicKeyboardController = new DynamicKeyboardController("/dev/tty...");
+    }
+    catch (...)
+    {
+        _dynamicKeyboardController = NULL;
+    }
 }
 
+//you have more keys than solenoids here.
+// ?
 void DynaKeyboardHaptic::raiseKeys(QVector<QString> keys)
 {
-    //you have more keys than solenoids here.
+    if (!_dynamicKeyboardController)
+        return;
+
+    UINT16 config = 0;
+    for (int i = 0 ; i < keys.size() ; i++)
+    {
+        //search for solenoid code of keys.at(i)
+        //if any, | config
+    }
+    _dynamicKeyboardController->raiseKeys(config);
 }
 
 void DynaKeyboardHaptic::initSolenoidKeyMapping()

diff --git a/WidgetKeyboard/example/DynaKeyboardHaptic.h b/WidgetKeyboard/example/DynaKeyboardHaptic.h
index 4e4ffd9f5208a698d0a0273ccbf255f24ff57a10..ecb8f1ac38b8f08b94c797535fd5854392d1b3f3 100644 (file)
--- a/WidgetKeyboard/example/DynaKeyboardHaptic.h
+++ b/WidgetKeyboard/example/DynaKeyboardHaptic.h
@@ -4,6 +4,8 @@
 #include <QVector>
 #include <QString>
 
+#include <DynamicKeyboardLibrary/DynamicKeyboardController.h>
+
 class DynaKeyboard;
 
 class DynaKeyboardHaptic
@@ -15,6 +17,7 @@ public:
 
     DynaKeyboard *dynaKeyboard;
 
+    DynamicKeyboardController *_dynamicKeyboardController;
 };
 
 #endif // DYNAKEYBOARDHAPTIC_H