Added Tactile fluids, fixed tactile buttons

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

diff --git a/KeyboardDebug/KeyboardDebug.suo b/KeyboardDebug/KeyboardDebug.suo
index def15fb4b5c36f10181011c7ef658701a20e3377..eb217661610e25af9963010aab2f2b01d271844f 100644 (file)
Binary files a/KeyboardDebug/KeyboardDebug.suo and b/KeyboardDebug/KeyboardDebug.suo differ

diff --git a/KeyboardDebug/KeyboardDebug/KeyboardDebug.vcxproj b/KeyboardDebug/KeyboardDebug/KeyboardDebug.vcxproj
index 65ac718003f0a2be27acc6595311b050b5b23efe..bece0ecdd4f50e8bc4fd2598795a8bd1ad68215e 100644 (file)
--- a/KeyboardDebug/KeyboardDebug/KeyboardDebug.vcxproj
+++ b/KeyboardDebug/KeyboardDebug/KeyboardDebug.vcxproj
@@ -44,7 +44,7 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <Optimization>Disabled</Optimization>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -61,7 +61,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <DebugInformationFormat>\r
       </DebugInformationFormat>\r
@@ -97,11 +97,11 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB  "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "keyboarddebug.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL  "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB  "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "keyboarddebug.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL  "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
     </CustomBuild>\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -138,7 +138,7 @@
   </ImportGroup>\r
   <ProjectExtensions>\r
     <VisualStudio>\r
-      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" QtVersion_x0020_Win32="4.7.3" />\r
+      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" QtVersion_x0020_Win32="$(DefaultQtVersion)" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
 </Project>
\ No newline at end of file

diff --git a/KeyboardDebug/KeyboardDebug/keyboarddebug.cpp b/KeyboardDebug/KeyboardDebug/keyboarddebug.cpp
index 0da23cbc6a1fc37c5423b82e47f3036f390e23f9..ca33cd62786f8af7c25c5fd9e93173f1125ad105 100644 (file)
--- a/KeyboardDebug/KeyboardDebug/keyboarddebug.cpp
+++ b/KeyboardDebug/KeyboardDebug/keyboarddebug.cpp
@@ -9,7 +9,7 @@ KeyboardDebug::KeyboardDebug(QWidget *parent, Qt::WFlags flags)
        try\r
        {\r
 #ifdef WIN32\r
-        _keyboardController = new DynamicKeyboardController("COM5", 115200);\r
+        _keyboardController = new DynamicKeyboardController("COM10", 115200);\r
 #elif defined __MACOSX__\r
         _keyboardController = new DynamicKeyboardController("/dev/tty.usbmodemfd121", 115200);\r
 #endif\r
@@ -64,7 +64,7 @@ void KeyboardDebug::setConfiguration()
                | UINT16(isChecked(ui.s7)) << 9\r
                | UINT16(isChecked(ui.s8)) << 8;\r
 \r
-       qDebug() << hex << config << endl;\r
+       qDebug() << "Setting configuration" << hex << config << endl;\r
        _keyboardController->setConfiguration(config);\r
 }\r
 \r

diff --git a/KeyboardDebug/KeyboardDebug/keyboarddebug.h b/KeyboardDebug/KeyboardDebug/keyboarddebug.h
index 82b83fda8020256eda2ebbfe88f97c737bb0bead..bd5d07b157595bc24172bbb99ca412b7b06e5623 100644 (file)
--- a/KeyboardDebug/KeyboardDebug/keyboarddebug.h
+++ b/KeyboardDebug/KeyboardDebug/keyboarddebug.h
@@ -4,7 +4,7 @@
 #include <QtGui/QMainWindow>\r
 #include "ui_keyboarddebug.h"\r
 \r
-#include <DynamicKeyboardLibrary/DynamicKeyboardController.h>\r
+#include <DynamicKeyboard/DynamicKeyboardController.h>\r
 \r
 class KeyboardDebug : public QMainWindow\r
 {\r