Import Tacton debugger

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

diff --git a/TactonDebug/TactonDebug.sln b/TactonDebug/TactonDebug.sln
new file mode 100644 (file)
index 0000000..0ab897a
--- /dev/null
+++ b/TactonDebug/TactonDebug.sln
@@ -0,0 +1,20 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 11.00\r
+# Visual Studio 2010\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TactonDebug", "TactonDebug\TactonDebug.vcxproj", "{245FF8C0-7CC0-4A37-9F07-6B3C8E29D089}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {245FF8C0-7CC0-4A37-9F07-6B3C8E29D089}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {245FF8C0-7CC0-4A37-9F07-6B3C8E29D089}.Debug|Win32.Build.0 = Debug|Win32\r
+               {245FF8C0-7CC0-4A37-9F07-6B3C8E29D089}.Release|Win32.ActiveCfg = Release|Win32\r
+               {245FF8C0-7CC0-4A37-9F07-6B3C8E29D089}.Release|Win32.Build.0 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/TactonDebug/TactonDebug.suo b/TactonDebug/TactonDebug.suo
new file mode 100644 (file)
index 0000000..d47ffd0
Binary files /dev/null and b/TactonDebug/TactonDebug.suo differ

diff --git a/TactonDebug/TactonDebug/TactonDebug.vcxproj b/TactonDebug/TactonDebug/TactonDebug.vcxproj
new file mode 100644 (file)
index 0000000..857dc95
--- /dev/null
+++ b/TactonDebug/TactonDebug/TactonDebug.vcxproj
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{245FF8C0-7CC0-4A37-9F07-6B3C8E29D089}</ProjectGuid>\r
+    <Keyword>Qt4VSv1.0</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(ConfigurationName)</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(ConfigurationName)</OutDir>\r
+  </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
+      <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
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>\r
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalDependencies>qtmaind.lib;QtCored4.lib;QtGuid4.lib;%(AdditionalDependencies);tactonplayer.lib</AdditionalDependencies>\r
+    </Link>\r
+  </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
+      <AdditionalIncludeDirectories>.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <DebugInformationFormat>\r
+      </DebugInformationFormat>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>\r
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <AdditionalDependencies>qtmain.lib;QtCore4.lib;QtGui4.lib;%(AdditionalDependencies);tactonplayer.lib</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="GeneratedFiles\Debug\moc_tactondebug.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\qrc_tactondebug.cpp">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+      </PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+      </PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Release\moc_tactondebug.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="main.cpp" />\r
+    <ClCompile Include="tactondebug.cpp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="tactondebug.h">\r
+      <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." "-I." "tactondebug.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"</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." "-I." "tactondebug.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="tactondebug.ui">\r
+      <FileType>Document</FileType>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Uic%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Uic%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="GeneratedFiles\ui_tactondebug.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="tactondebug.qrc">\r
+      <FileType>Document</FileType>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rcc%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rcc%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </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
+    </VisualStudio>\r
+  </ProjectExtensions>\r
+</Project>
\ No newline at end of file

diff --git a/TactonDebug/TactonDebug/main.cpp b/TactonDebug/TactonDebug/main.cpp
new file mode 100644 (file)
index 0000000..3ebd253
--- /dev/null
+++ b/TactonDebug/TactonDebug/main.cpp
@@ -0,0 +1,10 @@
+#include "tactondebug.h"\r
+#include <QtGui/QApplication>\r
+\r
+int main(int argc, char *argv[])\r
+{\r
+       QApplication a(argc, argv);\r
+       TactonDebug w;\r
+       w.show();\r
+       return a.exec();\r
+}\r

