From 2e2a6884523cb12d4264964a998fb5f5d5b476f7 Mon Sep 17 00:00:00 2001
From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Wed, 1 Aug 2012 15:39:34 +0000
Subject: [PATCH] Minor bugs

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@85 47cf9a05-e0a8-4ed5-9e9b-101a649bc004
---
 TactonDebug/MagicCircle/magiccircle.ui |   2 +-
 TactonDebug/TactonDebug.suo            | Bin 35328 -> 35328 bytes
 TactonLibrary.suo                      | Bin 27648 -> 28160 bytes
 TactonPlayer/TactonPlayer.cpp          |   2 +-
 TactonPlayer/TactonPlayer.hpp          |   2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TactonDebug/MagicCircle/magiccircle.ui b/TactonDebug/MagicCircle/magiccircle.ui
index b6829a5..acbe50c 100644
--- a/TactonDebug/MagicCircle/magiccircle.ui
+++ b/TactonDebug/MagicCircle/magiccircle.ui
@@ -87,7 +87,7 @@
          <number>4</number>
         </property>
         <property name="maximum">
-         <number>360</number>
+         <number>720</number>
         </property>
         <property name="value">
          <number>360</number>
diff --git a/TactonDebug/TactonDebug.suo b/TactonDebug/TactonDebug.suo
index 95b4378c954488ffa5127b2099bacfe008f036a3..97614358c81678c44645334c11155984788c1cc5 100644
GIT binary patch
delta 1671
zcmcIlZA_b06u$TETPRRq1y%|O87sP#0k-9<jE+*?(f|WmJ~A}H&W4YqjE_Rg#|GOv
z;}VyVO*lkNoZG^W`eTzIuZeMq5i^W99pH>H(Wo&0$g&6_HBqxr&uxqGhw+c`-aPl7
zuY2!#&pqe9z8TIp!_D93;tL2NyTM>kU^9HcWlX&&&n`peD54x;L>xm@AWVo##I8ss
zr)d24n^`pv2kuh|iWbGw{M#IV4@t<0&XIkA#0o;RM~_K(ITN2Z9fm;cY7EUr?qEbB
z2IB0TEEl<$J&8BLMq?=Y6x_Eb3M8UYB69H&33!uy(sg96!|zGQWz0A=qKbM0iIG@1
zlUy4^<B(2>C?Jr$18!9wjHJ{_%83aEQ<}iA-#)Dr;4ZI=N<+IIUOb~bN27mW--JHD
zm0k`@8iTY5nQ;iF4vIgkCaHYGyE`kqzowW=CpSf3`Vt3AyjH3~qe<~}<~WTqAo-d?
z{3C0H<7I3k{CF{ty~>9_OdSzH;29eTiO0ZqNMQ5A;U`oGokh$<PpqVxl#(JGbtIou
zh3G=0bl5FKi<CK}Gb5$NZbk^CjA%j8-2juhmi<cHV}J~iK5_sl7wIKk!~<;w8hDVq
zGn>bOUVZ``-716<Y6_IO|F{6XWi6f5;BqJFB%dV)??N`OQZN2?GG}q3wC+aqDdQE*
z+NDkZwV&edB-Q&~{d%SQ-j6f53NB~_sCsrse$ZoGnA;p~4Z3?~#7gZL-8ZKG<f>%z
zcG}Lxz~*)J$a~_l4wEHyXXtyd6bBUjziPj^JbvfaQXA>HHc$L=v9{zpK82<0=eRMO
z??+}Zl-I;;AoGw3rkX|<j9gT-JC+bBS%dkeQPEem%<)RphOWX}t)@`Xtb)h2Dd4uJ
z!dCqQqn}!iYO#--_15arqH0}!RcTRSzD{S+=9{Z^=6tQztQE?%R;yJgJUd}*aCthc
zuHG(B#Y6{~8lKK@4s{N@`UgB+LoR1;drN3)bM<!)jCx?sS`6oEK80_sYjR2`hn}$J
znyy>sS-pkJqplT}`8@C*pM+oPzcTT}@;^J32Ui=FijI&kY{*^g!7%}DH9b;>Yapy*
zg%^#mtiX1?ADlLmA|tH9ar>hzM#H<d$8ggYn@k9+JBDy`RkAzq?**Gun72RDMD3|@
zW|bZeNts?R=*@clS<F|~1yTqfrfA@a#sFJQ%FHgz=D+1~WREP;9Lj8GK_)l~a_~wI
z!MZd_e7)rziL3;T*mD*NvA4~}s$C4U*{~RkQC#?!sy(EFKzl3CiZE>d!X&)pP{RC?
z5?HIMNH$_Ux$&%id=cXbCK%df%hfbfq`gg)PQnF8YS`FONmIercSH2`FLEO73{o0g
zIC+3_b^_+-8Zo-*u+@DLOV1!>;k^Qh@#kUDkbrT13VA;a4orz|XA$KZv5KCr#}#Sf
zhPPY_vqv1$ed$=?DzV3Lg8uvA>yrO^Vp<f}OyJ`dJ3eLX)?3jXV>2|4FF;cFgqZa5
l0xx4f687qa^Z1oko@Glof|qPk%6=p8rI06IMPeAi+Mn**<stw8

