Add press & release options, disable wristband/touchscreen if not connected.

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

diff --git a/TouchscreenButton/TouchscreenButton.cpp b/TouchscreenButton/TouchscreenButton.cpp
index 5471467aedf7050c38a78e2f69a7be80ee9e2d07..165dc0d0b28db346c23fad7166b21bed2f92a86a 100644 (file)
--- a/TouchscreenButton/TouchscreenButton.cpp
+++ b/TouchscreenButton/TouchscreenButton.cpp
@@ -1,24 +1,49 @@
 #include "TouchscreenButton.h"\r
 \r
 #include <QDebug>\r
 #include "TouchscreenButton.h"\r
 \r
 #include <QDebug>\r

+#include <TactonPlayer\Tacton.hpp>\r
+\r

 \r
 TouchscreenButton::TouchscreenButton(QWidget *parent, Qt::WFlags flags)\r
 : QMainWindow(parent, flags)\r
 {\r
        setupUi(this);\r
 \r
 TouchscreenButton::TouchscreenButton(QWidget *parent, Qt::WFlags flags)\r
 : QMainWindow(parent, flags)\r
 {\r
        setupUi(this);\r

-\r
+       \r

        try\r
        {\r
                _touchscreen = new USBHIDImmersionTouchscreen();\r
        try\r
        {\r
                _touchscreen = new USBHIDImmersionTouchscreen();\r

-               _wristband = new TactonPlayer("COM11");\r

        }\r
        catch(...)\r
        {\r
        }\r
        catch(...)\r
        {\r

-               qDebug() << "Cannot find the touchscreen or the wristband";\r
+               qDebug() << "Cannot find the touchscreen";\r
+               _touchscreenoption->setChecked(false);\r
+               _touchscreenoption->setDisabled(true);\r
+               _touchscreen = NULL;\r
+       }\r
+\r
+       try\r
+       {\r
+               _wristband = new Wristband();\r
+       }\r
+       catch(...)\r
+       {\r
+               qDebug() << "Cannot find the wristband";\r
+               _wristbandoption->setChecked(false);\r
+               _wristbandoption->setDisabled(true);\r
+               _wristband = NULL;\r

        }\r
 \r
        }\r
 \r

+       _play->setAttribute( Qt::WA_AcceptTouchEvents);\r
+\r

        connect(_play, SIGNAL(pressed()), this, SLOT(play()));\r
        connect(_play, SIGNAL(pressed()), this, SLOT(play()));\r

+       connect(_play, SIGNAL(released()), this, SLOT(play()));\r

        connect(_stop, SIGNAL(pressed()), this, SLOT(stop()));\r
        connect(_stop, SIGNAL(pressed()), this, SLOT(stop()));\r

+\r
+       connect(_pressoption, SIGNAL(stateChanged (int)), this, SLOT(pressFeedback(int)));\r
+       connect(_releaseoption, SIGNAL(stateChanged (int)), this, SLOT(releaseFeedback(int)));\r
+       \r
+//     connect(_wristbandoption, SIGNAL(stateChanged(int)), this, SLOT(setWristbandState(int)));\r
+//     connect(_touchscreenoption, SIGNAL(stateChanged(int)), this, SLOT(setTouchscreenState(int)));\r

 }\r
 \r
 TouchscreenButton::~TouchscreenButton()\r
 }\r
 \r
 TouchscreenButton::~TouchscreenButton()\r


@@ -30,10 +55,29 @@ TouchscreenButton::~TouchscreenButton()
 \r
 void TouchscreenButton::play()\r
 {\r
 \r
 void TouchscreenButton::play()\r
 {\r

-       _touchscreen->playEffect((unsigned char)(_effect->value()), (unsigned char)(_repeats->value()));\r
+       if (_touchscreenoption->checkState() == Qt::Checked)\r
+               _touchscreen->playEffect((unsigned char)(_effect->value()), (unsigned char)(_repeats->value()));\r
+       if (_wristbandoption->checkState() == Qt::Checked)\r
+               _wristband->playEffect((unsigned char)(_effect->value()), (unsigned char)(_repeats->value()));\r

 }\r
 \r
 void TouchscreenButton::stop()\r
 {\r
        _touchscreen->playEffect(0, 1);\r
 }\r
 }\r
 \r
 void TouchscreenButton::stop()\r
 {\r
        _touchscreen->playEffect(0, 1);\r
 }\r

