From: Thomas Pietrzak Date: Tue, 28 Aug 2012 14:26:36 +0000 (+0000) Subject: minor edits X-Git-Url: https://git.thomaspietrzak.com/?a=commitdiff_plain;h=6d2d6fed68c7fe4d60cbd81077372b79f7090358;p=tactonlibrary.git 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 451403a..e3656be 100644 --- a/TactonDebug/AngleTester/angletester.cpp +++ b/TactonDebug/AngleTester/angletester.cpp @@ -7,7 +7,7 @@ AngleTester::AngleTester(QWidget *parent, Qt::WFlags flags) { try { - _tactonPlayer = new TactonPlayer("COM8"); + _tactonPlayer = new TactonPlayer("COM4"); } catch(...) { @@ -42,6 +42,8 @@ void AngleTester::setAngle(int angle) unsigned char amplitudes[4]; memset(amplitudes, 0, 4); +// angle = 90; + //vertical if (angle < 180) amplitudes[1] = 255 * sin(angle * M_PI / 180.0); diff --git a/TactonDebug/MagicCircle/magiccircle.cpp b/TactonDebug/MagicCircle/magiccircle.cpp index 0cf12d3..ed257ea 100644 --- a/TactonDebug/MagicCircle/magiccircle.cpp +++ b/TactonDebug/MagicCircle/magiccircle.cpp @@ -7,7 +7,7 @@ MagicCircle::MagicCircle(QWidget *parent, Qt::WFlags flags) { try { - _tactonPlayer = new TactonPlayer("COM8"); + _tactonPlayer = new TactonPlayer("COM4"); } catch(...) { diff --git a/TactonDebug/TactonDebug.suo b/TactonDebug/TactonDebug.suo index 74946b2..d16f968 100644 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 7ef1cd8..d25c25b 100644 --- a/TactonDebug/TactonDebug/tactondebug.cpp +++ b/TactonDebug/TactonDebug/tactondebug.cpp @@ -9,7 +9,7 @@ TactonDebug::TactonDebug(QWidget *parent, Qt::WFlags flags) { try { - _tactonPlayer = new TactonPlayer("COM8"); + _tactonPlayer = new TactonPlayer("COM4"); } catch(...) {