From 7af34d80957f3f0746b53fbfbead42104666056a Mon Sep 17 00:00:00 2001 From: Thomas Pietrzak Date: Thu, 15 Mar 2012 08:30:05 +0000 Subject: [PATCH] test git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@63 47cf9a05-e0a8-4ed5-9e9b-101a649bc004 --- WidgetKeyboard/WidgetKeyboard.pro | 2 ++ WidgetKeyboard/example/DynaKeyboardHaptic.cpp | 26 ++++++++++++++++--- WidgetKeyboard/example/DynaKeyboardHaptic.h | 3 +++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/WidgetKeyboard/WidgetKeyboard.pro b/WidgetKeyboard/WidgetKeyboard.pro index 09702bd..bf2b266 100644 --- a/WidgetKeyboard/WidgetKeyboard.pro +++ b/WidgetKeyboard/WidgetKeyboard.pro @@ -3,3 +3,5 @@ CONFIG += ordered include(common.pri) WidgetKeyboard-uselib:SUBDIRS=buildlib SUBDIRS+=example +INCLUDEPATH = ../../ ../../DynamicKeyboardLib/DynamicKeyboardLibrary/ +LIBS += libDynamicKeyboardLibrary.dylib diff --git a/WidgetKeyboard/example/DynaKeyboardHaptic.cpp b/WidgetKeyboard/example/DynaKeyboardHaptic.cpp index 195c7d0..23d8d51 100644 --- 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 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 4e4ffd9..ecb8f1a 100644 --- a/WidgetKeyboard/example/DynaKeyboardHaptic.h +++ b/WidgetKeyboard/example/DynaKeyboardHaptic.h @@ -4,6 +4,8 @@ #include #include +#include + class DynaKeyboard; class DynaKeyboardHaptic @@ -15,6 +17,7 @@ public: DynaKeyboard *dynaKeyboard; + DynamicKeyboardController *_dynamicKeyboardController; }; #endif // DYNAKEYBOARDHAPTIC_H -- 2.30.2