+\r
+void TouchscreenButton::pressFeedback(int state)\r
+{\r
+       if (state == Qt::Checked)\r
+               connect(_play, SIGNAL(pressed()), this, SLOT(play()));\r
+       else\r
+               disconnect(_play, SIGNAL(pressed()), this, SLOT(play()));\r
+}\r
+\r
+void TouchscreenButton::releaseFeedback(int state)\r
+{\r
+       if (state == Qt::Checked)\r
+               connect(_play, SIGNAL(released()), this, SLOT(play()));\r
+       else\r
+               disconnect(_play, SIGNAL(released()), this, SLOT(play()));\r
+}\r

diff --git a/TouchscreenButton/TouchscreenButton.h b/TouchscreenButton/TouchscreenButton.h
index 79fec7dfddf99ecf874f741aa3e96ba61850be62..99f8fc6a6edb08b1714e15591a92ae438eee5e25 100644 (file)
--- a/TouchscreenButton/TouchscreenButton.h
+++ b/TouchscreenButton/TouchscreenButton.h
@@ -6,6 +6,7 @@
 \r
 #include <ArduinoSerial\SerialWindows.hpp>\r
 #include "USBHIDImmersionTouchscreen.h"\r
 \r
 #include <ArduinoSerial\SerialWindows.hpp>\r
 #include "USBHIDImmersionTouchscreen.h"\r

+#include "Wristband.h"\r

 \r
 class TouchscreenButton : public QMainWindow, public Ui::TouchscreenButtonClass\r
 {\r
 \r
 class TouchscreenButton : public QMainWindow, public Ui::TouchscreenButtonClass\r
 {\r


@@ -18,10 +19,12 @@ class TouchscreenButton : public QMainWindow, public Ui::TouchscreenButtonClass
        public slots:\r
                void play();\r
                void stop();\r
        public slots:\r
                void play();\r
                void stop();\r

+               void pressFeedback(int);\r
+               void releaseFeedback(int);\r

 \r
        private:\r
                USBHIDImmersionTouchscreen *_touchscreen;\r
 \r
        private:\r
                USBHIDImmersionTouchscreen *_touchscreen;\r

-               TactonPlayer *_wristband;\r
+               Wristband *_wristband;\r

 };\r
 \r
 #endif // TOUCHSCREENBUTTON_H\r
 };\r
 \r
 #endif // TOUCHSCREENBUTTON_H\r

diff --git a/TouchscreenButton/TouchscreenButton.vcxproj b/TouchscreenButton/TouchscreenButton.vcxproj
index 55d5fc0f024f05e6ace7f556431283d426e4ce55..20d2a82110cba18d5916d189762e0cf9b8f51136 100644 (file)
--- a/TouchscreenButton/TouchscreenButton.vcxproj
+++ b/TouchscreenButton/TouchscreenButton.vcxproj
@@ -56,7 +56,7 @@
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>\r
       <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>\r
       <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r

-      <AdditionalDependencies>hidapid.lib;qtmaind.lib;QtCored4.lib;QtGuid4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>tactonplayerd.lib;hidapid.lib;qtmaind.lib;QtCored4.lib;QtGuid4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r

     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r


@@ -73,7 +73,7 @@
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>\r
       <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>false</GenerateDebugInformation>\r
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>\r
       <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>false</GenerateDebugInformation>\r

-      <AdditionalDependencies>hidapi.lib;qtmain.lib;QtCore4.lib;QtGui4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>tactonplayer.lib;hidapi.lib;qtmain.lib;QtCore4.lib;QtGui4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r

     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r


@@ -92,6 +92,7 @@
     <ClCompile Include="main.cpp" />\r
     <ClCompile Include="TouchscreenButton.cpp" />\r
     <ClCompile Include="USBHIDImmersionTouchscreen.cpp" />\r
     <ClCompile Include="main.cpp" />\r
     <ClCompile Include="TouchscreenButton.cpp" />\r
     <ClCompile Include="USBHIDImmersionTouchscreen.cpp" />\r

