From accd4c6ee7732bd39d23476ec74965858cca5c4e Mon Sep 17 00:00:00 2001
From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Wed, 1 Aug 2012 11:39:33 +0000
Subject: [PATCH] Separate setAmplitudes and setFrequency. No more flicker in
 the vibrations

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@82 47cf9a05-e0a8-4ed5-9e9b-101a649bc004
---
 .../TactonPlayer/TactonPlayerPreciseNew.cpp   |   6 ++++
 Arduino/wristbandTactons/wristbandTactons.ino |  26 ++++++++++++------
 TactonDebug/MagicCircle/magiccircle.cpp       |   9 +++++-
 TactonDebug/MagicCircle/magiccircle.h         |   1 +
 TactonDebug/MagicCircle/magiccircle.ui        |   8 +++---
 TactonDebug/TactonDebug.suo                   | Bin 35328 -> 35328 bytes
 TactonPlayer/TactonPlayer.cpp                 |  26 ++++++++++++------
 TactonPlayer/TactonPlayer.hpp                 |   7 +++--
 8 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/Arduino/TactonPlayer/TactonPlayerPreciseNew.cpp b/Arduino/TactonPlayer/TactonPlayerPreciseNew.cpp
index b06183f..4292279 100644
--- a/Arduino/TactonPlayer/TactonPlayerPreciseNew.cpp
+++ b/Arduino/TactonPlayer/TactonPlayerPreciseNew.cpp
@@ -62,6 +62,12 @@ void TactonPlayerPreciseNew::buzz(unsigned int frequency, byte nbtactors, byte *
 {
 	if (nbtactors != _nbtactors)
 		return;
+
+	//clear
+	TCCR1A = 0;
+	//set duty cycle to 0
+	OCR1A = 0;
+	OCR1B = 0;
 		
 	sei();
 	init();
diff --git a/Arduino/wristbandTactons/wristbandTactons.ino b/Arduino/wristbandTactons/wristbandTactons.ino
index 883d53a..a22abe3 100644
--- a/Arduino/wristbandTactons/wristbandTactons.ino
+++ b/Arduino/wristbandTactons/wristbandTactons.ino
@@ -29,6 +29,7 @@ void loop()
 {
   byte index;
   unsigned long timestamp;
+  unsigned int freq;
 
   if (Serial.available() > 0)
   {
@@ -125,33 +126,42 @@ void loop()
         command = 0;
       }
       break;
-    //sets a frequency for all the vibrators and an amplitude for each one
-    // BnFFa1a2...an
+    //sets an amplitude for each vibrator
+    // Ana1a2...an
     // n = nb tactors (1 byte)
-    // FF = frequency (2 bytes)
     // A1, A2, ..., an : amplitudes (1 byte per tactor)
-    case 'B':
+    case 'A':
       if (nbf == 0 && Serial.available() >= 1)
         nbf = (unsigned int) Serial.read();
       if (nbf > 0)
       {
         //DO NOT OVERFLOW max(nbf): 60
-        while (posbuf < nbf + 2 && Serial.available() > 0)
+        while (posbuf < nbf && Serial.available() > 0)
         {
           buffer[posbuf] = Serial.read();
           posbuf++;
         }
-        if (posbuf >= nbf + 2)
+        if (posbuf >= nbf)
         {
-          manager.buzz(nbf, buffer);
+          manager.setAmplitudes(nbf, buffer);
           posbuf = 0;
           command = 0;
           nbf = 0;
         }
       }
       break;
+    //sets the frequency
+    case 'F':
+      if (Serial.available() >= 2)
+      {
+        freq = (((unsigned long)Serial.read()) << 8) | \
+            (((unsigned long)Serial.read()));
+        manager.setFrequency(freq);
+        command = 0;
+      }
+      break;
     //stop any vibration
-    case 'A':
+    case 'B':
       manager.stop();
       command = 0;
       break;
diff --git a/TactonDebug/MagicCircle/magiccircle.cpp b/TactonDebug/MagicCircle/magiccircle.cpp
index 306cd3d..8d19d8d 100644
--- a/TactonDebug/MagicCircle/magiccircle.cpp
+++ b/TactonDebug/MagicCircle/magiccircle.cpp
@@ -22,6 +22,7 @@ MagicCircle::MagicCircle(QWidget *parent, Qt::WFlags flags)
 	setDirection(_direction->currentText());
 	setResolution(_resolution->value());
 	setSpeed(_speed->value());
+	setFrequency(_frequency->value());
 
 	connect(_play, SIGNAL(clicked(bool)), this, SLOT(play(bool)));
 	connect(_stop, SIGNAL(clicked(bool)), this, SLOT(stop(bool)));
@@ -29,6 +30,7 @@ MagicCircle::MagicCircle(QWidget *parent, Qt::WFlags flags)
 	connect(_direction, SIGNAL(editTextChanged(const QString &)), this, SLOT(setDirection(const QString &)));
 	connect(_speed, SIGNAL(valueChanged(int)), this, SLOT(setSpeed(int)));
 	connect(_resolution, SIGNAL(valueChanged(int)), this, SLOT(setResolution(int)));
+	connect(_frequency, SIGNAL(valueChanged(int)), this, SLOT(setFrequency(int)));
 
 	connect(this, SIGNAL(setAngle(float)), SLOT(tactileFeedback(float)));
 	connect(this, SIGNAL(setAngle(float)), SLOT(visualFeedback(float)));
@@ -84,6 +86,11 @@ void MagicCircle::setResolution(int res)
 	setSpeed(_speed->value());
 }
 
+void MagicCircle::setFrequency(int frequency)
+{
+	_tactonPlayer->setFrequency(frequency);
+}
+
 void MagicCircle::tactileFeedback(float angle)
 {
 	unsigned char amplitudes[4];
@@ -101,7 +108,7 @@ void MagicCircle::tactileFeedback(float angle)
 	else
 		amplitudes[2] = - 255 * cos(angle * M_PI / 180);
 
-	_tactonPlayer->buzz(_frequency->value(), 4, amplitudes);
+	_tactonPlayer->setAmplitudes(4, amplitudes);
 }
 
 void MagicCircle::visualFeedback(float)
diff --git a/TactonDebug/MagicCircle/magiccircle.h b/TactonDebug/MagicCircle/magiccircle.h
index a8be0b5..3002144 100644
--- a/TactonDebug/MagicCircle/magiccircle.h
+++ b/TactonDebug/MagicCircle/magiccircle.h
@@ -24,6 +24,7 @@ class MagicCircle : public QMainWindow, Ui::MagicCircleClass
 		void setDirection(const QString &);
 		void setSpeed(int);
 		void setResolution(int);
+		void setFrequency(int);
 
 		void tactileFeedback(float);
 		void visualFeedback(float);
diff --git a/TactonDebug/MagicCircle/magiccircle.ui b/TactonDebug/MagicCircle/magiccircle.ui
index cc56a5d..b6829a5 100644
--- a/TactonDebug/MagicCircle/magiccircle.ui
+++ b/TactonDebug/MagicCircle/magiccircle.ui
@@ -46,10 +46,10 @@
          <number>1</number>
         </property>
         <property name="maximum">
-         <number>720</number>
+         <number>3000</number>
         </property>
         <property name="value">
-         <number>30</number>
+         <number>180</number>
         </property>
        </widget>
       </item>
@@ -90,7 +90,7 @@
          <number>360</number>
         </property>
         <property name="value">
-         <number>16</number>
+         <number>360</number>
         </property>
        </widget>
       </item>
@@ -110,7 +110,7 @@
          <number>400</number>
         </property>
         <property name="value">
-         <number>250</number>
+         <number>300</number>
         </property>
        </widget>
       </item>
diff --git a/TactonDebug/TactonDebug.suo b/TactonDebug/TactonDebug.suo
index 1f131fa54fbafb1a1acf1e3a5440e4abd5524ce0..a996f4d29d6fedd621735021324e5ea2c645031e 100644
GIT binary patch
delta 1109
zcmY+@ZA?>F7zglsZf{GkExuGDXtWUH3o1f!6%dHrQq2T1X#;GGkiZCLn>uBsn?N?K
zL>CwL!S;`Ci^ha@;+%@IGo9O<RG8bCFVSsZG{!HB%d$^<sfjTg+y81^vXlIJp65Bw
zx%c+w+{mCB8C3Th!ZPYBQng}5Q4m(kd{h5C9)1?m;iKtE{YkBa>!nmiYp9$ms1m!%
zbH!9N_-9PpI(`3BxxJIyuL%oRBBioViwglPu$78~XtLF1*0A0{E2t5tY~4=tKDEs1
z2n8AQ=bHsn6AR}29Oq_w#cb%z2xOYY?M%ApRo;EJ{4pb};-<d<$yu80nRYe9p3SvP
zbHmQ6e1u&Qo4JYUL)S*lnXcR3V=&~9eY2-jHDy8HoJn2LSeu(}NQAR3Sf)9VtkUG}
zc_~$d(Yv4?8)lTn+!L56C>E>befLJ8i^bfsG`&rR^KMw}E@syMDogfS5L#a5@F+gT
zqxks-J(%_MGjOg*VI-J^zXDt11uEi!7Thk($3Wp)G#7ato0M)|;?cmaWqzohd1x(K
z1Y>nFVR)>uk{o#0Zj_u~<oM%<rJ;LAe$soQ1NV+K1{~bQ|NOs!_PPCdr^YQGl;l{n
zJ?ubMxi`;zH-k(LkQu+5p5NyjC%jaiw===u13F5>bc{Zv<Ma`opp$fpM(8x1p;7vn
zBz;0>=^TAZ=jk*0oW7t7^d()SF-p=U8dsE6$^?V2=rVmx-_W--N#D^Gx=PpRI!$3s
z#g1ruAYLhC(yj?ywpU7HZA3umUU-ct_81khwqcBK$g;kmbST{zYiq+@-$H$wa)__b
zrrf|#*A5w}_N%&*%S#rKd7=`jbwcdM{q_40>1@H#&9`v8Yg}4h-X~(UeoSb^2-h}h
zh3R&rn3&(p<I`AIuZxw;R;4S>n+%o<{&3*;*Ryf*MP2r984|*VBV7-~bw0*n{2FRd
ze;Y$p_utkIHoB!RoKoTPy3r8`p*4Sc!f4cB^hS_uP9oIfg7N$u`AcuJ8gEsxux6Va
zc_U^W4W1U!_MkKdE?UvwSsm}0iSOU6MqyKqZ0R4?(UG5pK*P`S;ahz|Jd4-%*4xc9
VWPbMM<6E~exPzd*4(r~&@GtA;bi4on

delta 2455
zcmcgudu&rx7{BN4Zfo~|J#Z^~z`!Bvy4~Gw9o@^dUAr<i#@bQb#D=Zwx=}1`*WPVB
zrrd#;fkdSri3u@2HnTs7F2MZ*jGB~8qX@`A|L{RHCdNmif--ax-TZD>CXpBuBA%1q
zIluFr@0{;D=lgn3g(I|Zgnm{}=o5w#nwg!On**M%;EE`UVi86}34%jNlcm^~AvB0`
z#2SPa0axO3Qgul52m_)HF$-tt^uwKBg&5DG<6m&fZQctc2IWGnxQiJj<a@}C(~_&O
zDXuBG3FVs*DnuK+78gufhpZ71@u?_2CubuLY*E2O(Z2nbLU+6+*NX!m!XFg|un!`5
zX)IofAEcQyq_9U<0O3?d+>vlTUWSL7OTH!L(}cL6aF9mB&9n_nW>g-hMxsd<ccstL
z^fm@|Wt^20Y2nhS!Wf?!lk_D&J8C>Nl{%3{y(9`*Gc-8_J9Ar@q^J^1=U#+KMop^4
z8_PBjIkgHWR!1jAK5r^k#^5M+LGr*zOtW;+yYWU#DKk}%SFOQTO%>z)O1uo28mkEd
zRE%2EoB<h!)qpTkmDrji)ku}WTT7JiyRrhVS~Em_p`MHu(IBXVkgXK9^khH-TLsC@
zwanSYbCa-wQNY_Q2Q;UE&zI)FUS%EBm1MycR*|&Z#MP?}<;FF|b!B6EE*6B6FzCw_
zaIB*Mg!0qk%o;@uBi#@zsnQUDzUt+$wJHyGRF53))PSklqy7O;_9H@y@3m<EGxpaJ
z(})|0Ul6|{W)Qzgn~c^F*ju0=JK>Br8`@VUjfG`I)Yl3Gge(T$k@;a-cQ_x_BSk?G
z8i|BRSrL{;x#<!dw`QK~5{M|&8EH9LjtWwyOW83tZ6ahp+^ByFT6<d|ZD1m#KAjH(
zgTsfM${A(DrUB;Mp7#?_TRP(H1#;zzq*#J8-e$Km;0uaEk3d3=Mwnct2ENh8R7P#U
zbfXR4V~T)pYLR2eC=Btu^~6g^3Z*@8oVuz>Y~0GnJZPs{DHr8II54SQky(n$q8cKS
zZfpZo9tPSS(UH<#D$63Pg5Y3tVGFxbyj;kVzoM<k{D;-h#;Sl_lm?x${Dr`eH)a9H
zB*5i|3n8VT2R?FtEuXi7t*EmR285bH;M(O7ZV!`#V9++hR9!8cugFJf3h1@3q+XvK
zefqh9W8a(-E_8PIpL{nN{JN%4r5--(Nd;@oDtIwJfqV<Y*}73X4W+%C;b@s9HACrn
z<HL`aKT&$I<-|T#Ih=^A>LIKjM+dV&Fl+&vY$cFNowQ9#4Sogucp+Y@mP)1)C>XA3
zUHms87&b?oyF;#iBomISEFs$>n9?Redwvdd-XC{|niVsxQ|7o0d9nnGO{b_t3a+ld
zTyv6`syM8>4W;IKt)^aGT&LBP6|2=IuGoM-o??zOaK=i`Y&ILq9viA@b_bnix5pK%
z9dd%Mxia12aqM&j>^6s!_j%_BFkvpL8o%p}L)O*VjzD+6+v^Lu0&a)LzA@6ZxxL-K
z!JxEz$AP=veaKm5xAJxkTfvsvg8`?#x8H3aba(f<_@KQn=y!X&d^;o?<U6>w{^-)R
zF0U)#;9cF3Q`=3huKr&8cAv8YEEX*sTYIka;D6_f(-&}g++FrZT>-DlWAEeL+g$;4
zrd)iyVJ`u{B@;e1e<J3sf0;0el<D6+Y;LJu$bD6~KFUq^G&u0gh79Wq3uX($6SvIX
zt7MZb?ipOLm>=GU{62)~9_I<`^!tZ~BF_xGZeAhzks&=2^F<ZD8D*xkm`l&Y+6ER?
zRR2fD6h(a5J^y(|FI3_EQEvJGeHjNw%Q}2x;MJBtVmIP^wm4y#rlC!?P5M@hdQw6o
eJlPKYBP}xN4^{<2dU9g>kX!+)tO-m9-ux5R2;o!!

diff --git a/TactonPlayer/TactonPlayer.cpp b/TactonPlayer/TactonPlayer.cpp
index 23f716e..975fceb 100644
--- a/TactonPlayer/TactonPlayer.cpp
+++ b/TactonPlayer/TactonPlayer.cpp
@@ -119,18 +119,28 @@ void TactonPlayer::schedule(unsigned char index, unsigned long timestamp)
 	_comport->WriteData(buffer, 6);
 }
 
-void TactonPlayer::buzz(unsigned int frequency, unsigned int nbtactors, unsigned char *amplitudes)
+void TactonPlayer::setFrequency(unsigned int frequency)
 {
 	if (!_comport)
 		return;
 
-	unsigned char *buffer = new unsigned char[4 + nbtactors];
-	buffer[0] = 'B';
+	unsigned char buffer[3];
+	buffer[0] = 'F';
+	buffer[1] = (unsigned char)((frequency & 0x0000ff00) >> 8);
+	buffer[2] = (unsigned char)(frequency & 0x000000ff);
+	_comport->WriteData(buffer, 3);
+}
+
+void TactonPlayer::setAmplitudes(unsigned int nbtactors, unsigned char *amplitudes)
+{
+	if (!_comport)
+		return;
+
+	unsigned char *buffer = new unsigned char[2 + nbtactors];
+	buffer[0] = 'A';
 	buffer[1] = nbtactors;
-	buffer[2] = (unsigned char)((frequency & 0x0000ff00) >> 8);
-	buffer[3] = (unsigned char)(frequency & 0x000000ff);
-	memcpy(buffer + 4, amplitudes, nbtactors);
-	_comport->WriteData(buffer, 4 + nbtactors);
+	memcpy(buffer + 2, amplitudes, nbtactors);
+	_comport->WriteData(buffer, 2 + nbtactors);
 	delete[] buffer;
 }
 
@@ -139,7 +149,7 @@ void TactonPlayer::stopBuzz()
 	if (!_comport)
 		return;
 
-	_comport->WriteData("A", 1);
+	_comport->WriteData("B", 1);
 }
 
 void TactonPlayer::debugRead(char *res, int nb) const
diff --git a/TactonPlayer/TactonPlayer.hpp b/TactonPlayer/TactonPlayer.hpp
index 8e520c3..a7dd0ce 100644
--- a/TactonPlayer/TactonPlayer.hpp
+++ b/TactonPlayer/TactonPlayer.hpp
@@ -31,9 +31,10 @@ class TactonPlayer
 			//schedule the play of a registered tacton
 			EXPORTED void schedule(unsigned char index, unsigned long timestamp);
 
-			//sets a given frequency for all vibrators, and an amplitude for each vibrator
-			//vibrates until explicitely stop
-			EXPORTED void buzz(unsigned int frequency, unsigned int nbtactors, unsigned char *amplitudes);
+			//sets an amplitude for each vibrator
+			EXPORTED void setAmplitudes(unsigned int nbtactors, unsigned char *amplitudes);
+			//sets a frequency for all vibrator
+			EXPORTED void setFrequency(unsigned int frequency);
 			//stop any vibration
 			EXPORTED void stopBuzz();
 
-- 
2.30.2