diff --git a/TactonDebug/TactonDebug/tactondebug.cpp b/TactonDebug/TactonDebug/tactondebug.cpp
new file mode 100644 (file)
index 0000000..70442ad
--- /dev/null
+++ b/TactonDebug/TactonDebug/tactondebug.cpp
@@ -0,0 +1,90 @@
+#include "tactondebug.h"\r
+\r
+int TactonDebug::MaxFrequency = 400;\r
+int TactonDebug::MaxAmplitude = 255;\r
+int TactonDebug::MaxDuration = 2000;\r
+\r
+TactonDebug::TactonDebug(QWidget *parent, Qt::WFlags flags)\r
+       : QMainWindow(parent, flags)\r
+{\r
+       try\r
+       {\r
+               _tactonPlayer = new TactonPlayer("COM5");\r
+       }\r
+       catch(...)\r
+       {\r
+               _tactonPlayer = NULL;\r
+       }\r
+\r
+       setupUi(this);\r
+       QObject::connect(frequencebox, SIGNAL(textChanged(const QString &)), this, SLOT(setFrequency(const QString &)));\r
+       QObject::connect(frequenceslider, SIGNAL(valueChanged(int)), this, SLOT(setFrequency(int)));\r
+       QObject::connect(amplitudebox, SIGNAL(textChanged(const QString &)), this, SLOT(setAmplitude(const QString &)));\r
+       QObject::connect(amplitudeslider, SIGNAL(valueChanged(int)), this, SLOT(setAmplitude(int)));\r
+       QObject::connect(durationbox, SIGNAL(textChanged(const QString &)), this, SLOT(setDuration(const QString &)));\r
+       QObject::connect(durationslider, SIGNAL(valueChanged(int)), this, SLOT(setDuration(int)));\r
+\r
+       QObject::connect(playbutton, SIGNAL(clicked(bool)), this, SLOT(play(bool)));\r
+}\r
+\r
+TactonDebug::~TactonDebug()\r
+{\r
+\r
+}\r
+\r
+void TactonDebug::setFrequency(int f)\r
+{\r
+       if (f > MaxFrequency)\r
+               f = MaxFrequency;\r
+       frequencebox->setText(QString::number(f));\r
+}\r
+\r
+void TactonDebug::setFrequency(const QString &text)\r
+{\r
+       int f = text.toInt();\r
+       if (f > MaxFrequency)\r
+               f = MaxFrequency;\r
+       frequenceslider->setValue(f);\r
+}\r
+\r
+void TactonDebug::setAmplitude(int a)\r
+{\r
+       if (a > MaxAmplitude)\r
+               a = MaxAmplitude;\r
+       amplitudebox->setText(QString::number(a));\r
+}\r
+\r
+void TactonDebug::setAmplitude(const QString &text)\r
+{\r
+       int a = text.toInt();\r
+       if (a > MaxAmplitude)\r
+               a = MaxAmplitude;\r
+       amplitudeslider->setValue(a);\r
+}\r
+\r
+void TactonDebug::setDuration(int d)\r
+{\r
+       if (d > MaxDuration)\r
+               d = MaxDuration;\r
+       durationbox->setText(QString::number(d));\r
+}\r
+\r
+void TactonDebug::setDuration(const QString &text)\r
+{\r
+       int d = text.toInt();\r
+       if (d > MaxDuration)\r
+               d = MaxDuration;\r
+       durationslider->setValue(d);\r
+}\r
+\r
+void TactonDebug::play(bool)\r
+{\r
+       if (!_tactonPlayer)\r
+               return;\r
+       unsigned char pattern = up->isChecked() * POS2_UP |\r
+               right->isChecked() * POS2_RIGHT |\r
+               left->isChecked() * POS2_LEFT | \r
+               down->isChecked() * POS2_DOWN;\r
+\r
+       _tactonPlayer->play(Tacton(pattern, durationslider->value(), frequenceslider->value(), amplitudeslider->value()));\r
+}\r