+    <ClCompile Include="Wristband.cpp" />\r

   </ItemGroup>\r
   <ItemGroup>\r
     <CustomBuild Include="TouchscreenButton.h">\r
   </ItemGroup>\r
   <ItemGroup>\r
     <CustomBuild Include="TouchscreenButton.h">\r


@@ -120,6 +121,7 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="GeneratedFiles\ui_touchscreenbutton.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="GeneratedFiles\ui_touchscreenbutton.h" />\r

+    <ClInclude Include="Wristband.h" />\r

     <CustomBuild Include="USBHIDImmersionTouchscreen.h">\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <CustomBuild Include="USBHIDImmersionTouchscreen.h">\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r

diff --git a/TouchscreenButton/USBHIDImmersionTouchscreen.cpp b/TouchscreenButton/USBHIDImmersionTouchscreen.cpp
index 75d2aa4acccc533686292ddebf9337b1a4daa51b..56a8f0518938f35753e3f89c550cf9425f449a40 100644 (file)
--- a/TouchscreenButton/USBHIDImmersionTouchscreen.cpp
+++ b/TouchscreenButton/USBHIDImmersionTouchscreen.cpp
@@ -30,16 +30,14 @@ USBHIDImmersionTouchscreen::~USBHIDImmersionTouchscreen(void)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

-bool USBHIDImmersionTouchscreen::playEffect(unsigned char effect, unsigned char nbrepeat) const\r
+void USBHIDImmersionTouchscreen::playEffect(unsigned char effect, unsigned char nbrepeat) const\r

 {\r
        unsigned char buffer[35];\r
        buffer[0] = PLAYEFFECTREPREAT_BYTE;\r
        buffer[1] = effect;\r
        buffer[2] = nbrepeat;\r
        if (_devicehandle)\r
 {\r
        unsigned char buffer[35];\r
        buffer[0] = PLAYEFFECTREPREAT_BYTE;\r
        buffer[1] = effect;\r
        buffer[2] = nbrepeat;\r
        if (_devicehandle)\r

-               return hid_write(_devicehandle, buffer, 35);\r
-       else\r
-               return -1;\r
+               hid_write(_devicehandle, buffer, 35);\r

 }\r
 \r
 char * USBHIDImmersionTouchscreen::getStatus() const\r
 }\r
 \r
 char * USBHIDImmersionTouchscreen::getStatus() const\r

diff --git a/TouchscreenButton/USBHIDImmersionTouchscreen.h b/TouchscreenButton/USBHIDImmersionTouchscreen.h
index f40bb6a0fdbe55709398d02461ac0f2a0de595ec..da5caf1ed140c150cfef6ecba069b26c85e47fc4 100644 (file)
--- a/TouchscreenButton/USBHIDImmersionTouchscreen.h
+++ b/TouchscreenButton/USBHIDImmersionTouchscreen.h
@@ -13,7 +13,7 @@ class USBHIDImmersionTouchscreen
                        See documentation for list of effects (0-46), 255 for no effect\r
                        nbrepeats: 255 for infinite until other effect or no effect\r
                */\r
                        See documentation for list of effects (0-46), 255 for no effect\r
                        nbrepeats: 255 for infinite until other effect or no effect\r
                */\r

-               bool playEffect(unsigned char effect, unsigned char nbrepeat) const;\r
+               void playEffect(unsigned char effect, unsigned char nbrepeat) const;\r

                char *getStatus() const;\r
                //bool setNonVolatileEffects() const;\r
 \r
                char *getStatus() const;\r
                //bool setNonVolatileEffects() const;\r
 \r

diff --git a/TouchscreenButton/Wristband.cpp b/TouchscreenButton/Wristband.cpp
index 8e7af340a0dc374a19f5f0a53580b46edc780dd7..9dfebb68b2f45c1a771625057481b315702c6965 100644 (file)
--- a/TouchscreenButton/Wristband.cpp
+++ b/TouchscreenButton/Wristband.cpp
@@ -1,12 +1,13 @@
 #include "Wristband.h"\r
 \r
 #include <QDebug>\r
 #include "Wristband.h"\r
 \r
 #include <QDebug>\r

