From 6d2d6fed68c7fe4d60cbd81077372b79f7090358 Mon Sep 17 00:00:00 2001 From: Thomas Pietrzak Date: Tue, 28 Aug 2012 14:26:36 +0000 Subject: [PATCH] minor edits git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@91 47cf9a05-e0a8-4ed5-9e9b-101a649bc004 --- TactonDebug/AngleTester/angletester.cpp | 4 +++- TactonDebug/MagicCircle/magiccircle.cpp | 2 +- TactonDebug/TactonDebug.suo | Bin 35328 -> 36864 bytes TactonDebug/TactonDebug/tactondebug.cpp | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) 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 74946b2e3ff762086dc3b666c7be622f9529889d..d16f968764d865f25a9fda3e3707072f7f1aa49f 100644 GIT binary patch delta 1088 zcmZ{je@t6d6vy9veSK{a3h6p5%+%UeLg9rXn`kVfPpC+s%$99t8HUw0j@hyWHf)sW zTCy!lLNw*OKg=@SR*)EDLf5;vp^2+YjGKvU;{Gu6$3HVBBug{~6em*8!IKhHX=YM z#1ljZv6)DRf0&d8&1&HC>~qJyU^)t=+W4q+Q)J70r{SH zFk-nO-CK0zH|gVPGaubB$Z*G_AYtv&`2;_PtzkU6F_f!ZVTRj!N}_geRr_#xV=EH2 zAcD3Q^cq#JRvnelUcPnGzNFtuNgwmy?VlS=jCNRXX+@*~OEuTDoJ=i)#r7Bi5p})C zHqR(BF%_x0K`7CE_^`eMq4*B$-fqn(BK9}zLf*TZTr=_wiZ#Eo$DM!qk*?E*c+2aa z>*I?vr*7rEb7Hyc(>HXB?^peDd};A*SK>Us^3ae}QR#HVZk-!Ayyq2m^_v?^ep~csVmaqC`Sq_;6!64vz&x<_O)-IaZ{WPuJ z>fgs4_>tkh-~zjfFMCc(2cCWYAkOwE6f)tn@EpDmR^VpGg-n;o(@)N^GA1xlShc4& z9Q){?N=+9eSqS{6wxYih7q^wdD;aUEXSqbC#TXHor!{8y$Wz@6S3FG^vdOsE+ljpm z)hLZRak4&uNVOFn$;>m`dyVWjzT9_@$S;LHVe3MuaakWV`ezJabAND3jW8SKXU^@=o)SnV;U79e2bAjHH7~?;1E$sx*9wN56fMZp*upO^}b$$tR?n12@l delta 939 zcmaizSx8i26vw~sc4y0J44X{Dw8hlPOO7Q5&ZJ{XE?L=_Q6|ldnrWF#YGoy8%R|Mq z*x#Usm}HE4o&3NksEih*&6J`I>LCcCpdKc(&FNe-=&kSaLN3hr@Y{u{6R;EFx4b14B|mij6!wv6RRratH^JODrQ66AIC}=JP4J!Sq>ffAVJE zLq3TlhePa@UrPL|DAzSll4p>F_M8+Enp~>WQ-ko72?Z@tPcRU#XwQ&v+9>u;Yv4Qw zJIrekoL&n5%q(QZWcNmoa@|@jO`$q_EGuz4#txr_VwP;I)jNbE_MmLwkrXznQ>ax> zXcpIGkz*3y;_vAU<13gq5kx3y5VzvfMJUahMd!$}!xwukaJ<66~rRF);; zb^Y9cBB9D-hus^4kEv#8%glJ~$w&V}#r*!l*|!l_qe?nXK7CYs?@d?#s4KBI?TQqc z{J~WI!LsMoGd~Wr+6Kiyx>uh1Fjjy6-2S|J*VE@x_t2+1qA+v4Mplm&=WUAeg}!ry zP=(P6`K zdY2#lCEu{SurE+7;bcJ^UM?Tja>gb012_~C6bcFYAy2;^pTM=}Y z;#6uQEj-HD-?pUqoNk-_xaIK?%#ou-pve~5fW~?lBOh6{@<|#Ay)~u6&NtP zz=!g!UnfUUC}lj1+~(9Chnpi%l?Z!TJ{ntg!S9I{4?HAxRVxU%6*N?v`Itzr8RVUA zt7ftKDe3^{G1Q zs9x`Xhp6;=xoB%zWkB(<>lpUd@dUx!R%pgGQGBdVf@6LKD(cqt9xmjvT0`Acv>fsM E1`9<%fB*mh 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(...) { -- 2.30.2