From 2652fe6eb704fdea3fd6dd4bfa93f225e02625a7 Mon Sep 17 00:00:00 2001
From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Wed, 29 Jun 2011 21:09:23 +0000
Subject: [PATCH] New Tacton constructors

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@39 47cf9a05-e0a8-4ed5-9e9b-101a649bc004
---
 Arduino/wristbandTactons/wristbandTactons.pde |  10 ++---
 TactonLibrary.suo                             | Bin 22528 -> 23040 bytes
 TactonPlayer/Tacton.cpp                       |  39 ++++++++++++++++++
 TactonPlayer/Tacton.hpp                       |   4 ++
 TactonPlayer/TactonPlayer.vcxproj             |  10 +++++
 5 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/Arduino/wristbandTactons/wristbandTactons.pde b/Arduino/wristbandTactons/wristbandTactons.pde
index e512d44..58c35d1 100644
--- a/Arduino/wristbandTactons/wristbandTactons.pde
+++ b/Arduino/wristbandTactons/wristbandTactons.pde
@@ -2,7 +2,7 @@
 #include <TactonPlayer.h>
 #include <Tacton.h>
 byte pins[] = {
-  3, 11, 9, 5};
+  3, 11, 5, 9};
 TactonPlayer player(4, pins);
 TactonManager manager(&player);
 
@@ -105,8 +105,8 @@ void loop()
         index = Serial.read();
         manager.play(index);
         command = 0;
-        Serial.print("Play");
-        Serial.println(index, DEC);
+  /*      Serial.print("Play");
+        Serial.println(index, DEC);*/
       }
       break;
     //schedule the play of a registered tacton
@@ -118,9 +118,9 @@ void loop()
             (((unsigned long)Serial.read()) << 16) | \
             (((unsigned long)Serial.read()) << 8) | \
             (((unsigned long)Serial.read()));
-        Serial.print("Plan ");
+/*        Serial.print("Plan ");
         Serial.println(timestamp, DEC);
-/*        Serial.print(" played at ");
+        Serial.print(" played at ");
         Serial.print(timestamp + start, DEC);
         Serial.print(" shift=");
         Serial.println(start, DEC);*/
diff --git a/TactonLibrary.suo b/TactonLibrary.suo
index 3ff37c824e1e6f1d5a7141f5a45aed07eb681823..bea52c2c5dde0d2158285333f8befcf67209fdc3 100644
GIT binary patch
delta 623
zcmYMw%TE(g6bA4)?aa_dij0jkhDWgw)6`0fVy)W8bXv!vD4^2%cG^Z)E+s)@;(*3z
z)I@sRsc2-SD`4EXqNa(4U}F3WL`__|=mNLYuMpxSzsYy*y)*aTW6qKJp5_djv{tXz
zyLd9<rnTu&H$S#@&~9rolBcqGy~T*P6`n`FkX;Z2vy*R$OD^&tI{@F+`J33w6-DF;
z=?@*|t8!Ahf+>UF%IP~Xq&OrX2`Z#OgEVB|2<UJWvM>n8;5ZDy2{;MEFao1+3Qofr
z7=s+-;Vhhk^Kd~Be8NS9OK=$)*W6S@U22T+lO_*8i1?)&sK(KR(1N4d<RS^B8#b?K
zt!}+1k&|z3Uy|)kL68JCwWwvbX-?&CNSgP5`sgSH{MzcP&b-Jwy>9Ebx5Z99)?eQ;
zu^Jv@S31ax`%+v>JGiw!!$Z*^e-1yhUWDHfPefh#-v=vmFi!kcOIXQNkd!hGu<-;c
zFA=hQTl+5cAZcu*e>K+@+mSogm+-?q2iQE+&9*@Imi3X17c03CujFJ_V^c~^*Pq`1
zsU+He#B$5m`~#lGNvXtzz>c!6&Z;5eslGm5=?Ysjy3fXyy%nxx&4qz9aaHW60*~*1
r#J%3udE+%r8zZyopj=K=UDRmPE^PR}U5RG0)ZwCR74;c<qi_2M`hT!P