+#include <QThread>\r

 \r
 Wristband::Wristband()\r
 {\r
        try\r
        {\r
 \r
 Wristband::Wristband()\r
 {\r
        try\r
        {\r

-               _tactonplayer = new TactonPlayer("COM11");\r
+               _tactonplayer = new TactonPlayer("COM8");\r

        }\r
        catch(...)\r
        {\r
        }\r
        catch(...)\r
        {\r


@@ -14,6 +15,43 @@ Wristband::Wristband()
                _tactonplayer = NULL;\r
        }\r
 \r
                _tactonplayer = NULL;\r
        }\r
 \r

+       unsigned char desc[12];\r
+       //patterns\r
+       desc[0] = desc[6] = 0xff;\r
+       //duration\r
+       desc[1] = desc[7] = 0;\r
+       desc[2] = 10;\r
+       desc[8] = 90;\r
+       //frequency\r
+       desc[3] = desc[9] = 0;\r
+       desc[4] = desc[10] = 250;\r
+       //amplitude\r
+       desc[5] = 255;\r
+       desc[11] = 0;\r
+\r
+       //rel magnitude 10, durations 10; 90\r
+       _effects[0] = Tacton(2, desc);\r
+       //rel magnitude 8, durations 10; 45\r
+       desc[5] = 204;\r
+       desc[8] = 45;\r
+       _effects[1] = Tacton(2, desc);\r
+       //rel magnitude 8, durations 10; 90\r
+       desc[5] = 204;\r
+       desc[8] = 90;\r
+       _effects[2] = Tacton(2, desc);\r
+       //rel magnitude 8, durations 10; 180\r
+       desc[5] = 204;\r
+       desc[8] = 180;\r
+       _effects[3] = Tacton(2, desc);\r
+       //rel magnitude 6, durations 10; 90\r
+       desc[5] = 153;\r
+       desc[8] = 90;\r
+       _effects[4] = Tacton(2, desc);\r
+       //rel magnitude 5, durations 10; 90\r
+       desc[5] = 127;\r
+       _effects[5] = Tacton(2, desc);\r
+\r
+       //TODO: setup the other effects\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -23,15 +61,21 @@ Wristband::~Wristband()
                delete _tactonplayer;\r
 }\r
 \r
                delete _tactonplayer;\r
 }\r
 \r

-bool Wristband::playEffect(unsigned char effect, unsigned char nbrepeat) const\r
+void Wristband::playEffect(unsigned char effect, unsigned char nbrepeat) const\r

 {\r
 {\r

+       if (!_tactonplayer)\r
+               return;\r
+\r

        for (int i = 0 ; i < nbrepeat ; i++)\r
        {\r
                _tactonplayer->play(_effects[effect]);\r
        for (int i = 0 ; i < nbrepeat ; i++)\r
        {\r
                _tactonplayer->play(_effects[effect]);\r

-               ///TODO: add a pause\r
+               ///TODO: add a pause to prevent from overloading the arduino buffer\r
+               //messages are queues anyway, so it should not matters if nbrepeat is small\r
+               //QThread::msleep(_effects[effect].getDuration());\r

        }\r
 }\r
 \r
 char *Wristband::getStatus() const\r
 {\r
        }\r
 }\r
 \r
 char *Wristband::getStatus() const\r
 {\r

+       return NULL;\r

 }\r
 }\r

diff --git a/TouchscreenButton/Wristband.h b/TouchscreenButton/Wristband.h
index aa6f0ce758ff92da17fb4d7c7d2599be7613efc9..e8a40f30fc12228b0ae4106f76f8b140d36b610a 100644 (file)
--- a/TouchscreenButton/Wristband.h
+++ b/TouchscreenButton/Wristband.h
@@ -14,7 +14,7 @@ class Wristband :
                        Mimics Immersion touchscreen effects (0-46), 255 for no effect\r
                        nbrepeats: 255 for infinite until other effect or no effect\r
                */\r
                        Mimics Immersion touchscreen effects (0-46), 255 for no effect\r
                        nbrepeats: 255 for infinite until other effect or no effect\r
                */\r

-               bool playEffect(unsigned char effect, unsigned char nbrepeat) const;\r
+               void playEffect(unsigned char effect, unsigned char nbrepeat) const;\r

                char *getStatus() const;\r
 \r
        private:\r
                char *getStatus() const;\r
 \r
        private:\r

