minor edits

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

diff --git a/TactonDebug/AngleTester/angletester.cpp b/TactonDebug/AngleTester/angletester.cpp
index 451403a2ab249c1145a4438df3305f4608ba32b2..e3656be78d06ede18cabe4548d63b9bbc145a57a 100644 (file)
--- a/TactonDebug/AngleTester/angletester.cpp
+++ b/TactonDebug/AngleTester/angletester.cpp
@@ -7,7 +7,7 @@ AngleTester::AngleTester(QWidget *parent, Qt::WFlags flags)
 {\r
        try\r
        {\r
-               _tactonPlayer = new TactonPlayer("COM8");\r
+               _tactonPlayer = new TactonPlayer("COM4");\r
        }\r
        catch(...)\r
        {\r
@@ -42,6 +42,8 @@ void AngleTester::setAngle(int angle)
        unsigned char amplitudes[4];\r
        memset(amplitudes, 0, 4);\r
 \r
+//     angle = 90;\r
+\r
        //vertical\r
        if (angle < 180)\r
                amplitudes[1] = 255 * sin(angle * M_PI / 180.0);\r

diff --git a/TactonDebug/MagicCircle/magiccircle.cpp b/TactonDebug/MagicCircle/magiccircle.cpp
index 0cf12d37a77cfd325f93d61b0fcbcc779a7294b6..ed257ea5d3117d23c18cfdaa0f2d7a99ae5f5648 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("COM8");\r
+               _tactonPlayer = new TactonPlayer("COM4");\r
        }\r
        catch(...)\r
        {\r

diff --git a/TactonDebug/TactonDebug.suo b/TactonDebug/TactonDebug.suo
index 74946b2e3ff762086dc3b666c7be622f9529889d..d16f968764d865f25a9fda3e3707072f7f1aa49f 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 7ef1cd857e4dcf9c2e64402fe1a31da330c1af8b..d25c25b434d58d0af3d7190adad3dd8852370d9e 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("COM8");\r
+               _tactonPlayer = new TactonPlayer("COM4");\r
        }\r
        catch(...)\r
        {\r