From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Wed, 1 Aug 2012 15:39:34 +0000 (+0000)
Subject: Minor bugs
X-Git-Url: https://git.thomaspietrzak.com/?a=commitdiff_plain;h=2e2a6884523cb12d4264964a998fb5f5d5b476f7;p=tactonlibrary.git

Minor bugs

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@85 47cf9a05-e0a8-4ed5-9e9b-101a649bc004
---

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 95b4378..9761435 100644
Binary files a/TactonDebug/TactonDebug.suo and b/TactonDebug/TactonDebug.suo differ
diff --git a/TactonLibrary.suo b/TactonLibrary.suo
index fc693ea..e0587c7 100644
Binary files a/TactonLibrary.suo and b/TactonLibrary.suo differ
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