diff --git a/TouchscreenButton/touchscreenbutton.ui b/TouchscreenButton/touchscreenbutton.ui
index 7dfcac8e9c860e44d0edf484a0b8952ace91c55f..b4e6b4c9c3e1709a18c559a2b2f4097f175cccf7 100644 (file)
--- a/TouchscreenButton/touchscreenbutton.ui
+++ b/TouchscreenButton/touchscreenbutton.ui
@@ -7,11 +7,11 @@
     <x>0</x>\r
     <y>0</y>\r
     <width>345</width>\r
     <x>0</x>\r
     <y>0</y>\r
     <width>345</width>\r

-    <height>191</height>\r
+    <height>321</height>\r

    </rect>\r
   </property>\r
   <property name="windowTitle">\r
    </rect>\r
   </property>\r
   <property name="windowTitle">\r

-   <string>TouchscreenButton</string>\r
+   <string>Button</string>\r

   </property>\r
   <widget class="QWidget" name="centralWidget">\r
    <layout class="QVBoxLayout" name="verticalLayout">\r
   </property>\r
   <widget class="QWidget" name="centralWidget">\r
    <layout class="QVBoxLayout" name="verticalLayout">\r


@@ -48,13 +48,85 @@
         </property>\r
        </widget>\r
       </item>\r
         </property>\r
        </widget>\r
       </item>\r

+      <item row="3" column="1">\r
+       <widget class="QCheckBox" name="_pressoption">\r
+        <property name="text">\r
+         <string>Press</string>\r
+        </property>\r
+        <property name="checked">\r
+         <bool>true</bool>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="3" column="0">\r
+       <widget class="QCheckBox" name="_wristbandoption">\r
+        <property name="text">\r
+         <string>Wristband</string>\r
+        </property>\r
+        <property name="checked">\r
+         <bool>true</bool>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="4" column="0">\r
+       <widget class="QCheckBox" name="_touchscreenoption">\r
+        <property name="text">\r
+         <string>Touchscreen</string>\r
+        </property>\r
+        <property name="checked">\r
+         <bool>true</bool>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="4" column="1">\r
+       <widget class="QCheckBox" name="_releaseoption">\r
+        <property name="text">\r
+         <string>Release</string>\r
+        </property>\r
+        <property name="checked">\r
+         <bool>true</bool>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="2" column="0">\r
+       <widget class="QLabel" name="label_3">\r
+        <property name="font">\r
+         <font>\r
+          <weight>75</weight>\r
+          <bold>true</bold>\r
+         </font>\r
+        </property>\r
+        <property name="text">\r
+         <string>Feedback</string>\r
+        </property>\r
+        <property name="alignment">\r
+         <set>Qt::AlignCenter</set>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="2" column="1">\r
+       <widget class="QLabel" name="label_4">\r
+        <property name="font">\r
+         <font>\r
+          <weight>75</weight>\r
+          <bold>true</bold>\r
+         </font>\r
+        </property>\r
+        <property name="text">\r
+         <string>Events</string>\r
+        </property>\r
+        <property name="alignment">\r
+         <set>Qt::AlignCenter</set>\r
+        </property>\r
+       </widget>\r
+      </item>\r

      </layout>\r
     </item>\r
     <item>\r
      <widget class="QPushButton" name="_play">\r
       <property name="font">\r
        <font>\r
      </layout>\r
     </item>\r
     <item>\r
      <widget class="QPushButton" name="_play">\r
       <property name="font">\r
        <font>\r

-        <pointsize>20</pointsize>\r
+        <pointsize>50</pointsize>\r

        </font>\r
       </property>\r
       <property name="text">\r
        </font>\r
       </property>\r
       <property name="text">\r


@@ -66,7 +138,7 @@
      <widget class="QPushButton" name="_stop">\r
       <property name="font">\r
        <font>\r
      <widget class="QPushButton" name="_stop">\r
       <property name="font">\r
        <font>\r

-        <pointsize>20</pointsize>\r
+        <pointsize>50</pointsize>\r

        </font>\r
       </property>\r
       <property name="text">\r
        </font>\r
       </property>\r
       <property name="text">\r