diff --git a/TactonDebug/TactonDebug/tactondebug.h b/TactonDebug/TactonDebug/tactondebug.h
new file mode 100644 (file)
index 0000000..ca468af
--- /dev/null
+++ b/TactonDebug/TactonDebug/tactondebug.h
@@ -0,0 +1,35 @@
+#ifndef TACTONDEBUG_H\r
+#define TACTONDEBUG_H\r
+\r
+#include <QtGui/QMainWindow>\r
+#include "ui_tactondebug.h"\r
+\r
+#include <TactonPlayer\TactonPlayer.hpp>\r
+\r
+class TactonDebug : public QMainWindow, Ui::TactonDebugClass\r
+{\r
+       Q_OBJECT\r
+\r
+       public:\r
+               TactonDebug(QWidget *parent = 0, Qt::WFlags flags = 0);\r
+               ~TactonDebug();\r
+\r
+       public slots:\r
+               void setFrequency(int f);\r
+               void setFrequency(const QString &text);\r
+               void setAmplitude(int a);\r
+               void setAmplitude(const QString &text);\r
+               void setDuration(int d);\r
+               void setDuration(const QString &text);\r
+\r
+               void play(bool);\r
+                \r
+       private:\r
+               static int MaxFrequency;\r
+               static int MaxAmplitude;\r
+               static int MaxDuration;\r
+\r
+               TactonPlayer *_tactonPlayer;\r
+};\r
+\r
+#endif // TACTONDEBUG_H\r

diff --git a/TactonDebug/TactonDebug/tactondebug.qrc b/TactonDebug/TactonDebug/tactondebug.qrc
new file mode 100644 (file)
index 0000000..0dc7b88
--- /dev/null
+++ b/TactonDebug/TactonDebug/tactondebug.qrc
@@ -0,0 +1,4 @@
+<RCC>\r
+    <qresource prefix="TactonDebug">\r
+    </qresource>\r
+</RCC>\r