delta 1239
zcmah}T}+c#7(VCg;iFv(lu~QaiJ}cyA<}OCFk}N-oPu<1S)EzN5RERfIdt=zfo@^d
zaIs}-q>mTNG{l)r6SE(}@nYU=F?zui1?J@vLuMq47iMAK&AhO_r$5A9d6MTl?|Gl|
zK6%gkz2~IPXsI*W_zzmilT0R~5N3>Ja8+BrViQ@L35|qT2u*}7gl58%(fD%du=Meg
z*3PN9dxvgw3wfCw5|=cgWZ*0ISqqvnRy=4CrL+N`x2%Qv!n7@`wmR>Trah)vDJo+t
zc#P60$8`~uW*JdS$z4(iH(aSArOfc3YlqcIZbzQdzb4~bJCYS02$#K@cF*$`eB_Q}
zd`S#r%bL*SeJ$+?+qj+fl@)?2$uKQ4=^5t5q3kgjhWruS@cJ<Cu1C_}Dd)YXIQ+sP
zQ_F5>)^!wN&4(BH$uQ*5ich(|kxb^4kE`xz!jtEvSv@UmOdW1b-UYKJitAND7`541
znzdF96WxvW0Bd6b7N&9s5Fd$P?gKCGRjyS@VYaRThb!O0>AJ%-H(#jNaQxs)wDjQD
zIv4(4SHl^u?GBQsl&rTKYE{)1$9{ICVB?rSj8MaZL#w(UZ%I~9@2jw1kgb71?kpWS
zV*k;ZxY9N7@A%2t$qjNcNPjMJCG-y3H=5=4g}b#MKN!1j8yr3U;8G%HmmQn_6z-d(
ze2XwexJ|f2K;xF}qlwf+v!?53sopvR?;4b;(4>ahaJ@9PuHiV{6^5^4hX0Q9(Q{h=
z08-oPk=Q=NXK*=k5kJ4~PIpd<^-3<=IGqWhIx)L2cAP+Od@03Vj(j6N+>?uTaK<@p
zQKLWIbyw)D{eSAi5l?xJ&VAK?WH|rE!zHdo_dmZ?kgb?@O8O5_j3=?kGPalOD#hl~
zT-n`L?tO+<6vy|GhaT0=g`wnY2$asV2`h2=)tgr>)|ZJaCge`HD_X?W4a^qH+!Yn-
zHo)kK+PLba4TX(nPeQ1^%SF9=0t>!w>YEqkPe&&>{{?M(j$!Ul08<C82pkanB7%EI
zF|*k%2l`iW`PchBT=IPx&NFBoISS{2Rnk4|6Y}wh;D~Jt@k)8EH_q{0-#I)Ay5Q_h
zVysV>DPzv^eEHR%d32J}InwWiuzshP4ybPIbMwjv-n3+&1@#2wI^c_hs4gswFQY}-
P*GSdKF-`7I2x>e9p4EcB