delta 757
zcmZwFT}V@57zgn4>e<dFZgWm^+2(1>*~sH;*~$y2$B#g;*$gkFL<Z4?WuIi}vO2A9
z(qZXiA8Of$6ciZKQ+GkLT}e?0U33u?6kT<ZU{GDS{wEfB(SaZD^S%%7*K=Ow2~!d*
z5y_I)aU53yE9rFFfz}CProSGoD-&-(OYtlRy%nU{h{Q(u9`m=E_};3DS1cPj#Y<6s
z!Ne6IHUO4O(;{C=Nh?o%y05I8_Ur3(F{CcgLwzH?6TBl4g~o)u&I1@c2t9BJ4#N>R
z3di6$oP-n53))#vq3wfyh{9<YfHQCw&Vd4RhLm99bck&5_f+b#<)V&RsK0PQZ!~hq
z)09-LDr*{y*5x#ljWeIEgTb!mqW9f)o?N0${UVyPnOptte#xelmK>6uUV2ew7dqbL
zU|o(}Edfdf`DwY5(NbBbI$ZXMQN1Th$t_6=mlsg8RE~cA+}1`$sT@DMM7@C_(|ODt
z1MNyHBW*>xL3D;_QP}9eis%|#hZ`^s6EF!k;TBB6ZMXw>F{^Sm5@z&4+DWfH5><Om
zxYl!Z#T#TaUm=puoKF!$t136ijAUQT>L33RiYM$PU7<ap*8AZBn|4=n@x>&IvHw?M
zB$8{vZmT|p=ACt;wJFn|@|Gd<ugtZ%jAGS3dMp-LgFnlQ*ZykE4~S0r>Gmt_C|YK-
z-K913Y)2Da_SDfwNl=wd9#&YhYKvW&xCtd3MkzzOLX0?RLi!|doc4wt)MnU5?uK^L
YKD-<4<!Jx=fx6UTVYHdgyVsom8-|G2p#T5?

diff --git a/TactonPlayer/Tacton.cpp b/TactonPlayer/Tacton.cpp
index bf72612..64745b9 100644
--- a/TactonPlayer/Tacton.cpp
+++ b/TactonPlayer/Tacton.cpp
@@ -78,6 +78,28 @@ Tacton::Tacton(unsigned char pattern, unsigned int duration, unsigned int freque
 	_amplitudes[0] = amplitude;
 }
 
+Tacton::Tacton(char *pattern, unsigned int duration, unsigned int frequency, unsigned char amplitude)
+:_nbframes(1), _patterns(new unsigned char[1]), _durations(new unsigned int[1]), _frequencies(new unsigned int[1]), _amplitudes(new unsigned char[1])
+{
+	_patterns[0] = 0;
+	_durations[0] = duration;
+	_frequencies[0] = frequency;
+	_amplitudes[0] = amplitude;
+
+	setPattern(pattern);
+}
+
+Tacton::Tacton(const char *pattern, unsigned int duration, unsigned int frequency, unsigned char amplitude)
+:_nbframes(1), _patterns(new unsigned char[1]), _durations(new unsigned int[1]), _frequencies(new unsigned int[1]), _amplitudes(new unsigned char[1])
+{
+	_patterns[0] = 0;
+	_durations[0] = duration;
+	_frequencies[0] = frequency;
+	_amplitudes[0] = amplitude;
+
+	setPattern(pattern);
+}
+
 Tacton::Tacton(const Tacton &t)
 :_nbframes(t._nbframes), _patterns(new unsigned char[t._nbframes]), _durations(new unsigned int[t._nbframes]), _frequencies(new unsigned int[t._nbframes]), _amplitudes(new unsigned char[t._nbframes])
 {
@@ -116,6 +138,11 @@ __declspec(dllexport) void Tacton::setPattern(char *pattern)
 	setPattern(0, pattern);
 }
 
+__declspec(dllexport) void Tacton::setPattern(const char *pattern)
+{
+	setPattern(0, pattern);
+}
+
 __declspec(dllexport) void Tacton::setPattern(unsigned int frame, char *pattern)
 {
 	if (frame < _nbframes)
@@ -128,6 +155,18 @@ __declspec(dllexport) void Tacton::setPattern(unsigned int frame, char *pattern)
 	}
 }
 
+__declspec(dllexport) void Tacton::setPattern(unsigned int frame, const char *pattern)
+{
+	if (frame < _nbframes)
+	{
+		unsigned char t1 = pattern[0] == '1';
+		unsigned char t2 = pattern[1] == '1';
+		unsigned char t3 = pattern[2] == '1';
+		unsigned char t4 = pattern[3] == '1';
+		_patterns[frame] = (t1 << 3) | (t2 << 2) | (t3 << 1) | t4;
+	}
+}
+
 __declspec(dllexport) void Tacton::setDuration(unsigned int duration)
 {
 	setDuration(0, duration);
diff --git a/TactonPlayer/Tacton.hpp b/TactonPlayer/Tacton.hpp
index 3294764..2a0df40 100644
--- a/TactonPlayer/Tacton.hpp
+++ b/TactonPlayer/Tacton.hpp
@@ -20,6 +20,8 @@ class Tacton
 		__declspec(dllexport) Tacton(char *desc);
 		__declspec(dllexport) Tacton(unsigned int nbframes, unsigned char *patterns, unsigned int *durations, unsigned int *frequencies, unsigned char *amplitudes);
 		//create a simple vibration
+		__declspec(dllexport) Tacton(char *pattern, unsigned int duration, unsigned int frequency, unsigned char amplitude);
+		__declspec(dllexport) Tacton(const char *pattern, unsigned int duration, unsigned int frequency, unsigned char amplitude);
 		__declspec(dllexport) Tacton(unsigned char pattern, unsigned int duration, unsigned int frequency, unsigned char amplitude);
 		__declspec(dllexport) Tacton(const Tacton &t);
 		__declspec(dllexport) ~Tacton();
@@ -29,7 +31,9 @@ class Tacton
 		__declspec(dllexport) void setPattern(unsigned int frame, char pattern);
 		//changes the pattern using string format
 		__declspec(dllexport) void setPattern(char *pattern);
+		__declspec(dllexport) void setPattern(const char *pattern);
 		__declspec(dllexport) void setPattern(unsigned int frame, char *pattern);
+		__declspec(dllexport) void setPattern(unsigned int frame, const char *pattern);
 		//changes the duration
 		__declspec(dllexport) void setDuration(unsigned int duration);
 		__declspec(dllexport) void setDuration(unsigned int frame, unsigned int duration);
diff --git a/TactonPlayer/TactonPlayer.vcxproj b/TactonPlayer/TactonPlayer.vcxproj
index aa962eb..770df4b 100644
--- a/TactonPlayer/TactonPlayer.vcxproj
+++ b/TactonPlayer/TactonPlayer.vcxproj
@@ -56,6 +56,11 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <PostBuildEvent>
+      <Command>copy /y $(CodeAnalysisInputAssembly) C:\Windows\system\
+copy /y $(MSBuildProjectDirectory)\*.hpp $(VSInstallDir)VC\include\$(ProjectName)\
+copy /y $(OutDir)$(ProjectName).lib $(VSInstallDir)VC\lib</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -74,6 +79,11 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
+    <PostBuildEvent>
+      <Command>REM copy /y $(CodeAnalysisInputAssembly) C:\Windows\system\
+REM copy /y $(MSBuildProjectDirectory)\*.hpp $(VSInstallDir)VC\include\$(ProjectName)\
+REM copy /y $(OutDir)$(ProjectName).lib $(VSInstallDir)VC\lib</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="Serial.hpp" />
-- 
2.30.2