diff --git a/TactonDebug/TactonDebug/tactondebug.ui b/TactonDebug/TactonDebug/tactondebug.ui
new file mode 100644 (file)
index 0000000..c6deb50
--- /dev/null
+++ b/TactonDebug/TactonDebug/tactondebug.ui
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ui version="4.0">\r
+ <class>TactonDebugClass</class>\r
+ <widget class="QMainWindow" name="TactonDebugClass">\r
+  <property name="geometry">\r
+   <rect>\r
+    <x>0</x>\r
+    <y>0</y>\r
+    <width>231</width>\r
+    <height>371</height>\r
+   </rect>\r
+  </property>\r
+  <property name="windowTitle">\r
+   <string>TactonDebug</string>\r
+  </property>\r
+  <widget class="QWidget" name="centralWidget">\r
+   <widget class="QWidget" name="verticalLayoutWidget">\r
+    <property name="geometry">\r
+     <rect>\r
+      <x>10</x>\r
+      <y>10</y>\r
+      <width>211</width>\r
+      <height>349</height>\r
+     </rect>\r
+    </property>\r
+    <layout class="QVBoxLayout" name="verticalLayout">\r
+     <item>\r
+      <layout class="QHBoxLayout" name="horizontalLayout_3">\r
+       <item>\r
+        <spacer name="horizontalSpacer">\r
+         <property name="orientation">\r
+          <enum>Qt::Horizontal</enum>\r
+         </property>\r
+         <property name="sizeHint" stdset="0">\r
+          <size>\r
+           <width>40</width>\r
+           <height>20</height>\r
+          </size>\r
+         </property>\r
+        </spacer>\r
+       </item>\r
+       <item>\r
+        <widget class="QCheckBox" name="up">\r
+         <property name="text">\r
+          <string/>\r
+         </property>\r
+         <property name="checked">\r
+          <bool>false</bool>\r
+         </property>\r
+        </widget>\r
+       </item>\r
+       <item>\r
+        <spacer name="horizontalSpacer_4">\r
+         <property name="orientation">\r
+          <enum>Qt::Horizontal</enum>\r
+         </property>\r
+         <property name="sizeHint" stdset="0">\r
+          <size>\r
+           <width>40</width>\r
+           <height>20</height>\r
+          </size>\r
+         </property>\r
+        </spacer>\r
+       </item>\r
+      </layout>\r
+     </item>\r
+     <item>\r
+      <layout class="QHBoxLayout" name="horizontalLayout">\r
+       <item>\r
+        <spacer name="horizontalSpacer_6">\r
+         <property name="orientation">\r
+          <enum>Qt::Horizontal</enum>\r
+         </property>\r
+         <property name="sizeHint" stdset="0">\r
+          <size>\r
+           <width>40</width>\r
+           <height>20</height>\r
+          </size>\r
+         </property>\r
+        </spacer>\r
+       </item>\r
+       <item>\r
+        <widget class="QCheckBox" name="left">\r
+         <property name="text">\r
+          <string/>\r
+         </property>\r
+        </widget>\r
+       </item>\r
+       <item>\r
+        <spacer name="horizontalSpacer_2">\r
+         <property name="orientation">\r
+          <enum>Qt::Horizontal</enum>\r
+         </property>\r
+         <property name="sizeHint" stdset="0">\r
+          <size>\r
+           <width>40</width>\r
+           <height>20</height>\r
+          </size>\r
+         </property>\r
+        </spacer>\r
+       </item>\r
+       <item>\r
+        <widget class="QCheckBox" name="right">\r
+         <property name="text">\r
+          <string/>\r
+         </property>\r
+        </widget>\r
+       </item>\r
+       <item>\r
+        <spacer name="horizontalSpacer_7">\r
+         <property name="orientation">\r
+          <enum>Qt::Horizontal</enum>\r
+         </property>\r
+         <property name="sizeHint" stdset="0">\r
+          <size>\r
+           <width>40</width>\r
+           <height>20</height>\r
+          </size>\r
+         </property>\r
+        </spacer>\r
+       </item>\r
+      </layout>\r
+     </item>\r
+     <item>\r
+      <layout class="QHBoxLayout" name="horizontalLayout_2">\r
+       <item>\r
+        <spacer name="horizontalSpacer_3">\r
+         <property name="orientation">\r
+          <enum>Qt::Horizontal</enum>\r
+         </property>\r
+         <property name="sizeHint" stdset="0">\r
+          <size>\r
+           <width>40</width>\r
+           <height>20</height>\r
+          </size>\r
+         </property>\r
+        </spacer>\r
+       </item>\r
+       <item>\r
+        <widget class="QCheckBox" name="down">\r
+         <property name="text">\r
+          <string/>\r
+         </property>\r
+        </widget>\r
+       </item>\r
+       <item>\r
+        <spacer name="horizontalSpacer_5">\r
+         <property name="orientation">\r
+          <enum>Qt::Horizontal</enum>\r
+         </property>\r
+         <property name="sizeHint" stdset="0">\r
+          <size>\r
+           <width>40</width>\r
+           <height>20</height>\r
+          </size>\r
+         </property>\r
+        </spacer>\r
+       </item>\r
+      </layout>\r
+     </item>\r
+     <item>\r
+      <widget class="QLabel" name="label">\r
+       <property name="text">\r
+        <string>Fréquence</string>\r
+       </property>\r
+      </widget>\r
+     </item>\r
+     <item>\r
+      <widget class="QLineEdit" name="frequencebox">\r
+       <property name="text">\r
+        <string>250</string>\r
+       </property>\r
+       <property name="maxLength">\r
+        <number>3</number>\r
+       </property>\r
+      </widget>\r
+     </item>\r
+     <item>\r
+      <widget class="QSlider" name="frequenceslider">\r
+       <property name="maximum">\r
+        <number>400</number>\r
+       </property>\r
+       <property name="value">\r
+        <number>250</number>\r
+       </property>\r
+       <property name="orientation">\r
+        <enum>Qt::Horizontal</enum>\r
+       </property>\r
+       <property name="tickPosition">\r
+        <enum>QSlider::TicksBothSides</enum>\r
+       </property>\r
+       <property name="tickInterval">\r
+        <number>50</number>\r
+       </property>\r
+      </widget>\r
+     </item>\r
+     <item>\r
+      <widget class="QLabel" name="label_2">\r
+       <property name="text">\r
+        <string>Amplitude</string>\r
+       </property>\r
+      </widget>\r
+     </item>\r
+     <item>\r
+      <widget class="QLineEdit" name="amplitudebox">\r
+       <property name="text">\r
+        <string>255</string>\r
+       </property>\r
+       <property name="maxLength">\r
+        <number>3</number>\r
+       </property>\r
+      </widget>\r
+     </item>\r
+     <item>\r
+      <widget class="QSlider" name="amplitudeslider">\r
+       <property name="maximum">\r
+        <number>255</number>\r
+       </property>\r
+       <property name="value">\r
+        <number>255</number>\r
+       </property>\r
+       <property name="orientation">\r
+        <enum>Qt::Horizontal</enum>\r
+       </property>\r
+       <property name="tickPosition">\r
+        <enum>QSlider::TicksBothSides</enum>\r
+       </property>\r
+       <property name="tickInterval">\r
+        <number>32</number>\r
+       </property>\r
+      </widget>\r
+     </item>\r
+     <item>\r
+      <widget class="QLabel" name="label_3">\r
+       <property name="text">\r
+        <string>Duration</string>\r
+       </property>\r
+      </widget>\r
+     </item>\r
+     <item>\r
+      <widget class="QLineEdit" name="durationbox">\r
+       <property name="text">\r
+        <string>200</string>\r
+       </property>\r
+       <property name="maxLength">\r
+        <number>4</number>\r
+       </property>\r
+      </widget>\r
+     </item>\r
+     <item>\r
+      <widget class="QSlider" name="durationslider">\r
+       <property name="maximum">\r
+        <number>2000</number>\r
+       </property>\r
+       <property name="singleStep">\r
+        <number>10</number>\r
+       </property>\r
+       <property name="pageStep">\r
+        <number>100</number>\r
+       </property>\r
+       <property name="value">\r
+        <number>200</number>\r
+       </property>\r
+       <property name="orientation">\r
+        <enum>Qt::Horizontal</enum>\r
+       </property>\r
+       <property name="tickPosition">\r
+        <enum>QSlider::TicksBothSides</enum>\r
+       </property>\r
+       <property name="tickInterval">\r
+        <number>100</number>\r
+       </property>\r
+      </widget>\r
+     </item>\r
+     <item>\r
+      <widget class="QPushButton" name="playbutton">\r
+       <property name="text">\r
+        <string>Play</string>\r
+       </property>\r
+      </widget>\r
+     </item>\r
+    </layout>\r
+   </widget>\r
+  </widget>\r
+ </widget>\r
+ <layoutdefault spacing="6" margin="11"/>\r
+ <resources>\r
+  <include location="tactondebug.qrc"/>\r
+ </resources>\r
+ <connections/>\r
+</ui>\r