diff --git a/TactonLibrary.suo b/TactonLibrary.suo
index fc693ea9da458169cd32dd130bb656e193ca8ac3..e0587c7bb029e66b609ec372846e0e3c1e8fe524 100644
GIT binary patch
delta 758
zcmb_Y-%FEW6#mY)Z~nmVvrVU?nfYz3m_O1@C#b8Gl_JaB)Um;4E~kl1DH|dVAx33L
zbkm+LA{9)%=qi@)RX1YP#V(4JZbYJs{(*k5x)SPL7_9rw%fmT5=Q%IuJjs1Zex!6-
zH2>n!C<sCmhn>U0(ah1p;pAv#@5ClbNz(;8!}}ATZ?L#DP@+(7%)r~Zj6KQ9vd4U)
zT+SJNK08~sE6O=dRUV7k3a>&XoGHs=S+?Rp)F^_0FUBfz!7Le>bi9-BT5@PjTzH)&
zOkR;<cv0!4b2$}rR$tW891@lVI>UZgR<#J!#&BqB#8q1%dfV%fvW;)-)E45Q!-=}u
z2BtdP#k2;;&>gG=D$(VZad*%Fdte5)TsA~I`nJwyG)3}1i*?E(*82@mTbc_6!N_~h
za5K7yuOn9W(|uV~{<zngH-p)3FD{rJEZc3Cv=-i}VJ6Qe=@)qUH}3PI9`7$@70S8J
zPtUWnFD>dn&G)n<)RpD8AI38GdY0QI?1|+p<DC-`ZR*E)MaNdg#wq3B)N5WU-`5|c
zEl&>L*bA;b?kdemk@2^!hX~?82s*ckUnpZ|s1%lo6w+f$un!i|34HUf(#nw|Cus=-
zR~EICe3w#C$cS_-2{l|qr|>l7f-fQ?In`D?Da`OE2quJsVZ`k=oDLssg&GLk;Q;@C
z9?xqG8bPRF`r)92+aqm9qjgYyR;tFUDPt<y0bQLZHCjL(M1p3vJ-Vy;&$~sS_N$ob
Kjk8CwY5EP<iv_0u

delta 743
zcmbu6T}YEr7{||f_f9R}m$|tdu4ErA(z)7)6}GiB%?evgX>Q@1j5${>ladulg~LAR
zLag?Wt_*~{=%!dZUWZYE-Q<LbF1qPv*9%q<4C>4%cGFc4{NVY1p7WgaXPW**vss~K
z4<TeP$IfwZoE#UYgR_rq2zL4)DrUsV8iy*;o}6OS;$S^qi%wQj4G7Y9o~7pe<bn;+
z!cv;NAZfWrs`4VW&5vG{H`nxDFx2zFQ8G?q<T5!+u9Fa%AX9vti+C!)B<h&h+(l(t
z$!x4@qttUF$!7F^fhO>x$=~e#M<>FZEytB~8Z+i=)W*J<A1g7^7RRW|4EsS1N)8(`
zt;r{=ZM7)3Mw!vsvjr<2AEb_B3PN-^a$1M(a1a;6ddz!T5pxgc4y`HbG*#=cQkNtk
z=CPvSHq)oL6u*sP)WW{^oDyVOx##|>Y^3`9zwg#(5|ul7M9uX5%T#@XtAFHPMZx;X
zlDzp3GPnL-w&cqS>O%L&A8+$r>(9#at;j?}yAmctBU|%d;fsvfaNn<GhZ6&oE@1G4
zGZR==&r6zj<=y0qeJ<`Z%--#kD+O2!bYeBMfZ~}2x`?ldoBRn)%5!|22s)%gb}|iP
zxUO~=_XJ5VUWL6VoZo@vp-wEt4&b>#O9|Anmo1Lpp}7$og)RI6QxPrGjs`@$xuDI&
z-Dt4(^J}(aHtOMJql*5`RtENREU$nu^bm8At1u2oNC&r~7-;z4ov<`qgOyMcQHzy5
HnoQDPHRkd-

diff --git a/TactonPlayer/TactonPlayer.cpp b/TactonPlayer/TactonPlayer.cpp
index 975fceb..0868721 100644
--- a/TactonPlayer/TactonPlayer.cpp
+++ b/TactonPlayer/TactonPlayer.cpp
@@ -131,7 +131,7 @@ void TactonPlayer::setFrequency(unsigned int frequency)
 	_comport->WriteData(buffer, 3);
 }
 
-void TactonPlayer::setAmplitudes(unsigned int nbtactors, unsigned char *amplitudes)
+void TactonPlayer::setAmplitudes(unsigned char nbtactors, unsigned char *amplitudes)
 {
 	if (!_comport)
 		return;
diff --git a/TactonPlayer/TactonPlayer.hpp b/TactonPlayer/TactonPlayer.hpp
index a7dd0ce..a5be777 100644
--- a/TactonPlayer/TactonPlayer.hpp
+++ b/TactonPlayer/TactonPlayer.hpp
@@ -32,7 +32,7 @@ class TactonPlayer
 			EXPORTED void schedule(unsigned char index, unsigned long timestamp);
 
 			//sets an amplitude for each vibrator
-			EXPORTED void setAmplitudes(unsigned int nbtactors, unsigned char *amplitudes);
+			EXPORTED void setAmplitudes(unsigned char nbtactors, unsigned char *amplitudes);
 			//sets a frequency for all vibrator
 			EXPORTED void setFrequency(unsigned int frequency);
 			//stop any vibration
-- 
2.30.2