projects / tactonlibrary.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2e2a688)
Angle tester
authorThomas Pietrzak <thomas.pietrzak@gmail.com>
Thu, 16 Aug 2012 18:50:24 +0000 (18:50 +0000)
committerThomas Pietrzak <thomas.pietrzak@gmail.com>
Thu, 16 Aug 2012 18:50:24 +0000 (18:50 +0000)
git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@87 47cf9a05-e0a8-4ed5-9e9b-101a649bc004

TactonDebug/AngleTester/AngleTester.vcxproj [new file with mode: 0644] patch | blob
TactonDebug/AngleTester/angletester.cpp [new file with mode: 0644] patch | blob
TactonDebug/AngleTester/angletester.h [new file with mode: 0644] patch | blob
TactonDebug/AngleTester/angletester.ui [new file with mode: 0644] patch | blob
TactonDebug/AngleTester/main.cpp [new file with mode: 0644] patch | blob
TactonDebug/MagicCircle/magiccircle.cpp patch | blob | history
TactonDebug/TactonDebug.sln patch | blob | history
TactonDebug/TactonDebug.suo patch | blob | history
TactonDebug/TactonDebug/tactondebug.cpp patch | blob | history

diff --git a/TactonDebug/AngleTester/AngleTester.vcxproj b/TactonDebug/AngleTester/AngleTester.vcxproj
new file mode 100644 (file)
index 0000000..e4f50cc
--- /dev/null
+++ b/TactonDebug/AngleTester/AngleTester.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>{DF37D231-4F5F-44EC-9E32-0F91030F8BC3}</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.30319.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)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(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>TactonPlayerd.lib;qtmaind.lib;QtCored4.lib;QtGuid4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(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>TactonPlayer.lib;qtmain.lib;QtCore4.lib;QtGui4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="angletester.cpp" />\r
+    <ClCompile Include="GeneratedFiles\Debug\moc_angletester.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\qrc_angletester.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_angletester.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="main.cpp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="angletester.h">\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing angletester.h...</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"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_USE_MATH_DEFINES -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui"</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing angletester.h...</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"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_USE_MATH_DEFINES -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui"</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="angletester.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_angletester.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="angletester.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.8.2" />\r
+    </VisualStudio>\r
+  </ProjectExtensions>\r
+</Project>
\ No newline at end of file
diff --git a/TactonDebug/AngleTester/angletester.cpp b/TactonDebug/AngleTester/angletester.cpp
new file mode 100644 (file)
index 0000000..451403a
--- /dev/null
+++ b/TactonDebug/AngleTester/angletester.cpp
@@ -0,0 +1,68 @@
+#include "angletester.h"\r
+\r
+#include <cmath>\r
+\r
+AngleTester::AngleTester(QWidget *parent, Qt::WFlags flags)\r
+       : QMainWindow(parent, flags)\r
+{\r
+       try\r
+       {\r
+               _tactonPlayer = new TactonPlayer("COM8");\r
+       }\r
+       catch(...)\r
+       {\r
+               _tactonPlayer = NULL;\r
+       }\r
+\r
+       setupUi(this);\r
+\r
+       layout()->setSizeConstraint(QLayout::SetFixedSize);\r
+\r
+       setFrequency(_frequency->value());\r
+\r
+       connect(_play, SIGNAL(clicked(bool)), this, SLOT(play(bool)));\r
+       connect(_stop, SIGNAL(clicked(bool)), this, SLOT(stop(bool)));\r
+\r
+       connect(_angle, SIGNAL(valueChanged(int)), this, SLOT(setAngle(int)));\r
+       connect(_frequency, SIGNAL(valueChanged(int)), this, SLOT(setFrequency(int)));\r
+}\r
+\r
+AngleTester::~AngleTester()\r
+{\r
+\r
+}\r
+\r
+void AngleTester::setFrequency(int frequency)\r
+{\r
+       _tactonPlayer->setFrequency(frequency);\r
+}\r
+\r
+void AngleTester::setAngle(int angle)\r
+{\r
+       unsigned char amplitudes[4];\r
+       memset(amplitudes, 0, 4);\r
+\r
+       //vertical\r
+       if (angle < 180)\r
+               amplitudes[1] = 255 * sin(angle * M_PI / 180.0);\r
+       else\r
+               amplitudes[3] = - 255 * sin(angle * M_PI / 180.0);\r
+\r
+       //horizontal\r
+       if (angle < 90 ||angle > 270)\r
+               amplitudes[0] = 255 * cos(angle * M_PI / 180.0);\r
+       else\r
+               amplitudes[2] = - 255 * cos(angle * M_PI / 180.0);\r
+\r
+       _tactonPlayer->setAmplitudes(4, amplitudes);\r
+}\r
+\r
+void AngleTester::play(bool)\r
+{\r
+       setAngle(_angle->value());\r
+}\r
+\r
+void AngleTester::stop(bool)\r
+{\r
+       _tactonPlayer->stopBuzz();\r
+}\r
diff --git a/TactonDebug/AngleTester/angletester.h b/TactonDebug/AngleTester/angletester.h
new file mode 100644 (file)
index 0000000..9fecca0
--- /dev/null
+++ b/TactonDebug/AngleTester/angletester.h
@@ -0,0 +1,27 @@
+#ifndef ANGLETESTER_H\r
+#define ANGLETESTER_H\r
+\r
+#include <QtGui/QMainWindow>\r
+#include "ui_angletester.h"\r
+\r
+#include <TactonPlayer\TactonPlayer.hpp>\r
+\r
+class AngleTester : public QMainWindow, Ui::AngleTesterClass\r
+{\r
+       Q_OBJECT\r
+\r
+       public:\r
+               AngleTester(QWidget *parent = 0, Qt::WFlags flags = 0);\r
+               ~AngleTester();\r
+\r
+       public slots:\r
+               void play(bool);\r
+               void stop(bool);\r
+               void setFrequency(int frequency);\r
+               void setAngle(int angle);\r
+\r
+       private:\r
+               TactonPlayer *_tactonPlayer;\r
+};\r
+\r
+#endif // ANGLETESTER_H\r
diff --git a/TactonDebug/AngleTester/angletester.ui b/TactonDebug/AngleTester/angletester.ui
new file mode 100644 (file)
index 0000000..8448e58
--- /dev/null
+++ b/TactonDebug/AngleTester/angletester.ui
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ui version="4.0">\r
+ <class>AngleTesterClass</class>\r
+ <widget class="QMainWindow" name="AngleTesterClass">\r
+  <property name="geometry">\r
+   <rect>\r
+    <x>0</x>\r
+    <y>0</y>\r
+    <width>176</width>\r
+    <height>176</height>\r
+   </rect>\r
+  </property>\r
+  <property name="windowTitle">\r
+   <string>AngleTester</string>\r
+  </property>\r
+  <widget class="QWidget" name="centralWidget">\r
+   <layout class="QVBoxLayout" name="verticalLayout">\r
+    <item>\r
+     <widget class="QDial" name="_angle">\r
+      <property name="maximum">\r
+       <number>359</number>\r
+      </property>\r
+      <property name="tracking">\r
+       <bool>true</bool>\r
+      </property>\r
+      <property name="invertedAppearance">\r
+       <bool>false</bool>\r
+      </property>\r
+      <property name="invertedControls">\r
+       <bool>false</bool>\r
+      </property>\r
+      <property name="wrapping">\r
+       <bool>true</bool>\r
+      </property>\r
+      <property name="notchTarget">\r
+       <double>30.000000000000000</double>\r
+      </property>\r
+      <property name="notchesVisible">\r
+       <bool>true</bool>\r
+      </property>\r
+     </widget>\r
+    </item>\r
+    <item>\r
+     <layout class="QFormLayout" name="formLayout">\r
+      <item row="0" column="0">\r
+       <widget class="QLabel" name="frequencyLabel">\r
+        <property name="text">\r
+         <string>Frequency</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="0" column="1">\r
+       <widget class="QSpinBox" name="_frequency">\r
+        <property name="maximum">\r
+         <number>500</number>\r
+        </property>\r
+        <property name="value">\r
+         <number>300</number>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="1" column="1">\r
+       <widget class="QPushButton" name="_play">\r
+        <property name="text">\r
+         <string>Play</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="1" column="0">\r
+       <widget class="QPushButton" name="_stop">\r
+        <property name="text">\r
+         <string>Stop</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+     </layout>\r
+    </item>\r
+   </layout>\r
+  </widget>\r
+ </widget>\r
+ <layoutdefault spacing="6" margin="11"/>\r
+ <resources>\r
+  <include location="angletester.qrc"/>\r
+ </resources>\r
+ <connections/>\r
+</ui>\r
diff --git a/TactonDebug/AngleTester/main.cpp b/TactonDebug/AngleTester/main.cpp
new file mode 100644 (file)
index 0000000..d8f4cea
--- /dev/null
+++ b/TactonDebug/AngleTester/main.cpp
@@ -0,0 +1,10 @@
+#include "angletester.h"\r
+#include <QtGui/QApplication>\r
+\r
+int main(int argc, char *argv[])\r
+{\r
+       QApplication a(argc, argv);\r
+       AngleTester w;\r
+       w.show();\r
+       return a.exec();\r
+}\r
diff --git a/TactonDebug/MagicCircle/magiccircle.cpp b/TactonDebug/MagicCircle/magiccircle.cpp
index 8d19d8d7aa2a37eecd5c94088244621c01e59e1c..0cf12d37a77cfd325f93d61b0fcbcc779a7294b6 100644 (file)
--- a/TactonDebug/MagicCircle/magiccircle.cpp
+++ b/TactonDebug/MagicCircle/magiccircle.cpp
@@ -7,7 +7,7 @@ MagicCircle::MagicCircle(QWidget *parent, Qt::WFlags flags)
 {\r
        try\r
        {\r
-               _tactonPlayer = new TactonPlayer("COM4");\r
+               _tactonPlayer = new TactonPlayer("COM8");\r
        }\r
        catch(...)\r
        {\r
@@ -27,7 +27,7 @@ MagicCircle::MagicCircle(QWidget *parent, Qt::WFlags flags)
        connect(_play, SIGNAL(clicked(bool)), this, SLOT(play(bool)));\r
        connect(_stop, SIGNAL(clicked(bool)), this, SLOT(stop(bool)));\r
 \r
-       connect(_direction, SIGNAL(editTextChanged(const QString &)), this, SLOT(setDirection(const QString &)));\r
+       connect(_direction, SIGNAL(currentIndexChanged (const QString &)), this, SLOT(setDirection(const QString &)));\r
        connect(_speed, SIGNAL(valueChanged(int)), this, SLOT(setSpeed(int)));\r
        connect(_resolution, SIGNAL(valueChanged(int)), this, SLOT(setResolution(int)));\r
        connect(_frequency, SIGNAL(valueChanged(int)), this, SLOT(setFrequency(int)));\r
diff --git a/TactonDebug/TactonDebug.sln b/TactonDebug/TactonDebug.sln
index 972e2a20ac6ad1acf9c65528fb8d6e4e9e0ebc15..84deb6d0d18b2bbc51246891b9cc6d99794ef255 100644 (file)
--- a/TactonDebug/TactonDebug.sln
+++ b/TactonDebug/TactonDebug.sln
@@ -5,6 +5,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TactonDebug", "TactonDebug\
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MagicCircle", "MagicCircle\MagicCircle.vcxproj", "{E39CA6E9-BA0B-4C12-8090-D5CE66CADF94}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AngleTester", "AngleTester\AngleTester.vcxproj", "{DF37D231-4F5F-44EC-9E32-0F91030F8BC3}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -19,6 +21,10 @@ Global
                {E39CA6E9-BA0B-4C12-8090-D5CE66CADF94}.Debug|Win32.Build.0 = Debug|Win32\r
                {E39CA6E9-BA0B-4C12-8090-D5CE66CADF94}.Release|Win32.ActiveCfg = Release|Win32\r
                {E39CA6E9-BA0B-4C12-8090-D5CE66CADF94}.Release|Win32.Build.0 = Release|Win32\r
+               {DF37D231-4F5F-44EC-9E32-0F91030F8BC3}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {DF37D231-4F5F-44EC-9E32-0F91030F8BC3}.Debug|Win32.Build.0 = Debug|Win32\r
+               {DF37D231-4F5F-44EC-9E32-0F91030F8BC3}.Release|Win32.ActiveCfg = Release|Win32\r
+               {DF37D231-4F5F-44EC-9E32-0F91030F8BC3}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
diff --git a/TactonDebug/TactonDebug.suo b/TactonDebug/TactonDebug.suo
index 97614358c81678c44645334c11155984788c1cc5..74946b2e3ff762086dc3b666c7be622f9529889d 100644 (file)
Binary files a/TactonDebug/TactonDebug.suo and b/TactonDebug/TactonDebug.suo differ
diff --git a/TactonDebug/TactonDebug/tactondebug.cpp b/TactonDebug/TactonDebug/tactondebug.cpp
index d25c25b434d58d0af3d7190adad3dd8852370d9e..7ef1cd857e4dcf9c2e64402fe1a31da330c1af8b 100644 (file)
--- a/TactonDebug/TactonDebug/tactondebug.cpp
+++ b/TactonDebug/TactonDebug/tactondebug.cpp
@@ -9,7 +9,7 @@ TactonDebug::TactonDebug(QWidget *parent, Qt::WFlags flags)
 {\r
        try\r
        {\r
-               _tactonPlayer = new TactonPlayer("COM4");\r
+               _tactonPlayer = new TactonPlayer("COM8");\r
        }\r
        catch(...)\r
        {\r
Arduino and C++ library for tactile wristband