diff --git a/TactonLibrary.suo b/TactonLibrary.suo
index 5078e9b4664158857d3903bcacb8318ea7b52c26..6134b9ff7d21aa4f600c1f195dbbfdfed24fab4e 100644 (file)
Binary files a/TactonLibrary.suo and b/TactonLibrary.suo differ

diff --git a/TactonPlayer/Tacton.hpp b/TactonPlayer/Tacton.hpp
index 0dfa37d35935ab123b5db44447a16edfca80ab62..60f3ee0a62242e056e19bf638b81a7a98b50f79b 100644 (file)
--- a/TactonPlayer/Tacton.hpp
+++ b/TactonPlayer/Tacton.hpp
@@ -1,9 +1,9 @@
 #ifndef _TACTON_\r
 #define _TACTON_\r
 \r
-#define POS1_UP_FOREWARD 0x01\r
+#define POS1_UP_FORWARD 0x01\r
 #define POS1_UP_BACKWARD 0x02\r
-#define POS1_DOWN_FOREWARD 0x08\r
+#define POS1_DOWN_FORWARD 0x08\r
 #define POS1_DOWN_BACKWARD 0x04\r
 \r
 #define POS2_RIGHT 0x01\r

diff --git a/TactonPlayer/TactonPlayer.cpp b/TactonPlayer/TactonPlayer.cpp
index e57595c3a05a5e577866a9e41ca8f03a8eded2e9..d2f3be0fbadfacb00e7ed9ebc629ca2d50660507 100644 (file)
--- a/TactonPlayer/TactonPlayer.cpp
+++ b/TactonPlayer/TactonPlayer.cpp
@@ -12,6 +12,7 @@ TactonPlayer::TactonPlayer(const char *port)
        }\r
        catch(...)\r
        {\r
+               _comport = NULL;\r
        }\r
 }\r
 \r